Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1234)

Unified Diff: chrome/browser/extensions/app_process_apitest.cc

Issue 8983012: Get rid of content::NavigationController in cc file and use "using" instead. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/app_process_apitest.cc
===================================================================
--- chrome/browser/extensions/app_process_apitest.cc (revision 116288)
+++ chrome/browser/extensions/app_process_apitest.cc (working copy)
@@ -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 @@
EnableExtension(app->id());
ui_test_utils::WindowedNotificationObserver reload_observer(
content::NOTIFICATION_LOAD_STOP,
- content::Source<content::NavigationController>(
+ content::Source<NavigationController>(
&browser()->GetSelectedTabContentsWrapper()->tab_contents()->
GetController()));
browser()->Reload(CURRENT_TAB);
@@ -437,7 +438,7 @@
DisableExtension(app->id());
ui_test_utils::WindowedNotificationObserver reload_observer2(
content::NOTIFICATION_LOAD_STOP,
- content::Source<content::NavigationController>(
+ content::Source<NavigationController>(
&browser()->GetSelectedTabContentsWrapper()->tab_contents()->
GetController()));
browser()->Reload(CURRENT_TAB);
@@ -449,7 +450,7 @@
EnableExtension(app->id());
ui_test_utils::WindowedNotificationObserver js_reload_observer(
content::NOTIFICATION_LOAD_STOP,
- content::Source<content::NavigationController>(
+ content::Source<NavigationController>(
&browser()->GetSelectedTabContentsWrapper()->tab_contents()->
GetController()));
ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(contents->GetRenderViewHost(),
@@ -462,7 +463,7 @@
DisableExtension(app->id());
ui_test_utils::WindowedNotificationObserver js_reload_observer2(
content::NOTIFICATION_LOAD_STOP,
- content::Source<content::NavigationController>(
+ content::Source<NavigationController>(
&browser()->GetSelectedTabContentsWrapper()->tab_contents()->
GetController()));
ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(contents->GetRenderViewHost(),
@@ -516,8 +517,7 @@
// 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 @@
ui_test_utils::CrashTab(browser()->GetSelectedWebContents());
ui_test_utils::WindowedNotificationObserver observer(
content::NOTIFICATION_LOAD_STOP,
- content::Source<content::NavigationController>(
+ content::Source<NavigationController>(
&browser()->GetSelectedTabContentsWrapper()->tab_contents()->
GetController()));
browser()->Reload(CURRENT_TAB);
« no previous file with comments | « chrome/browser/errorpage_browsertest.cc ('k') | chrome/browser/extensions/extension_browser_event_router.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698