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

chrome/browser/automation/testing_automation_provider.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 "chrome/browser/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 137 matching lines @@
 #include "chrome/browser/download/download_shelf.h"
 #endif
 
 using automation::Error;
 using automation::ErrorCode;
 using automation_util::SendErrorIfModalDialogActive;
 using content::BrowserThread;
 using content::ChildProcessHost;
 using content::DownloadItem;
 using content::DownloadManager;
+using content::NavigationEntry;
 using content::PluginService;
 using content::OpenURLParams;
 using content::Referrer;
 using content::SSLStatus;
 using content::WebContents;
 
 namespace {
 
 void SendMouseClick(int flags) {
   ui_controls::MouseButton button = ui_controls::LEFT;
@@ skipping 1109 matching lines @@
       *process_id = base::GetProcId(rph->GetHandle());
   }
 }
 
 void TestingAutomationProvider::GetTabTitle(int handle,
                                             int* title_string_size,
                                             std::wstring* title) {
   *title_string_size = -1;  // -1 is the error code
   if (tab_tracker_->ContainsHandle(handle)) {
     NavigationController* tab = tab_tracker_->GetResource(handle);
-    content::NavigationEntry* entry = tab->GetActiveEntry();
+    NavigationEntry* entry = tab->GetActiveEntry();
     if (entry != NULL) {
       *title = UTF16ToWideHack(entry->GetTitleForDisplay(""));
     } else {
       *title = std::wstring();
     }
     *title_string_size = static_cast<int>(title->size());
   }
 }
 
 void TestingAutomationProvider::GetTabIndex(int handle, int* tabstrip_index) {
@@ skipping 268 matching lines @@
 }
 
 void TestingAutomationProvider::GetSecurityState(
     int handle,
     bool* success,
     content::SecurityStyle* security_style,
     net::CertStatus* ssl_cert_status,
     int* insecure_content_status) {
   if (tab_tracker_->ContainsHandle(handle)) {
     NavigationController* tab = tab_tracker_->GetResource(handle);
-    content::NavigationEntry* entry = tab->GetActiveEntry();
+    NavigationEntry* entry = tab->GetActiveEntry();
     *success = true;
     *security_style = entry->GetSSL().security_style;
     *ssl_cert_status = entry->GetSSL().cert_status;
     *insecure_content_status = entry->GetSSL().content_status;
   } else {
     *success = false;
     *security_style = content::SECURITY_STYLE_UNKNOWN;
     *ssl_cert_status = 0;
     *insecure_content_status = 0;
   }
 }
 
 void TestingAutomationProvider::GetPageType(
     int handle,
     bool* success,
     content::PageType* page_type) {
   if (tab_tracker_->ContainsHandle(handle)) {
     NavigationController* tab = tab_tracker_->GetResource(handle);
-    content::NavigationEntry* entry = tab->GetActiveEntry();
+    NavigationEntry* entry = tab->GetActiveEntry();
     *page_type = entry->GetPageType();
     *success = true;
     // In order to return the proper result when an interstitial is shown and
     // no navigation entry were created for it we need to ask the TabContents.
     if (*page_type == content::PAGE_TYPE_NORMAL &&
         tab->tab_contents()->ShowingInterstitialPage())
       *page_type = content::PAGE_TYPE_INTERSTITIAL;
   } else {
     *success = false;
     *page_type = content::PAGE_TYPE_NORMAL;
   }
 }
 
 void TestingAutomationProvider::GetMetricEventDuration(
     const std::string& event_name,
     int* duration_ms) {
   *duration_ms = metric_event_duration_observer_->GetEventDurationMs(
       event_name);
 }
 
 void TestingAutomationProvider::ActionOnSSLBlockingPage(
     int handle,
     bool proceed,
     IPC::Message* reply_message) {
   if (tab_tracker_->ContainsHandle(handle)) {
     NavigationController* tab = tab_tracker_->GetResource(handle);
-    content::NavigationEntry* entry = tab->GetActiveEntry();
+    NavigationEntry* entry = tab->GetActiveEntry();
     if (entry->GetPageType() == content::PAGE_TYPE_INTERSTITIAL) {
       TabContents* tab_contents = tab->tab_contents();
       InterstitialPage* ssl_blocking_page =
           InterstitialPage::GetInterstitialPage(tab_contents);
       if (ssl_blocking_page) {
         if (proceed) {
           new NavigationNotificationObserver(tab, this, reply_message, 1,
                                              false, false);
           ssl_blocking_page->Proceed();
           return;
@@ skipping 1332 matching lines @@
   AutomationJSONReply reply(this, reply_message);
   int tab_index;
   TabContents* tab_contents = NULL;
   if (!args->GetInteger("tab_index", &tab_index) ||
       !(tab_contents = browser->GetTabContentsAt(tab_index))) {
     reply.SendError("tab_index missing or invalid.");
     return;
   }
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
   const NavigationController& controller = tab_contents->GetController();
-  content::NavigationEntry* nav_entry = controller.GetActiveEntry();
+  NavigationEntry* nav_entry = controller.GetActiveEntry();
   DCHECK(nav_entry);
 
   // Security info.
   DictionaryValue* ssl = new DictionaryValue;
   std::map<content::SecurityStyle, std::string> style_to_string;
   style_to_string[content::SECURITY_STYLE_UNKNOWN] = "SECURITY_STYLE_UNKNOWN";
   style_to_string[content::SECURITY_STYLE_UNAUTHENTICATED] =
       "SECURITY_STYLE_UNAUTHENTICATED";
   style_to_string[content::SECURITY_STYLE_AUTHENTICATION_BROKEN] =
       "SECURITY_STYLE_AUTHENTICATION_BROKEN";
@@ skipping 3697 matching lines @@
 
   Send(reply_message_);
   redirect_query_ = 0;
   reply_message_ = NULL;
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }