Convert WebContents to return a content::NavigationController instead of the implementation. Update all the headers in chrome to use the interface only. In a subsequent cl, I'll rename the implementation to NavigationControllerImpl and also get rid of content::NavigationController everywhere.

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

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

4 files changed, 10 insertions, 10 deletions

diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc
index df2a6b8..3879f50 100644
--- a/chrome/test/base/browser_with_test_window_test.cc
+++ b/chrome/test/base/browser_with_test_window_test.cc
@@ -13,8 +13,8 @@
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/test/base/testing_profile.h"
-#include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/render_view_host_manager.h"
+#include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/page_transition_types.h"
@@ -72,7 +72,7 @@ void BrowserWithTestWindowTest::AddTab(Browser* browser, const GURL& url) {
 }
 
 void BrowserWithTestWindowTest::CommitPendingLoad(
-    NavigationController* controller) {
+  content::NavigationController* controller) {
   if (!controller->GetPendingEntry())
     return;  // Nothing to commit.
 
@@ -115,7 +115,7 @@ void BrowserWithTestWindowTest::CommitPendingLoad(
 }
 
 void BrowserWithTestWindowTest::NavigateAndCommit(
-    NavigationController* controller,
+    content::NavigationController* controller,
     const GURL& url) {
   controller->LoadURL(
       url, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string());
diff --git a/chrome/test/base/browser_with_test_window_test.h b/chrome/test/base/browser_with_test_window_test.h
index cc06bc6..029cc76 100644
--- a/chrome/test/base/browser_with_test_window_test.h
+++ b/chrome/test/base/browser_with_test_window_test.h
@@ -19,7 +19,6 @@
 #endif
 
 class GURL;
-class NavigationController;
 
 #if defined(USE_AURA)
 namespace aura {
@@ -30,6 +29,7 @@ class TestActivationClient;
 #endif
 
 namespace content {
+class NavigationController;
 class WebContents;
 }
 
@@ -91,13 +91,13 @@ class BrowserWithTestWindowTest : public testing::Test {
 
   // Commits the pending load on the given controller. It will keep the
   // URL of the pending load. If there is no pending load, this does nothing.
-  void CommitPendingLoad(NavigationController* controller);
+  void CommitPendingLoad(content::NavigationController* controller);
 
   // Creates a pending navigation on the given navigation controller to the
   // given URL with the default parameters and the commits the load with a page
   // ID one larger than any seen. This emulates what happens on a new
   // navigation.
-  void NavigateAndCommit(NavigationController* controller,
+  void NavigateAndCommit(content::NavigationController* controller,
                          const GURL& url);
 
   // Navigates the current tab. This is a wrapper around NavigateAndCommit.
diff --git a/chrome/test/base/test_html_dialog_observer.cc b/chrome/test/base/test_html_dialog_observer.cc
index 3d7189e..2d4e228 100644
--- a/chrome/test/base/test_html_dialog_observer.cc
+++ b/chrome/test/base/test_html_dialog_observer.cc
@@ -8,8 +8,8 @@
 #include "content/test/js_injection_ready_observer.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
-#include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/webui/web_ui.h"
+#include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc
index f7efd4a..514cfb2 100644
--- a/chrome/test/base/ui_test_utils.cc
+++ b/chrome/test/base/ui_test_utils.cc
@@ -44,10 +44,10 @@
 #include "chrome/test/automation/javascript_execution_controller.h"
 #include "chrome/test/base/bookmark_load_observer.h"
 #include "content/browser/renderer_host/render_view_host.h"
-#include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
+#include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
@@ -314,7 +314,7 @@ bool GetCurrentTabTitle(const Browser* browser, string16* title) {
   return true;
 }
 
-void WaitForNavigations(NavigationController* controller,
+void WaitForNavigations(content::NavigationController* controller,
                         int number_of_navigations) {
   TestNavigationObserver observer(
       content::Source<content::NavigationController>(controller), NULL,
@@ -450,7 +450,7 @@ static void NavigateToURLWithDispositionBlockUntilNavigationsComplete(
                    base::Unretained(MessageLoopForUI::current())));
     return;
   } else if (web_contents) {
-    NavigationController* controller = &web_contents->GetController();
+    content::NavigationController* controller = &web_contents->GetController();
     WaitForNavigations(controller, number_of_navigations);
     return;
   }