Convert WindowOpenDisposition to an enum class.

chrome/browser/extensions/content_script_apitest.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 "base/bind.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 403 matching lines @@
   // listening for an extension event.
   ui_test_utils::NavigateToURL(
       browser(),
       embedded_test_server()->GetURL(
           "/extensions/api_test/content_scripts/extension_api/events.html"));
 
   // Navigate to an extension page that will fire the event events.js is
   // listening for.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), extension->GetResourceURL("fire_event.html"),
-      NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_NONE);
+      WindowOpenDisposition::NEW_FOREGROUND_TAB,
+      ui_test_utils::BROWSER_TEST_NONE);
   EXPECT_TRUE(catcher.GetNextResult());
 }
 
 // Flaky on Windows. http://crbug.com/248418
 #if defined(OS_WIN)
 #define MAYBE_ContentScriptPermissionsApi DISABLED_ContentScriptPermissionsApi
 #else
 #define MAYBE_ContentScriptPermissionsApi ContentScriptPermissionsApi
 #endif
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_ContentScriptPermissionsApi) {
@@ skipping 32 matching lines @@
       browser()->tab_strip_model()->GetActiveWebContents();
   DialogHelper dialog_helper(web_contents);
   base::RunLoop run_loop;
   dialog_helper.set_quit_closure(run_loop.QuitClosure());
 
   ExtensionTestMessageListener listener("done", false);
   listener.set_extension_id(ext2->id());
 
   // Navigate! Both extensions will try to inject.
   ui_test_utils::NavigateToURLWithDisposition(
-      browser(),
-      embedded_test_server()->GetURL("/empty.html"),
-      CURRENT_TAB,
-      ui_test_utils::BROWSER_TEST_NONE);
+      browser(), embedded_test_server()->GetURL("/empty.html"),
+      WindowOpenDisposition::CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE);
 
   run_loop.Run();
   // Right now, the alert dialog is showing and blocking injection of anything
   // after it, so the listener shouldn't be satisfied.
   EXPECT_FALSE(listener.was_satisfied());
   EXPECT_EQ(1u, dialog_helper.dialog_count());
   dialog_helper.CloseDialogs();
 
   // After closing the dialog, the rest of the scripts should be able to
   // inject.
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 }
 
 // Test that closing a tab with a blocking script results in no further scripts
 // running (and we don't crash).
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptBlockingScriptTabClosed) {
   ASSERT_TRUE(StartEmbeddedTestServer());
 
   // We're going to close a tab in this test, so make a new one (to ensure
   // we don't close the browser).
   ui_test_utils::NavigateToURLWithDisposition(
-      browser(),
-      embedded_test_server()->GetURL("/empty.html"),
-      NEW_FOREGROUND_TAB,
+      browser(), embedded_test_server()->GetURL("/empty.html"),
+      WindowOpenDisposition::NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
 
   // Set up the same as the previous test case.
   TestExtensionDir ext_dir1;
   ext_dir1.WriteManifest(
       base::StringPrintf(kManifest, "ext1", "document_start"));
   ext_dir1.WriteFile(FILE_PATH_LITERAL("script.js"), kBlockingScript);
   const Extension* ext1 = LoadExtension(ext_dir1.unpacked_path());
   ASSERT_TRUE(ext1);
 
   TestExtensionDir ext_dir2;
   ext_dir2.WriteManifest(base::StringPrintf(kManifest, "ext2", "document_end"));
   ext_dir2.WriteFile(FILE_PATH_LITERAL("script.js"), kNonBlockingScript);
   const Extension* ext2 = LoadExtension(ext_dir2.unpacked_path());
   ASSERT_TRUE(ext2);
 
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   DialogHelper dialog_helper(web_contents);
   base::RunLoop run_loop;
   dialog_helper.set_quit_closure(run_loop.QuitClosure());
 
   ExtensionTestMessageListener listener("done", false);
   listener.set_extension_id(ext2->id());
 
   // Navitate!
   ui_test_utils::NavigateToURLWithDisposition(
-      browser(),
-      embedded_test_server()->GetURL("/empty.html"),
-      CURRENT_TAB,
-      ui_test_utils::BROWSER_TEST_NONE);
+      browser(), embedded_test_server()->GetURL("/empty.html"),
+      WindowOpenDisposition::CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE);
 
   // Now, instead of closing the dialog, just close the tab. Later scripts
   // should never get a chance to run (and we shouldn't crash).
   run_loop.Run();
   EXPECT_FALSE(listener.was_satisfied());
   EXPECT_TRUE(browser()->tab_strip_model()->CloseWebContentsAt(
       browser()->tab_strip_model()->active_index(), 0));
   EXPECT_FALSE(listener.was_satisfied());
 }
 
@@ skipping 13 matching lines @@
   ASSERT_TRUE(ext1);
 
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   DialogHelper dialog_helper(web_contents);
   base::RunLoop run_loop;
   dialog_helper.set_quit_closure(run_loop.QuitClosure());
 
   // Navigate!
   ui_test_utils::NavigateToURLWithDisposition(
-      browser(),
-      embedded_test_server()->GetURL("/empty.html"),
-      CURRENT_TAB,
-      ui_test_utils::BROWSER_TEST_NONE);
+      browser(), embedded_test_server()->GetURL("/empty.html"),
+      WindowOpenDisposition::CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE);
 
   run_loop.Run();
 
   // The extension will have injected at idle, but it should only inject once.
   EXPECT_EQ(1u, dialog_helper.dialog_count());
   dialog_helper.CloseDialogs();
   EXPECT_TRUE(RunAllPending(web_contents));
   EXPECT_EQ(1u, dialog_helper.dialog_count());
 }
 
@@ skipping 22 matching lines @@
   content::WebContents* tab_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   EXPECT_EQ(new_tab_override->GetResourceURL("newtab.html"),
             tab_contents->GetMainFrame()->GetLastCommittedURL());
   EXPECT_FALSE(listener.was_satisfied());
   listener.Reset();
 
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), embedded_test_server()->GetURL("/empty.html"),
-      CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+      WindowOpenDisposition::CURRENT_TAB,
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(listener.was_satisfied());
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
                        DontInjectContentScriptsInBackgroundPages) {
   host_resolver()->AddRule("a.com", "127.0.0.1");
   ASSERT_TRUE(StartEmbeddedTestServer());
   // Load two extensions, one with an iframe to a.com in its background page,
   // the other, a content script for a.com. The latter should never be able to
   // inject the script, because scripts aren't allowed to run on foreign
   // extensions' pages.
   base::FilePath data_dir = test_data_dir_.AppendASCII("content_scripts");
   ExtensionTestMessageListener iframe_loaded_listener("iframe loaded", false);
   ExtensionTestMessageListener content_script_listener("script injected",
                                                        false);
   LoadExtension(data_dir.AppendASCII("script_a_com"));
   LoadExtension(data_dir.AppendASCII("background_page_iframe"));
   iframe_loaded_listener.WaitUntilSatisfied();
   EXPECT_FALSE(content_script_listener.was_satisfied());
 }
 
 }  // namespace extensions