Revert "content: convert SSL notifications to observer usage"

content/browser/ssl/ssl_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/ssl/ssl_manager.h"
 
-#include <set>
-
 #include "base/bind.h"
-#include "base/supports_user_data.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "content/browser/ssl/ssl_cert_error_handler.h"
 #include "content/browser/ssl/ssl_policy.h"
 #include "content/browser/ssl/ssl_request_info.h"
 #include "content/browser/web_contents/navigation_entry_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/ssl_status_serialization.h"
-#include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/load_from_memory_cache_details.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/resource_request_details.h"
 #include "content/public/common/ssl_status.h"
 #include "net/url_request/url_request.h"
 
 namespace content {
 
-namespace {
-
-const char kSSLManagerKeyName[] = "content_ssl_manager";
-
-class SSLManagerSet : public base::SupportsUserData::Data {
- public:
-  SSLManagerSet() {
-  }
-
-  std::set<SSLManager*>& get() { return set_; }
-
- private:
-  std::set<SSLManager*> set_;
-
-  DISALLOW_COPY_AND_ASSIGN(SSLManagerSet);
-};
-
-}  // namespace
-
 // static
 void SSLManager::OnSSLCertificateError(
     const base::WeakPtr<SSLErrorHandler::Delegate>& delegate,
     const GlobalRequestID& id,
     const ResourceType::Type resource_type,
     const GURL& url,
     int render_process_id,
     int render_view_id,
     const net::SSLInfo& ssl_info,
     bool fatal) {
@@ skipping 16 matching lines @@
                                          id,
                                          resource_type,
                                          url,
                                          render_process_id,
                                          render_view_id,
                                          ssl_info,
                                          fatal)));
 }
 
 // static
-void SSLManager::NotifySSLInternalStateChanged(BrowserContext* context) {
-  SSLManagerSet* managers = static_cast<SSLManagerSet*>(
-      context->GetUserData(kSSLManagerKeyName));
-
-  for (std::set<SSLManager*>::iterator i = managers->get().begin();
-       i != managers->get().end(); ++i) {
-    (*i)->UpdateEntry(NavigationEntryImpl::FromNavigationEntry(
-                          (*i)->controller()->GetActiveEntry()));
-  }
+void SSLManager::NotifySSLInternalStateChanged(
+    NavigationControllerImpl* controller) {
+  NotificationService::current()->Notify(
+      NOTIFICATION_SSL_INTERNAL_STATE_CHANGED,
+      Source<BrowserContext>(controller->GetBrowserContext()),
+      NotificationService::NoDetails());
 }
 
 SSLManager::SSLManager(NavigationControllerImpl* controller)
     : backend_(controller),
       policy_(new SSLPolicy(&backend_)),
       controller_(controller) {
   DCHECK(controller_);
 
   // Subscribe to various notifications.
   registrar_.Add(
       this, NOTIFICATION_RESOURCE_RESPONSE_STARTED,
       Source<WebContents>(controller_->web_contents()));
   registrar_.Add(
       this, NOTIFICATION_RESOURCE_RECEIVED_REDIRECT,
       Source<WebContents>(controller_->web_contents()));
   registrar_.Add(
       this, NOTIFICATION_LOAD_FROM_MEMORY_CACHE,
       Source<NavigationController>(controller_));
-
-  SSLManagerSet* managers = static_cast<SSLManagerSet*>(
-      controller_->GetBrowserContext()->GetUserData(kSSLManagerKeyName));
-  if (!managers) {
-    managers = new SSLManagerSet;
-    controller_->GetBrowserContext()->SetUserData(kSSLManagerKeyName, managers);
-  }
-  managers->get().insert(this);
+  registrar_.Add(
+      this, NOTIFICATION_SSL_INTERNAL_STATE_CHANGED,
+      Source<BrowserContext>(
+          controller_->GetBrowserContext()));
 }
 
 SSLManager::~SSLManager() {
-  SSLManagerSet* managers = static_cast<SSLManagerSet*>(
-      controller_->GetBrowserContext()->GetUserData(kSSLManagerKeyName));
-  managers->get().erase(this);
 }
 
 void SSLManager::DidCommitProvisionalLoad(
     const NotificationDetails& in_details) {
   LoadCommittedDetails* details =
       Details<LoadCommittedDetails>(in_details).ptr();
 
   NavigationEntryImpl* entry =
       NavigationEntryImpl::FromNavigationEntry(controller_->GetActiveEntry());
 
@@ skipping 16 matching lines @@
       entry->GetSSL().cert_id = ssl_cert_id;
       entry->GetSSL().cert_status = ssl_cert_status;
       entry->GetSSL().security_bits = ssl_security_bits;
       entry->GetSSL().connection_status = ssl_connection_status;
     }
   }
 
   UpdateEntry(entry);
 }
 
-void SSLManager::DidDisplayInsecureContent() {
-  UpdateEntry(
-      NavigationEntryImpl::FromNavigationEntry(controller_->GetActiveEntry()));
-}
-
 void SSLManager::DidRunInsecureContent(const std::string& security_origin) {
-  NavigationEntryImpl* navigation_entry =
-      NavigationEntryImpl::FromNavigationEntry(controller_->GetActiveEntry());
-  policy()->DidRunInsecureContent(navigation_entry, security_origin);
-  UpdateEntry(navigation_entry);
+  policy()->DidRunInsecureContent(
+      NavigationEntryImpl::FromNavigationEntry(controller_->GetActiveEntry()),
+      security_origin);
 }
 
 void SSLManager::Observe(int type,
                          const NotificationSource& source,
                          const NotificationDetails& details) {
   // Dispatch by type.
   switch (type) {
     case NOTIFICATION_RESOURCE_RESPONSE_STARTED:
       DidStartResourceResponse(
           Details<ResourceRequestDetails>(details).ptr());
       break;
     case NOTIFICATION_RESOURCE_RECEIVED_REDIRECT:
       DidReceiveResourceRedirect(
           Details<ResourceRedirectDetails>(details).ptr());
       break;
     case NOTIFICATION_LOAD_FROM_MEMORY_CACHE:
       DidLoadFromMemoryCache(
           Details<LoadFromMemoryCacheDetails>(details).ptr());
       break;
+    case NOTIFICATION_SSL_INTERNAL_STATE_CHANGED:
+      DidChangeSSLInternalState();
+      break;
     default:
       NOTREACHED() << "The SSLManager received an unexpected notification.";
   }
 }
 
 void SSLManager::DidLoadFromMemoryCache(LoadFromMemoryCacheDetails* details) {
   // Simulate loading this resource through the usual path.
   // Note that we specify SUB_RESOURCE as the resource type as WebCore only
   // caches sub-resources.
   // This resource must have been loaded with no filtering because filtered
@@ skipping 24 matching lines @@
 }
 
 void SSLManager::DidReceiveResourceRedirect(ResourceRedirectDetails* details) {
   // TODO(abarth): Make sure our redirect behavior is correct.  If we ever see a
   //               non-HTTPS resource in the redirect chain, we want to trigger
   //               insecure content, even if the redirect chain goes back to
   //               HTTPS.  This is because the network attacker can redirect the
   //               HTTP request to https://attacker.com/payload.js.
 }
 
+void SSLManager::DidChangeSSLInternalState() {
+  UpdateEntry(
+      NavigationEntryImpl::FromNavigationEntry(controller_->GetActiveEntry()));
+}
+
 void SSLManager::UpdateEntry(NavigationEntryImpl* entry) {
   // We don't always have a navigation entry to update, for example in the
   // case of the Web Inspector.
   if (!entry)
     return;
 
   SSLStatus original_ssl_status = entry->GetSSL();  // Copy!
 
   policy()->UpdateEntry(entry, controller_->web_contents());
 
-  if (!entry->GetSSL().Equals(original_ssl_status))
-    controller_->web_contents()->DidChangeVisibleSSLState();
+  if (!entry->GetSSL().Equals(original_ssl_status)) {
+    NotificationService::current()->Notify(
+        NOTIFICATION_SSL_VISIBLE_STATE_CHANGED,
+        Source<NavigationController>(controller_),
+        NotificationService::NoDetails());
+  }
 }
 
 }  // namespace content