Rename NavigationController to NavigationControllerImpl and put it into the content namespace. Also make all users of content::NavigationController interface use the "using" keyword so they don't have to put content:: everywhere (similar to other Content API and WebKit API classes).

BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/8956059

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

4 files changed, 28 insertions, 17 deletions

diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc
index 55a7ba2..577b2d1 100644
--- a/content/browser/ssl/ssl_manager.cc
+++ b/content/browser/ssl/ssl_manager.cc
@@ -13,7 +13,7 @@
 #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"
@@ -24,6 +24,8 @@
 #include "net/base/cert_status_flags.h"
 
 using content::BrowserThread;
+using content::NavigationEntry;
+using content::NavigationEntryImpl;
 using content::SSLStatus;
 using content::WebContents;
 
@@ -130,8 +132,8 @@ void SSLManager::DidCommitProvisionalLoad(
   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) {
@@ -161,12 +163,12 @@ void SSLManager::DidCommitProvisionalLoad(
 
 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;
@@ -244,10 +246,10 @@ void SSLManager::DidReceiveResourceRedirect(ResourceRedirectDetails* details) {
 
 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)
diff --git a/content/browser/ssl/ssl_manager.h b/content/browser/ssl/ssl_manager.h
index a5c65c2..6aa98cc 100644
--- a/content/browser/ssl/ssl_manager.h
+++ b/content/browser/ssl/ssl_manager.h
@@ -20,12 +20,15 @@
 
 class LoadFromMemoryCacheDetails;
 class NavigationController;
-class NavigationEntry;
 class ResourceDispatcherHost;
 class ResourceRedirectDetails;
 class ResourceRequestDetails;
 class SSLPolicy;
 
+namespace content {
+class NavigationEntryImpl;
+}
+
 namespace net {
 class SSLInfo;
 class URLRequest;
@@ -110,7 +113,7 @@ class SSLManager : public content::NotificationObserver {
   void DidChangeSSLInternalState();
 
   // Update the NavigationEntry with our current state.
-  void UpdateEntry(NavigationEntry* entry);
+  void UpdateEntry(content::NavigationEntryImpl* entry);
 
   // The backend for the SSLPolicy to actuate its decisions.
   SSLPolicyBackend backend_;
diff --git a/content/browser/ssl/ssl_policy.cc b/content/browser/ssl/ssl_policy.cc
index 57acc78..5202655 100644
--- a/content/browser/ssl/ssl_policy.cc
+++ b/content/browser/ssl/ssl_policy.cc
@@ -15,7 +15,7 @@
 #include "content/browser/site_instance.h"
 #include "content/browser/ssl/ssl_cert_error_handler.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/tab_contents.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/ssl_status.h"
@@ -24,6 +24,7 @@
 #include "net/base/ssl_info.h"
 #include "webkit/glue/resource_type.h"
 
+using content::NavigationEntryImpl;
 using content::SSLStatus;
 
 namespace {
@@ -86,7 +87,7 @@ void SSLPolicy::OnCertError(SSLCertErrorHandler* handler) {
   }
 }
 
-void SSLPolicy::DidRunInsecureContent(NavigationEntry* entry,
+void SSLPolicy::DidRunInsecureContent(NavigationEntryImpl* entry,
                                       const std::string& security_origin) {
   if (!entry)
     return;
@@ -108,7 +109,8 @@ void SSLPolicy::OnRequestStarted(SSLRequestInfo* info) {
     backend_->HostRanInsecureContent(info->url().host(), info->child_id());
 }
 
-void SSLPolicy::UpdateEntry(NavigationEntry* entry, TabContents* tab_contents) {
+void SSLPolicy::UpdateEntry(NavigationEntryImpl* entry,
+                            TabContents* tab_contents) {
   DCHECK(entry);
 
   InitializeEntryIfNeeded(entry);
@@ -206,7 +208,7 @@ void SSLPolicy::OnCertErrorInternal(SSLCertErrorHandler* handler,
       base::Bind(&SSLPolicy::OnAllowCertificate, base::Unretained(this)));
 }
 
-void SSLPolicy::InitializeEntryIfNeeded(NavigationEntry* entry) {
+void SSLPolicy::InitializeEntryIfNeeded(NavigationEntryImpl* entry) {
   if (entry->GetSSL().security_style != content::SECURITY_STYLE_UNKNOWN)
     return;
 
diff --git a/content/browser/ssl/ssl_policy.h b/content/browser/ssl/ssl_policy.h
index 302207d..1cf0de1 100644
--- a/content/browser/ssl/ssl_policy.h
+++ b/content/browser/ssl/ssl_policy.h
@@ -10,12 +10,15 @@
 
 #include "webkit/glue/resource_type.h"
 
-class NavigationEntry;
 class SSLCertErrorHandler;
 class SSLPolicyBackend;
 class SSLRequestInfo;
 class TabContents;
 
+namespace content {
+class NavigationEntryImpl;
+}
+
 // SSLPolicy
 //
 // This class is responsible for making the security decisions that concern the
@@ -29,7 +32,7 @@ class SSLPolicy {
   // An error occurred with the certificate in an SSL connection.
   void OnCertError(SSLCertErrorHandler* handler);
 
-  void DidRunInsecureContent(NavigationEntry* entry,
+  void DidRunInsecureContent(content::NavigationEntryImpl* entry,
                              const std::string& security_origin);
 
   // We have started a resource request with the given info.
@@ -37,7 +40,8 @@ class SSLPolicy {
 
   // Update the SSL information in |entry| to match the current state.
   // |tab_contents| is the TabContents associated with this entry.
-  void UpdateEntry(NavigationEntry* entry, TabContents* tab_contents);
+  void UpdateEntry(content::NavigationEntryImpl* entry,
+                   TabContents* tab_contents);
 
   SSLPolicyBackend* backend() const { return backend_; }
 
@@ -54,7 +58,7 @@ class SSLPolicy {
 
   // If the security style of |entry| has not been initialized, then initialize
   // it with the default style for its URL.
-  void InitializeEntryIfNeeded(NavigationEntry* entry);
+  void InitializeEntryIfNeeded(content::NavigationEntryImpl* entry);
 
   // Mark |origin| as having run insecure content in the process with ID |pid|.
   void OriginRanInsecureContent(const std::string& origin, int pid);