Convert WebContents to return a content::NavigationController instead of the implementation. Upda...

chrome/test/base/browser_with_test_window_test.h

Index: chrome/test/base/browser_with_test_window_test.h
===================================================================
--- chrome/test/base/browser_with_test_window_test.h	(revision 116232)
+++ chrome/test/base/browser_with_test_window_test.h	(working copy)
@@ -19,7 +19,6 @@
 #endif
 
 class GURL;
-class NavigationController;
 
 #if defined(USE_AURA)
 namespace aura {
@@ -30,6 +29,7 @@
 #endif
 
 namespace content {
+class NavigationController;
 class WebContents;
 }
 
@@ -91,13 +91,13 @@
 
   // 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.