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 69 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()));
   }
 }
 
 SSLManager::SSLManager(NavigationControllerImpl* controller)
     : backend_(controller),
       policy_(new SSLPolicy(&backend_)),
       controller_(controller) {
   DCHECK(controller_);
 
   SSLManagerSet* managers = static_cast<SSLManagerSet*>(
       controller_->GetBrowserContext()->GetUserData(kSSLManagerKeyName));
   if (!managers) {
     managers = new SSLManagerSet;
     controller_->GetBrowserContext()->SetUserData(kSSLManagerKeyName, managers);
   }
   managers->get().insert(this);
 }
 
 SSLManager::~SSLManager() {
   SSLManagerSet* managers = static_cast<SSLManagerSet*>(
       controller_->GetBrowserContext()->GetUserData(kSSLManagerKeyName));
   managers->get().erase(this);
 }
 
 void SSLManager::DidCommitProvisionalLoad(const LoadCommittedDetails& details) {
   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::DidLoadFromMemoryCache(
     const 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 41 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