diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-04 17:07:50 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-04 17:07:50 +0000 |
| commit | c5eed4976490f601ad01f36e102260744c673b2d (patch) | |
| tree | 64fb05d9ecf101bf0dc4460ecd26b56637b4e8d7 /chrome/browser/extensions/app_process_apitest.cc | |
| parent | 8c64d197edc97f4cd646cff55a21af0b4733b942 (diff) | |
| download | chromium_src-c5eed4976490f601ad01f36e102260744c673b2d.zip chromium_src-c5eed4976490f601ad01f36e102260744c673b2d.tar.gz chromium_src-c5eed4976490f601ad01f36e102260744c673b2d.tar.bz2 | |
Get rid of content::NavigationController in cc file and use "using" instead.
BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/8983012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116328 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/app_process_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/app_process_apitest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc index 45fe001..c1de458 100644 --- a/chrome/browser/extensions/app_process_apitest.cc +++ b/chrome/browser/extensions/app_process_apitest.cc @@ -24,6 +24,7 @@ #include "content/test/test_navigation_observer.h" #include "net/base/mock_host_resolver.h" +using content::NavigationController; using content::WebContents; class AppApiTest : public ExtensionApiTest { @@ -425,7 +426,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, DISABLED_ReloadIntoAppProcess) { EnableExtension(app->id()); ui_test_utils::WindowedNotificationObserver reload_observer( content::NOTIFICATION_LOAD_STOP, - content::Source<content::NavigationController>( + content::Source<NavigationController>( &browser()->GetSelectedTabContentsWrapper()->web_contents()-> GetController())); browser()->Reload(CURRENT_TAB); @@ -437,7 +438,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, DISABLED_ReloadIntoAppProcess) { DisableExtension(app->id()); ui_test_utils::WindowedNotificationObserver reload_observer2( content::NOTIFICATION_LOAD_STOP, - content::Source<content::NavigationController>( + content::Source<NavigationController>( &browser()->GetSelectedTabContentsWrapper()->web_contents()-> GetController())); browser()->Reload(CURRENT_TAB); @@ -449,7 +450,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, DISABLED_ReloadIntoAppProcess) { EnableExtension(app->id()); ui_test_utils::WindowedNotificationObserver js_reload_observer( content::NOTIFICATION_LOAD_STOP, - content::Source<content::NavigationController>( + content::Source<NavigationController>( &browser()->GetSelectedTabContentsWrapper()->web_contents()-> GetController())); ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(contents->GetRenderViewHost(), @@ -462,7 +463,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, DISABLED_ReloadIntoAppProcess) { DisableExtension(app->id()); ui_test_utils::WindowedNotificationObserver js_reload_observer2( content::NOTIFICATION_LOAD_STOP, - content::Source<content::NavigationController>( + content::Source<NavigationController>( &browser()->GetSelectedTabContentsWrapper()->web_contents()-> GetController())); ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(contents->GetRenderViewHost(), @@ -516,8 +517,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, OpenAppFromIframe) { // NAV_ENTRY_COMMITTED on the new tab there. ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_NAV_ENTRY_COMMITTED, - content::Source<content::NavigationController>( - &(newtab->GetController()))); + content::Source<NavigationController>(&(newtab->GetController()))); observer.Wait(); } @@ -655,7 +655,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, ReloadAppAfterCrash) { ui_test_utils::CrashTab(browser()->GetSelectedWebContents()); ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, - content::Source<content::NavigationController>( + content::Source<NavigationController>( &browser()->GetSelectedTabContentsWrapper()->web_contents()-> GetController())); browser()->Reload(CURRENT_TAB); |