Rename NavigationController to NavigationControllerImpl and put it into the content namespace. Al...

content/browser/ssl/ssl_manager.cc

 // Copyright (c) 2011 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 "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/load_from_memory_cache_details.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "content/browser/renderer_host/resource_request_details.h"
 #include "content/browser/ssl/ssl_cert_error_handler.h"
 #include "content/browser/ssl/ssl_policy.h"
 #include "content/browser/ssl/ssl_request_info.h"
-#include "content/browser/tab_contents/navigation_entry.h"
+#include "content/browser/tab_contents/navigation_entry_impl.h"
 #include "content/browser/tab_contents/provisional_load_details.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/ssl_status.h"
 #include "net/base/cert_status_flags.h"
 
 using content::BrowserThread;
+using content::NavigationEntry;
+using content::NavigationEntryImpl;
 using content::SSLStatus;
 using content::WebContents;
 
 // static
 void SSLManager::OnSSLCertificateError(ResourceDispatcherHost* rdh,
                                        net::URLRequest* request,
                                        const net::SSLInfo& ssl_info,
                                        bool is_hsts_host) {
   DVLOG(1) << "OnSSLCertificateError() cert_error: "
            << net::MapCertStatusToNetError(ssl_info.cert_status)
@@ skipping 86 matching lines @@
 }
 
 SSLManager::~SSLManager() {
 }
 
 void SSLManager::DidCommitProvisionalLoad(
     const content::NotificationDetails& in_details) {
   content::LoadCommittedDetails* details =
       content::Details<content::LoadCommittedDetails>(in_details).ptr();
 
-  NavigationEntry* entry =
-      NavigationEntry::FromNavigationEntry(controller_->GetActiveEntry());
+  NavigationEntryImpl* entry =
+      NavigationEntryImpl::FromNavigationEntry(controller_->GetActiveEntry());
 
   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::DidRunInsecureContent(const std::string& security_origin) {
   policy()->DidRunInsecureContent(
-      NavigationEntry::FromNavigationEntry(controller_->GetActiveEntry()),
+      NavigationEntryImpl::FromNavigationEntry(controller_->GetActiveEntry()),
       security_origin);
 }
 
 bool SSLManager::ProcessedSSLErrorFromRequest() const {
-  content::NavigationEntry* entry = controller_->GetActiveEntry();
+  NavigationEntry* entry = controller_->GetActiveEntry();
   if (!entry) {
     NOTREACHED();
     return false;
   }
 
   return net::IsCertStatusError(entry->GetSSL().cert_status);
 }
 
 void SSLManager::Observe(int type,
                          const content::NotificationSource& source,
@@ skipping 57 matching lines @@
 void SSLManager::DidReceiveResourceRedirect(ResourceRedirectDetails* details) {
   // TODO(abarth): Make sure our redirect behavior is correct.  If we ever see a
   //               non-HTTPS resource in the redirect chain, we want to trigger
   //               insecure content, even if the redirect chain goes back to
   //               HTTPS.  This is because the network attacker can redirect the
   //               HTTP request to https://attacker.com/payload.js.
 }
 
 void SSLManager::DidChangeSSLInternalState() {
   UpdateEntry(
-      NavigationEntry::FromNavigationEntry(controller_->GetActiveEntry()));
+      NavigationEntryImpl::FromNavigationEntry(controller_->GetActiveEntry()));
 }
 
-void SSLManager::UpdateEntry(NavigationEntry* entry) {
+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_->tab_contents());
 
   if (!entry->GetSSL().Equals(original_ssl_status)) {
     content::NotificationService::current()->Notify(
         content::NOTIFICATION_SSL_VISIBLE_STATE_CHANGED,
         content::Source<NavigationController>(controller_),
         content::NotificationService::NoDetails());
   }
 }