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

chrome/test/base/browser_with_test_window_test.h

 // 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.
 
 #ifndef CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
 #define CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
 #pragma once
 
 #include "base/message_loop.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/test_browser_window.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/test/test_activation_client.h"
 #endif
 
 class GURL;
-class NavigationController;
 
 #if defined(USE_AURA)
 namespace aura {
 namespace test {
 class TestActivationClient;
 }
 }
 #endif
 
 namespace content {
+class NavigationController;
 class WebContents;
 }
 
 // Base class for browser based unit tests. BrowserWithTestWindowTest creates a
 // Browser with a TestingProfile and TestBrowserWindow. To add a tab use
 // AddTab. For example, the following adds a tab and navigates to
 // two URLs that target the TestTabContents:
 //
 //   // Add a new tab and navigate it. This will be at index 0.
 //   AddTab(browser(), GURL("http://foo/1"));
@@ skipping 41 matching lines @@
   }
 
   MessageLoop* message_loop() { return &ui_loop_; }
 
   // Adds a tab to |browser| with the given URL and commits the load.
   // This is a convenience function. The new tab will be added at index 0.
   void AddTab(Browser* browser, const GURL& url);
 
   // 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.
   void NavigateAndCommitActiveTab(const GURL& url);
 
  protected:
   // Destroys the browser and window created by this class. This is invoked from
   // the destructor.
   void DestroyBrowser();
 
@@ skipping 14 matching lines @@
   TestRenderViewHostFactory rvh_factory_;
 
 #if defined(USE_AURA)
   scoped_ptr<aura::test::TestActivationClient> test_activation_client_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest);
 };
 
 #endif  // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_