Index: chrome/browser/extensions/app_process_apitest.cc |
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc |
index 04fc9bad6a0aa8d70909bab87a37ab54fe95df9e..e3693b3eae71948cdeb0ed46a4898814ad0716fa 100644 |
--- a/chrome/browser/extensions/app_process_apitest.cc |
+++ b/chrome/browser/extensions/app_process_apitest.cc |
@@ -87,7 +87,8 @@ class AppApiTest : public ExtensionApiTest { |
// processes, but they have no elevated privileges and thus should not |
// have WebUI bindings. |
ui_test_utils::NavigateToURLWithDisposition( |
- browser(), base_url.Resolve("path1/empty.html"), NEW_FOREGROUND_TAB, |
+ browser(), base_url.Resolve("path1/empty.html"), |
+ WindowOpenDisposition::NEW_FOREGROUND_TAB, |
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); |
LOG(INFO) << "Nav 1."; |
EXPECT_TRUE(process_map->Contains( |
@@ -162,7 +163,8 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, DISABLED_AppProcess) { |
// it. Either way, app tabs should be considered extension processes, but |
// they have no elevated privileges and thus should not have WebUI bindings. |
ui_test_utils::NavigateToURLWithDisposition( |
- browser(), base_url.Resolve("path1/empty.html"), NEW_FOREGROUND_TAB, |
+ browser(), base_url.Resolve("path1/empty.html"), |
+ WindowOpenDisposition::NEW_FOREGROUND_TAB, |
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); |
EXPECT_TRUE(process_map->Contains( |
browser()->tab_strip_model()->GetWebContentsAt(1)-> |
@@ -171,7 +173,8 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, DISABLED_AppProcess) { |
LOG(INFO) << "Nav 1."; |
ui_test_utils::NavigateToURLWithDisposition( |
- browser(), base_url.Resolve("path2/empty.html"), NEW_FOREGROUND_TAB, |
+ browser(), base_url.Resolve("path2/empty.html"), |
+ WindowOpenDisposition::NEW_FOREGROUND_TAB, |
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); |
EXPECT_TRUE(process_map->Contains( |
browser()->tab_strip_model()->GetWebContentsAt(2)-> |
@@ -316,7 +319,8 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_BookmarkAppGetsNormalProcess) { |
// it. Either way, bookmark app tabs should be considered normal processes |
// with no elevated privileges and no WebUI bindings. |
ui_test_utils::NavigateToURLWithDisposition( |
- browser(), base_url.Resolve("path1/empty.html"), NEW_FOREGROUND_TAB, |
+ browser(), base_url.Resolve("path1/empty.html"), |
+ WindowOpenDisposition::NEW_FOREGROUND_TAB, |
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); |
EXPECT_FALSE(process_map->Contains( |
browser()->tab_strip_model()->GetWebContentsAt(1)-> |
@@ -499,7 +503,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, ReloadIntoAppProcess) { |
&browser()->tab_strip_model()->GetActiveWebContents()-> |
GetController())); |
LOG(INFO) << "Reloading."; |
- chrome::Reload(browser(), CURRENT_TAB); |
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB); |
reload_observer.Wait(); |
LOG(INFO) << "Reloading - done."; |
EXPECT_TRUE(process_map->Contains( |
@@ -515,7 +519,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, ReloadIntoAppProcess) { |
&browser()->tab_strip_model()->GetActiveWebContents()-> |
GetController())); |
LOG(INFO) << "Reloading."; |
- chrome::Reload(browser(), CURRENT_TAB); |
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB); |
reload_observer2.Wait(); |
LOG(INFO) << "Reloading - done."; |
EXPECT_FALSE(process_map->Contains( |
@@ -807,7 +811,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadAppAfterCrash) { |
content::Source<NavigationController>( |
&browser()->tab_strip_model()->GetActiveWebContents()-> |
GetController())); |
- chrome::Reload(browser(), CURRENT_TAB); |
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB); |
observer.Wait(); |
ASSERT_TRUE(content::ExecuteScriptAndExtractBool( |
contents, |