Convert WindowOpenDisposition to an enum class.

chrome/browser/extensions/isolated_app_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
@@ skipping 141 matching lines @@
 
   // Redirect to app2.
   GURL redirect_url(embedded_test_server()->GetURL(
       "/extensions/isolated_apps/app2/redirect.html"));
   ui_test_utils::NavigateToURL(browser(), redirect_url);
 
   // Go back twice.
   // If bug fixed, we cannot go back anymore.
   // If not fixed, we will redirect back to app2 and can go back again.
   EXPECT_TRUE(chrome::CanGoBack(browser()));
-  chrome::GoBack(browser(), CURRENT_TAB);
+  chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
   EXPECT_TRUE(chrome::CanGoBack(browser()));
-  chrome::GoBack(browser(), CURRENT_TAB);
+  chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
   EXPECT_FALSE(chrome::CanGoBack(browser()));
 
   // We also need to test script-initialized navigation (document.location.href)
   // happened after page finishes loading. This one will also triggered the
   // willPerformClientRedirect hook in RenderViewImpl but should not replace
   // the previous history entry.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), base_url.Resolve("non_app/main.html"),
-      NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+      WindowOpenDisposition::NEW_FOREGROUND_TAB,
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
 
   WebContents* tab0 = browser()->tab_strip_model()->GetWebContentsAt(1);
 
   // Using JavaScript to navigate to app2 page,
   // after the non_app page has finished loading.
   content::WindowedNotificationObserver observer1(
       content::NOTIFICATION_LOAD_STOP,
       content::Source<NavigationController>(
           &browser()->tab_strip_model()->GetActiveWebContents()->
               GetController()));
   std::string script = base::StringPrintf(
         "document.location.href=\"%s\";",
         base_url.Resolve("app2/main.html").spec().c_str());
   EXPECT_TRUE(ExecuteScript(tab0, script));
   observer1.Wait();
 
   // This kind of navigation should not replace previous navigation entry.
   EXPECT_TRUE(chrome::CanGoBack(browser()));
-  chrome::GoBack(browser(), CURRENT_TAB);
+  chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
   EXPECT_FALSE(chrome::CanGoBack(browser()));
 }
 
 // Tests that cookies set within an isolated app are not visible to normal
 // pages or other apps.
 //
 // TODO(ajwong): Also test what happens if an app spans multiple sites in its
 // extent.  These origins should also be isolated, but still have origin-based
 // separation as you would expect.
 IN_PROC_BROWSER_TEST_F(IsolatedAppTest, CookieIsolation) {
   host_resolver()->AddRule("*", "127.0.0.1");
   ASSERT_TRUE(embedded_test_server()->Start());
 
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app1")));
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app2")));
 
   // The app under test acts on URLs whose host is "localhost",
   // so the URLs we navigate to must have host "localhost".
   GURL base_url = embedded_test_server()->GetURL("/extensions/isolated_apps/");
   GURL::Replacements replace_host;
   replace_host.SetHostStr("localhost");
   base_url = base_url.ReplaceComponents(replace_host);
 
   ui_test_utils::NavigateToURL(browser(), base_url.Resolve("app1/main.html"));
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), base_url.Resolve("app2/main.html"),
-      NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+      WindowOpenDisposition::NEW_FOREGROUND_TAB,
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), base_url.Resolve("non_app/main.html"),
-      NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+      WindowOpenDisposition::NEW_FOREGROUND_TAB,
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
 
   ASSERT_EQ(3, browser()->tab_strip_model()->count());
 
   // Ensure first two tabs have installed apps.
   WebContents* tab0 = browser()->tab_strip_model()->GetWebContentsAt(0);
   WebContents* tab1 = browser()->tab_strip_model()->GetWebContentsAt(1);
   WebContents* tab2 = browser()->tab_strip_model()->GetWebContentsAt(2);
   ASSERT_TRUE(GetInstalledApp(tab0));
   ASSERT_TRUE(GetInstalledApp(tab1));
   ASSERT_TRUE(!GetInstalledApp(tab2));
@@ skipping 45 matching lines @@
   EXPECT_FALSE(HasCookie(tab2, "nonAppFrame"));
 
   // Check that isolation persists even if the tab crashes and is reloaded.
   chrome::SelectNumberedTab(browser(), 0);
   content::CrashTab(tab0);
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::Source<NavigationController>(
           &browser()->tab_strip_model()->GetActiveWebContents()->
               GetController()));
-  chrome::Reload(browser(), CURRENT_TAB);
+  chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
   observer.Wait();
   EXPECT_TRUE(HasCookie(tab0, "app1=3"));
   EXPECT_FALSE(HasCookie(tab0, "app2"));
   EXPECT_FALSE(HasCookie(tab0, "normalPage"));
 }
 
 // This test is disabled due to being flaky. http://crbug.com/145588
 // Ensure that cookies are not isolated if the isolated apps are not installed.
 IN_PROC_BROWSER_TEST_F(IsolatedAppTest, DISABLED_NoCookieIsolationWithoutApp) {
   host_resolver()->AddRule("*", "127.0.0.1");
   ASSERT_TRUE(embedded_test_server()->Start());
 
   // The app under test acts on URLs whose host is "localhost",
   // so the URLs we navigate to must have host "localhost".
   GURL base_url = embedded_test_server()->GetURL("/extensions/isolated_apps/");
   GURL::Replacements replace_host;
   replace_host.SetHostStr("localhost");
   base_url = base_url.ReplaceComponents(replace_host);
 
   ui_test_utils::NavigateToURL(browser(), base_url.Resolve("app1/main.html"));
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), base_url.Resolve("app2/main.html"),
-      NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+      WindowOpenDisposition::NEW_FOREGROUND_TAB,
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), base_url.Resolve("non_app/main.html"),
-      NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+      WindowOpenDisposition::NEW_FOREGROUND_TAB,
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
 
   ASSERT_EQ(3, browser()->tab_strip_model()->count());
 
   // Check that tabs see each other's cookies.
   EXPECT_TRUE(HasCookie(browser()->tab_strip_model()->GetWebContentsAt(0),
                         "app2=4"));
   EXPECT_TRUE(HasCookie(browser()->tab_strip_model()->GetWebContentsAt(0),
                         "normalPage=5"));
   EXPECT_TRUE(HasCookie(browser()->tab_strip_model()->GetWebContentsAt(0),
                         "nonAppFrame=6"));
@@ skipping 63 matching lines @@
   root_url = root_url.ReplaceComponents(replace_host);
   base_url = base_url.ReplaceComponents(replace_host);
 
   // First set cookies inside and outside the app.
   ui_test_utils::NavigateToURL(
       browser(), root_url.Resolve("expect-and-set-cookie?set=nonApp%3d1"));
   WebContents* tab0 = browser()->tab_strip_model()->GetWebContentsAt(0);
   ASSERT_FALSE(GetInstalledApp(tab0));
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), base_url.Resolve("app1/main.html"),
-      NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+      WindowOpenDisposition::NEW_FOREGROUND_TAB,
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   WebContents* tab1 = browser()->tab_strip_model()->GetWebContentsAt(1);
   ASSERT_TRUE(GetInstalledApp(tab1));
 
   // Check that each tab sees its own cookie.
   EXPECT_TRUE(HasCookie(tab0, "nonApp=1"));
   EXPECT_FALSE(HasCookie(tab0, "app1=3"));
   EXPECT_FALSE(HasCookie(tab1, "nonApp=1"));
   EXPECT_TRUE(HasCookie(tab1, "app1=3"));
 
   // Now visit an app page that loads subresources located outside the app.
   // For both images and video tags, it loads two URLs:
   //  - One will set nonApp{Media,Image}=1 cookies if nonApp=1 is set.
   //  - One will set app1{Media,Image}=1 cookies if app1=3 is set.
   // We expect only the app's cookies to be present.
   // We must wait for the onload event, to allow the subresources to finish.
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
       content::Source<WebContents>(
           browser()->tab_strip_model()->GetActiveWebContents()));
   ui_test_utils::NavigateToURL(
       browser(), base_url.Resolve("app1/app_subresources.html"));
   observer.Wait();
   EXPECT_FALSE(HasCookie(tab1, "nonAppMedia=1"));
   EXPECT_TRUE(HasCookie(tab1, "app1Media=1"));
   EXPECT_FALSE(HasCookie(tab1, "nonAppImage=1"));
   EXPECT_TRUE(HasCookie(tab1, "app1Image=1"));
 
   // Also create a non-app tab to ensure no new cookies were set in that jar.
   ui_test_utils::NavigateToURLWithDisposition(
-      browser(), root_url,
-      NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+      browser(), root_url, WindowOpenDisposition::NEW_FOREGROUND_TAB,
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   WebContents* tab2 = browser()->tab_strip_model()->GetWebContentsAt(2);
   EXPECT_FALSE(HasCookie(tab2, "nonAppMedia=1"));
   EXPECT_FALSE(HasCookie(tab2, "app1Media=1"));
   EXPECT_FALSE(HasCookie(tab2, "nonAppImage=1"));
   EXPECT_FALSE(HasCookie(tab2, "app1Image=1"));
 }
 
 // Test is flaky on Windows.
 // http://crbug.com/247667
 #if defined(OS_WIN)
@@ skipping 15 matching lines @@
   // so the URLs we navigate to must have host "localhost".
   GURL base_url = embedded_test_server()->GetURL("/extensions/isolated_apps/");
   GURL::Replacements replace_host;
   replace_host.SetHostStr("localhost");
   base_url = base_url.ReplaceComponents(replace_host);
 
   // Create three tabs in the isolated app in different ways.
   ui_test_utils::NavigateToURL(browser(), base_url.Resolve("app1/main.html"));
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), base_url.Resolve("app1/main.html"),
-      NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+      WindowOpenDisposition::NEW_FOREGROUND_TAB,
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   // For the third tab, use window.open to keep it in process with an opener.
   OpenWindow(browser()->tab_strip_model()->GetWebContentsAt(0),
              base_url.Resolve("app1/main.html"), true, NULL);
 
   // In a fourth tab, use window.open to a non-app URL.  It should open in a
   // separate process, even though this would trigger the OAuth workaround
   // for hosted apps (from http://crbug.com/59285).
   OpenWindow(browser()->tab_strip_model()->GetWebContentsAt(0),
              base_url.Resolve("non_app/main.html"), false, NULL);
 
@@ skipping 80 matching lines @@
       browser(), base_url.Resolve("non_app/main.html"));
   ASSERT_TRUE(ExecuteScriptAndExtractString(
       browser()->tab_strip_model()->GetWebContentsAt(0),
       kRetrieveSessionStorage.c_str(), &result));
   EXPECT_EQ("ss_normal", result);
 }
 
 }  // namespace
 
 }  // namespace extensions