Revert 95541 - Profiles: SSLManger broadcasts SSL_INTERNAL_STATE_CHANGED with a Source<BrowserCon...

content/browser/ssl/ssl_manager.cc

 // Copyright (c) 2011 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 "base/utf_string_conversions.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/load_from_memory_cache_details.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "content/browser/renderer_host/resource_request_details.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/tab_contents/navigation_details.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/provisional_load_details.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_service.h"
-#include "content/common/notification_source.h"
 #include "net/base/cert_status_flags.h"
 
 // static
 void SSLManager::OnSSLCertificateError(ResourceDispatcherHost* rdh,
                                        net::URLRequest* request,
                                        int cert_error,
                                        net::X509Certificate* cert) {
   DVLOG(1) << "OnSSLCertificateError() cert_error: " << cert_error
            << " url: " << request->url().spec();
 
   ResourceDispatcherHostRequestInfo* info =
       ResourceDispatcherHost::InfoForRequest(request);
 
   // A certificate error occurred.  Construct a SSLCertErrorHandler object and
   // hand it over to the UI thread for processing.
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(new SSLCertErrorHandler(rdh,
                                                 request,
                                                 info->resource_type(),
                                                 cert_error,
                                                 cert),
                         &SSLCertErrorHandler::Dispatch));
 }
 
 // static
-void SSLManager::NotifySSLInternalStateChanged(
-    NavigationController* controller) {
+void SSLManager::NotifySSLInternalStateChanged() {
   NotificationService::current()->Notify(
       content::NOTIFICATION_SSL_INTERNAL_STATE_CHANGED,
-      Source<content::BrowserContext>(controller->browser_context()),
+      NotificationService::AllSources(),
       NotificationService::NoDetails());
 }
 
 // static
 std::string SSLManager::SerializeSecurityInfo(int cert_id,
                                               int cert_status,
                                               int security_bits,
                                               int ssl_connection_status) {
   Pickle pickle;
   pickle.WriteInt(cert_id);
@@ skipping 37 matching lines @@
   // Subscribe to various notifications.
   registrar_.Add(this, content::NOTIFICATION_FAIL_PROVISIONAL_LOAD_WITH_ERROR,
                  Source<NavigationController>(controller_));
   registrar_.Add(this, content::NOTIFICATION_RESOURCE_RESPONSE_STARTED,
                  Source<RenderViewHostDelegate>(controller_->tab_contents()));
   registrar_.Add(this, content::NOTIFICATION_RESOURCE_RECEIVED_REDIRECT,
                  Source<RenderViewHostDelegate>(controller_->tab_contents()));
   registrar_.Add(this, content::NOTIFICATION_LOAD_FROM_MEMORY_CACHE,
                  Source<NavigationController>(controller_));
   registrar_.Add(this, content::NOTIFICATION_SSL_INTERNAL_STATE_CHANGED,
-                 Source<content::BrowserContext>(
-                     controller_->browser_context()));
+                 NotificationService::AllSources());
 }
 
 SSLManager::~SSLManager() {
 }
 
 void SSLManager::DidCommitProvisionalLoad(
     const NotificationDetails& in_details) {
   content::LoadCommittedDetails* details =
       Details<content::LoadCommittedDetails>(in_details).ptr();
 
@@ skipping 118 matching lines @@
 
   policy()->UpdateEntry(entry, controller_->tab_contents());
 
   if (!entry->ssl().Equals(original_ssl_status)) {
     NotificationService::current()->Notify(
         content::NOTIFICATION_SSL_VISIBLE_STATE_CHANGED,
         Source<NavigationController>(controller_),
         NotificationService::NoDetails());
   }
 }