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); |