1 files changed, 8 insertions, 8 deletions

diff --git a/chrome/browser/ssl_manager.h b/chrome/browser/ssl_manager.h
index c0d6750..943c29c 100644
--- a/chrome/browser/ssl_manager.h
+++ b/chrome/browser/ssl_manager.h
@@ -215,7 +215,7 @@ class SSLManager : public NotificationObserver {
               URLRequest* request,
               ResourceType::Type resource_type,
               int cert_error,
-              X509Certificate* cert,
+              net::X509Certificate* cert,
               MessageLoop* ui_loop);
 
     // ErrorHandler methods
@@ -318,14 +318,14 @@ class SSLManager : public NotificationObserver {
                            ConsoleMessageLevel level);
 
   // Records that |cert| is permitted to be used for |host| in the future.
-  void DenyCertForHost(X509Certificate* cert, const std::string& host);
+  void DenyCertForHost(net::X509Certificate* cert, const std::string& host);
 
   // Records that |cert| is not permitted to be used for |host| in the future.
-  void AllowCertForHost(X509Certificate* cert, const std::string& host);
+  void AllowCertForHost(net::X509Certificate* cert, const std::string& host);
 
   // Queries whether |cert| is allowed or denied for |host|.
-  X509Certificate::Policy::Judgment QueryPolicy(X509Certificate* cert,
-                                                const std::string& host);
+  net::X509Certificate::Policy::Judgment QueryPolicy(
+      net::X509Certificate* cert, const std::string& host);
 
   // Allow mixed/unsafe content to be visible (non filtered) for the specified
   // URL.
@@ -353,7 +353,7 @@ class SSLManager : public NotificationObserver {
   static void OnSSLCertificateError(ResourceDispatcherHost* resource_dispatcher,
                                     URLRequest* request,
                                     int cert_error,
-                                    X509Certificate* cert,
+                                    net::X509Certificate* cert,
                                     MessageLoop* ui_loop);
 
   // Called when a mixed-content sub-resource request has been detected.  The
@@ -414,7 +414,7 @@ class SSLManager : public NotificationObserver {
   // Sets |short_name| to <organization_name> [<country>] and |ca_name|
   // to something like:
   // "Verified by <issuer_organization_name>"
-  static bool GetEVCertNames(const X509Certificate& cert,
+  static bool GetEVCertNames(const net::X509Certificate& cert,
                              std::wstring* short_name,
                              std::wstring* ca_name);
 
@@ -470,7 +470,7 @@ class SSLManager : public NotificationObserver {
   ObserverList<SSLInfoBar> visible_info_bars_;
 
   // Certificate policies for each host.
-  std::map<std::string, X509Certificate::Policy> cert_policy_for_host_;
+  std::map<std::string, net::X509Certificate::Policy> cert_policy_for_host_;
 
   // Domains for which it is OK to show insecure content.
   std::set<std::string> can_show_insecure_content_for_host_;