Remove ssl_manager.h dependency from chrome.

BUG=98716
Review URL: https://chromiumcodereview.appspot.com/9382042

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121704 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 6 insertions, 25 deletions

diff --git a/content/browser/ssl/ssl_error_handler.cc b/content/browser/ssl/ssl_error_handler.cc
index c9e1e31..e3eceab 100644
--- a/content/browser/ssl/ssl_error_handler.cc
+++ b/content/browser/ssl/ssl_error_handler.cc
@@ -78,7 +78,9 @@ void SSLErrorHandler::Dispatch() {
   }
 
   // Hand ourselves off to the SSLManager.
-  manager_ = web_contents->GetController().GetSSLManager();
+  manager_ =
+      static_cast<NavigationControllerImpl*>(&web_contents->GetController())->
+          ssl_manager();
   OnDispatched();
 }
 
diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc
index 37e697f..44e5df9 100644
--- a/content/browser/ssl/ssl_manager.cc
+++ b/content/browser/ssl/ssl_manager.cc
@@ -131,16 +131,6 @@ void SSLManager::DidRunInsecureContent(const std::string& security_origin) {
       security_origin);
 }
 
-bool SSLManager::ProcessedSSLErrorFromRequest() const {
-  NavigationEntry* entry = controller_->GetActiveEntry();
-  if (!entry) {
-    NOTREACHED();
-    return false;
-  }
-
-  return net::IsCertStatusError(entry->GetSSL().cert_status);
-}
-
 void SSLManager::Observe(int type,
                          const content::NotificationSource& source,
                          const content::NotificationDetails& details) {
diff --git a/content/browser/ssl/ssl_manager.h b/content/browser/ssl/ssl_manager.h
index 2fb05aa..70cd067 100644
--- a/content/browser/ssl/ssl_manager.h
+++ b/content/browser/ssl/ssl_manager.h
@@ -80,9 +80,6 @@ class SSLManager : public content::NotificationObserver {
   // Insecure content entry point.
   void DidRunInsecureContent(const std::string& security_origin);
 
-  // Called to determine if there were any processed SSL errors from request.
-  CONTENT_EXPORT bool ProcessedSSLErrorFromRequest() const;
-
   // Entry point for navigation.  This function begins the process of updating
   // the security UI when the main frame navigates to a new URL.
   //
diff --git a/content/browser/tab_contents/navigation_controller_impl.cc b/content/browser/tab_contents/navigation_controller_impl.cc
index 4813c60..e72fc89 100644
--- a/content/browser/tab_contents/navigation_controller_impl.cc
+++ b/content/browser/tab_contents/navigation_controller_impl.cc
@@ -1151,10 +1151,6 @@ void NavigationControllerImpl::PruneAllButActive() {
   }
 }
 
-SSLManager* NavigationControllerImpl::GetSSLManager() {
-  return &ssl_manager_;
-}
-
 void NavigationControllerImpl::SetMaxRestoredPageID(int32 max_id) {
   max_restored_page_id_ = max_id;
 }
diff --git a/content/browser/tab_contents/navigation_controller_impl.h b/content/browser/tab_contents/navigation_controller_impl.h
index 6c41b7e..ba63482 100644
--- a/content/browser/tab_contents/navigation_controller_impl.h
+++ b/content/browser/tab_contents/navigation_controller_impl.h
@@ -76,7 +76,6 @@ class CONTENT_EXPORT NavigationControllerImpl
   virtual void GoToIndex(int index) OVERRIDE;
   virtual void GoToOffset(int offset) OVERRIDE;
   virtual void RemoveEntryAtIndex(int index) OVERRIDE;
-  virtual SSLManager* GetSSLManager() OVERRIDE;
   virtual SessionStorageNamespace* GetSessionStorageNamespace() const OVERRIDE;
   virtual void SetMaxRestoredPageID(int32 max_id) OVERRIDE;
   virtual int32 GetMaxRestoredPageID() const OVERRIDE;
@@ -166,6 +165,8 @@ class CONTENT_EXPORT NavigationControllerImpl
 
   // Random data ---------------------------------------------------------------
 
+  SSLManager* ssl_manager() { return &ssl_manager_; }
+
   // Maximum number of entries before we start removing entries from the front.
   static void set_max_entry_count_for_testing(size_t max_entry_count) {
     max_entry_count_for_testing_ = max_entry_count;
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index 71b14ff..7f34eac6 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -1512,7 +1512,7 @@ void TabContents::OnDidRunInsecureContent(
     content::RecordAction(
         UserMetricsAction("SSL.RanInsecureContentGoogle"));
   }
-  controller_.GetSSLManager()->DidRunInsecureContent(security_origin);
+  controller_.ssl_manager()->DidRunInsecureContent(security_origin);
   displayed_insecure_content_ = true;
   SSLManager::NotifySSLInternalStateChanged(&GetControllerImpl());
 }
diff --git a/content/public/browser/navigation_controller.h b/content/public/browser/navigation_controller.h
index 0e18514..ebf00ba 100644
--- a/content/public/browser/navigation_controller.h
+++ b/content/public/browser/navigation_controller.h
@@ -16,7 +16,6 @@
 
 class GURL;
 class SessionStorageNamespace;
-class SSLManager;
 
 namespace content {
 
@@ -207,8 +206,6 @@ class NavigationController {
 
   // Random --------------------------------------------------------------------
 
-  virtual SSLManager* GetSSLManager() = 0;
-
   // The session storage namespace that all child render views should use.
   virtual SessionStorageNamespace* GetSessionStorageNamespace() const = 0;
 
diff --git a/content/public/common/ssl_status.h b/content/public/common/ssl_status.h
index cacaa1e..08b4209 100644
--- a/content/public/common/ssl_status.h
+++ b/content/public/common/ssl_status.h
@@ -46,8 +46,6 @@ struct CONTENT_EXPORT SSLStatus {
   int connection_status;
   // A combination of the ContentStatusFlags above.
   int content_status;
-
-  // Copy and assignment is explicitly allowed for this class.
 };
 
 }  // namespace content