Remove GetActiveEntry usage from content.

This is a copy of https://chromiumcodereview.appspot.com/23022006, which was reverted due to perf regression. The root cause was WebContentsImpl::GetWebkitPrefs using GetLastCommittedEntry, which caused compositing to be disabled and higher memory usage on Mac. I've removed that part of the change and will investigate separately how to best fix it.

BUG=273710

Review URL: https://codereview.chromium.org/25654005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227665 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 4 deletions

diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc
index 42ee02f..6a6572a 100644
--- a/content/browser/ssl/ssl_manager.cc
+++ b/content/browser/ssl/ssl_manager.cc
@@ -87,7 +87,7 @@ void SSLManager::NotifySSLInternalStateChanged(BrowserContext* context) {
   for (std::set<SSLManager*>::iterator i = managers->get().begin();
        i != managers->get().end(); ++i) {
     (*i)->UpdateEntry(NavigationEntryImpl::FromNavigationEntry(
-                          (*i)->controller()->GetActiveEntry()));
+                          (*i)->controller()->GetLastCommittedEntry()));
   }
 }
 
@@ -114,7 +114,8 @@ SSLManager::~SSLManager() {
 
 void SSLManager::DidCommitProvisionalLoad(const LoadCommittedDetails& details) {
   NavigationEntryImpl* entry =
-      NavigationEntryImpl::FromNavigationEntry(controller_->GetActiveEntry());
+      NavigationEntryImpl::FromNavigationEntry(
+          controller_->GetLastCommittedEntry());
 
   if (details.is_main_frame) {
     if (entry) {
@@ -144,12 +145,14 @@ void SSLManager::DidCommitProvisionalLoad(const LoadCommittedDetails& details) {
 
 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);
 }