content: convert SSL notifications to observer usage

content/browser/ssl/ssl_manager.cc

Index: content/browser/ssl/ssl_manager.cc
diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc
index d41260e583e325a7dc9ef4e251c148ba006ce283..a3b29f0fb3f7f125f7732e68f479b3d0349bae2d 100644
--- a/content/browser/ssl/ssl_manager.cc
+++ b/content/browser/ssl/ssl_manager.cc
@@ -60,15 +60,6 @@ void SSLManager::OnSSLCertificateError(
                                          fatal)));
 }
 
-// static
-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_)),
@@ -85,10 +76,6 @@ SSLManager::SSLManager(NavigationControllerImpl* controller)
   registrar_.Add(
       this, NOTIFICATION_LOAD_FROM_MEMORY_CACHE,
       Source<NavigationController>(controller_));
-  registrar_.Add(
-      this, NOTIFICATION_SSL_INTERNAL_STATE_CHANGED,
-      Source<BrowserContext>(
-          controller_->GetBrowserContext()));
 }
 
 SSLManager::~SSLManager() {
@@ -128,10 +115,21 @@ void SSLManager::DidCommitProvisionalLoad(
   UpdateEntry(entry);
 }
 
+void SSLManager::DidDisplayInsecureContent() {
+  UpdateEntry(
+      NavigationEntryImpl::FromNavigationEntry(controller_->GetActiveEntry()));
+}
+
 void SSLManager::DidRunInsecureContent(const std::string& security_origin) {
-  policy()->DidRunInsecureContent(
-      NavigationEntryImpl::FromNavigationEntry(controller_->GetActiveEntry()),
-      security_origin);
+  NavigationEntryImpl* navigation_entry =
+      NavigationEntryImpl::FromNavigationEntry(controller_->GetActiveEntry());
+  policy()->DidRunInsecureContent(navigation_entry, security_origin);
+  UpdateEntry(navigation_entry);
+}
+
+void SSLManager::DidChangeInternalSSLState() {
+  UpdateEntry(

[Paweł Hajdan Jr., 2013/01/24 18:53:43]

Question: I'd need to broadcast the notification to all other SSLManagers in the
same BrowserContext (this is needed to get
SSLUITest.TestRunsInsecureContentTwoTabs test to pass).

Do you have any suggestions how to do that?

[jam, 2013/01/30 01:17:51]

there isn't a way to do this now. one suggestion:

BrowserContext derives from SupportsUserData. Perhaps internally in content we
add an object to it that can hold a list of callbacks, and that object can
handle addition/removal of callbacks. it can also have a method that SSLManagers
can call to notify the other callbackst hat internal state change.

all this code can even be inside ssl_manager.cc, since no other class should
know/care about this.

+      NavigationEntryImpl::FromNavigationEntry(controller_->GetActiveEntry()));
 }
 
 void SSLManager::Observe(int type,
@@ -151,9 +149,6 @@ void SSLManager::Observe(int type,
       DidLoadFromMemoryCache(
           Details<LoadFromMemoryCacheDetails>(details).ptr());
       break;
-    case NOTIFICATION_SSL_INTERNAL_STATE_CHANGED:
-      DidChangeSSLInternalState();
-      break;
     default:
       NOTREACHED() << "The SSLManager received an unexpected notification.";
   }
@@ -198,11 +193,6 @@ void SSLManager::DidReceiveResourceRedirect(ResourceRedirectDetails* details) {
   //               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.
@@ -213,12 +203,8 @@ void SSLManager::UpdateEntry(NavigationEntryImpl* entry) {
 
   policy()->UpdateEntry(entry, controller_->web_contents());
 
-  if (!entry->GetSSL().Equals(original_ssl_status)) {
-    NotificationService::current()->Notify(
-        NOTIFICATION_SSL_VISIBLE_STATE_CHANGED,
-        Source<NavigationController>(controller_),
-        NotificationService::NoDetails());
-  }
+  if (!entry->GetSSL().Equals(original_ssl_status))
+    controller_->web_contents()->DidChangeVisibleSSLState();
 }
 
 }  // namespace content