summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/webui/web_ui_unittest.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-04 00:46:20 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-04 00:46:20 +0000
commitcdcb1dee07b6c8e7fe968b2a5f4199c9c8fb2323 (patch)
tree4a9218cc8e53e78e565140e5e88d85c29280117e /chrome/browser/ui/webui/web_ui_unittest.cc
parent46a7e02c5bba1b9c68f86befaf586d0b17eb0b04 (diff)
downloadchromium_src-cdcb1dee07b6c8e7fe968b2a5f4199c9c8fb2323.zip
chromium_src-cdcb1dee07b6c8e7fe968b2a5f4199c9c8fb2323.tar.gz
chromium_src-cdcb1dee07b6c8e7fe968b2a5f4199c9c8fb2323.tar.bz2
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
Diffstat (limited to 'chrome/browser/ui/webui/web_ui_unittest.cc')
-rw-r--r--chrome/browser/ui/webui/web_ui_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/webui/web_ui_unittest.cc b/chrome/browser/ui/webui/web_ui_unittest.cc
index e022e93..c586de7 100644
--- a/chrome/browser/ui/webui/web_ui_unittest.cc
+++ b/chrome/browser/ui/webui/web_ui_unittest.cc
@@ -9,8 +9,8 @@
#include "chrome/common/url_constants.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/site_instance.h"
-#include "content/browser/tab_contents/navigation_controller.h"
#include "content/browser/tab_contents/test_tab_contents.h"
+#include "content/public/browser/navigation_controller.h"
#include "content/test/test_browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -26,7 +26,7 @@ class WebUITest : public TabContentsWrapperTestHarness {
// values. This must be increasing for the life of the tests.
static void DoNavigationTest(TabContentsWrapper* wrapper, int page_id) {
TabContents* contents = wrapper->tab_contents();
- NavigationController* controller = &contents->GetController();
+ content::NavigationController* controller = &contents->GetController();
// Start a pending load.
GURL new_tab_url(chrome::kChromeUINewTabURL);