Index: content/browser/ssl/ssl_manager.cc |
diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc |
index ccaf9cf2062bd2660d6ea0ac4b2c43b21b2daa89..865ca6027a2e631637056b803fff0a9b7f724c20 100644 |
--- a/content/browser/ssl/ssl_manager.cc |
+++ b/content/browser/ssl/ssl_manager.cc |
@@ -85,8 +85,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()->GetLastCommittedEntry())); |
+ (*i)->UpdateEntry((*i)->controller()->GetLastCommittedEntry()); |
} |
} |
@@ -112,9 +111,7 @@ SSLManager::~SSLManager() { |
} |
void SSLManager::DidCommitProvisionalLoad(const LoadCommittedDetails& details) { |
- NavigationEntryImpl* entry = |
- NavigationEntryImpl::FromNavigationEntry( |
- controller_->GetLastCommittedEntry()); |
+ NavigationEntryImpl* entry = controller_->GetLastCommittedEntry(); |
if (details.is_main_frame) { |
if (entry) { |
@@ -148,15 +145,11 @@ void SSLManager::DidCommitProvisionalLoad(const LoadCommittedDetails& details) { |
} |
void SSLManager::DidDisplayInsecureContent() { |
- UpdateEntry( |
- NavigationEntryImpl::FromNavigationEntry( |
- controller_->GetLastCommittedEntry())); |
+ UpdateEntry(controller_->GetLastCommittedEntry()); |
} |
void SSLManager::DidRunInsecureContent(const std::string& security_origin) { |
- NavigationEntryImpl* navigation_entry = |
- NavigationEntryImpl::FromNavigationEntry( |
- controller_->GetLastCommittedEntry()); |
+ NavigationEntryImpl* navigation_entry = controller_->GetLastCommittedEntry(); |
policy()->DidRunInsecureContent(navigation_entry, security_origin); |
UpdateEntry(navigation_entry); |
} |