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

chrome/test/base/browser_with_test_window_test.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/test/base/browser_with_test_window_test.h"
 
 #if defined(OS_WIN)
 #include <ole2.h>
 #endif  // defined(OS_WIN)
 
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #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"
 
 using content::BrowserThread;
 using content::WebContents;
 
 BrowserWithTestWindowTest::BrowserWithTestWindowTest()
     : ui_thread_(BrowserThread::UI, message_loop()),
       file_thread_(BrowserThread::FILE, message_loop()),
@@ skipping 37 matching lines @@
 
 void BrowserWithTestWindowTest::AddTab(Browser* browser, const GURL& url) {
   browser::NavigateParams params(browser, url, content::PAGE_TRANSITION_TYPED);
   params.tabstrip_index = 0;
   params.disposition = NEW_FOREGROUND_TAB;
   browser::Navigate(&params);
   CommitPendingLoad(&params.target_contents->web_contents()->GetController());
 }
 
 void BrowserWithTestWindowTest::CommitPendingLoad(
-    NavigationController* controller) {
+  content::NavigationController* controller) {
   if (!controller->GetPendingEntry())
     return;  // Nothing to commit.
 
   TestRenderViewHost* old_rvh =
       TestRenderViewHostForTab(controller->GetWebContents());
 
   TestRenderViewHost* pending_rvh = static_cast<TestRenderViewHost*>(
       controller->GetWebContents()->GetRenderManagerForTesting()->
       pending_render_view_host());
   if (pending_rvh) {
@@ skipping 22 matching lines @@
         controller->GetPendingEntry()->GetTransitionType());
   }
 
   // Simulate the SwapOut_ACK that fires if you commit a cross-site navigation
   // without making any network requests.
   if (pending_rvh)
     old_rvh->OnSwapOutACK();
 }
 
 void BrowserWithTestWindowTest::NavigateAndCommit(
-    NavigationController* controller,
+    content::NavigationController* controller,
     const GURL& url) {
   controller->LoadURL(
       url, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string());
   CommitPendingLoad(controller);
 }
 
 void BrowserWithTestWindowTest::NavigateAndCommitActiveTab(const GURL& url) {
   NavigateAndCommit(&browser()->GetSelectedTabContentsWrapper()->
       web_contents()->GetController(), url);
 }
 
 void BrowserWithTestWindowTest::DestroyBrowser() {
   if (!browser_.get())
     return;
   // Make sure we close all tabs, otherwise Browser isn't happy in its
   // destructor.
   browser()->CloseAllTabs();
   browser_.reset(NULL);
   window_.reset(NULL);
 }
 
 TestingProfile* BrowserWithTestWindowTest::CreateProfile() {
   return new TestingProfile();
 }