Remove GetActiveEntry usage from content.

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 71 matching lines @@
 }
 
 // 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()));
+                          (*i)->controller()->GetLastCommittedEntry()));

[Charlie Reis, 2013/08/16 22:10:14]

I like that we're switching to GetLastCommittedEntry here, but I don't know
enough about SSLManager to be sure.  Adam, does this class expect to work with
pending NavigationEntries (i.e., provisional loads), or does it only deal with
the URL after it has committed?

   }
 }
 
 SSLManager::SSLManager(NavigationControllerImpl* controller)
     : backend_(controller),
       policy_(new SSLPolicy(&backend_)),
       controller_(controller) {
   DCHECK(controller_);
 
   // Subscribe to various notifications.
@@ skipping 21 matching lines @@
       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());
+      NavigationEntryImpl::FromNavigationEntry(
+          controller_->GetLastCommittedEntry());
 
   if (details->is_main_frame) {
     if (entry) {
       // Decode the security details.
       int ssl_cert_id;
       net::CertStatus ssl_cert_status;
       int ssl_security_bits;
       int ssl_connection_status;
       DeserializeSecurityInfo(details->serialized_security_info,
                               &ssl_cert_id,
                               &ssl_cert_status,
                               &ssl_security_bits,
                               &ssl_connection_status);
 
       // We may not have an entry if this is a navigation to an initial blank
       // page. Reset the SSL information and add the new data we have.
       entry->GetSSL() = SSLStatus();
       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()));
+      NavigationEntryImpl::FromNavigationEntry(
+          controller_->GetLastCommittedEntry()));
 }
 
 void SSLManager::DidRunInsecureContent(const std::string& security_origin) {
   NavigationEntryImpl* navigation_entry =
-      NavigationEntryImpl::FromNavigationEntry(controller_->GetActiveEntry());
+      NavigationEntryImpl::FromNavigationEntry(
+          controller_->GetLastCommittedEntry());
   policy()->DidRunInsecureContent(navigation_entry, security_origin);
   UpdateEntry(navigation_entry);
 }
 
 void SSLManager::Observe(int type,
                          const NotificationSource& source,
                          const NotificationDetails& details) {
   // Dispatch by type.
   switch (type) {
     case NOTIFICATION_RESOURCE_RESPONSE_STARTED:
@@ skipping 60 matching lines @@
 
   SSLStatus original_ssl_status = entry->GetSSL();  // Copy!
 
   policy()->UpdateEntry(entry, controller_->web_contents());
 
   if (!entry->GetSSL().Equals(original_ssl_status))
     controller_->web_contents()->DidChangeVisibleSSLState();
 }
 
 }  // namespace content