Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chromeos / cert_loader.h

diff --git a/src/chromeos/cert_loader.h b/src/chromeos/cert_loader.h
index 59342bc..d542115 100644 (file)
--- a/src/chromeos/cert_loader.h
+++ b/src/chromeos/cert_loader.h
@@ -74,12 +74,9 @@ class CHROMEOS_EXPORT CertLoader : public net::CertDatabase::Observer {
   void AddObserver(CertLoader::Observer* observer);
   void RemoveObserver(CertLoader::Observer* observer);
 
-  bool IsHardwareBacked() const;
-
-  // Whether the certificate is hardware backed. Returns false if the CertLoader
-  // was not yet started (both |CertificatesLoading()| and
-  // |certificates_loaded()| are false).
-  bool IsCertificateHardwareBacked(const net::X509Certificate* cert) const;
+  // Returns true if |cert| is hardware backed. See also
+  // ForceHardwareBackedForTesting().
+  static bool IsCertificateHardwareBacked(const net::X509Certificate* cert);
 
   // Returns true when the certificate list has been requested but not loaded.
   bool CertificatesLoading() const;
@@ -89,9 +86,9 @@ class CHROMEOS_EXPORT CertLoader : public net::CertDatabase::Observer {
   // This will be empty until certificates_loaded() is true.
   const net::CertificateList& cert_list() const { return *cert_list_; }
 
-  void force_hardware_backed_for_test() {
-    force_hardware_backed_for_test_ = true;
-  }
+  // Called in tests if |IsCertificateHardwareBacked()| should always return
+  // true.
+  static void ForceHardwareBackedForTesting();
 
  private:
   CertLoader();
@@ -107,9 +104,9 @@ class CHROMEOS_EXPORT CertLoader : public net::CertDatabase::Observer {
   void NotifyCertificatesLoaded(bool initial_load);
 
   // net::CertDatabase::Observer
-  virtual void OnCACertChanged(const net::X509Certificate* cert) OVERRIDE;
-  virtual void OnCertAdded(const net::X509Certificate* cert) OVERRIDE;
-  virtual void OnCertRemoved(const net::X509Certificate* cert) OVERRIDE;
+  virtual void OnCACertChanged(const net::X509Certificate* cert) override;
+  virtual void OnCertAdded(const net::X509Certificate* cert) override;
+  virtual void OnCertRemoved(const net::X509Certificate* cert) override;
 
   ObserverList<Observer> observers_;
 
@@ -122,9 +119,6 @@ class CHROMEOS_EXPORT CertLoader : public net::CertDatabase::Observer {
   // should be loaded.
   net::NSSCertDatabase* database_;
 
-  // Set during tests if |IsHardwareBacked()| should always return true.
-  bool force_hardware_backed_for_test_;
-
   // Cached Certificates loaded from the database.
   scoped_ptr<net::CertificateList> cert_list_;