Attach a SecurityStyle to each request in ResourceLoader

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/strings/utf_string_conversions.h"
@@ skipping 103 matching lines @@
   NavigationEntryImpl* entry = controller_->GetLastCommittedEntry();
 
   if (details.is_main_frame) {
     if (entry) {
       // We may not have an entry if this is a navigation to an initial blank
       // page. Add the new data we have.
       entry->GetSSL() = details.ssl_status;
     }
   }
 
-  UpdateEntry(entry);
+  policy()->UpdateEntry(entry, controller_->delegate()->GetWebContents());
+  // Always notify the WebContents that the SSL state changed when a
+  // load is committed, in case the active navigation entry has changed.
+  NotifyDidChangeVisibleSSLState();
 }
 
 void SSLManager::DidDisplayInsecureContent() {
   UpdateEntry(controller_->GetLastCommittedEntry());
 }
 
 void SSLManager::DidRunInsecureContent(const std::string& security_origin) {
   NavigationEntryImpl* navigation_entry = controller_->GetLastCommittedEntry();
   policy()->DidRunInsecureContent(navigation_entry, security_origin);
   UpdateEntry(navigation_entry);
@@ skipping 42 matching lines @@
 }
 
 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_->delegate()->GetWebContents());
+
+  if (!entry->GetSSL().Equals(original_ssl_status))
+    NotifyDidChangeVisibleSSLState();
+}
+
+void SSLManager::NotifyDidChangeVisibleSSLState() {
   WebContentsImpl* contents =
       static_cast<WebContentsImpl*>(controller_->delegate()->GetWebContents());
-  policy()->UpdateEntry(entry, contents);
-
-  if (!entry->GetSSL().Equals(original_ssl_status))
-    contents->DidChangeVisibleSSLState();
+  contents->DidChangeVisibleSSLState();
 }
 
 }  // namespace content