Convert WindowOpenDisposition to an enum class.

chrome/browser/task_manager/task_manager_browsertest.cc

 // Copyright 2016 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 <vector>
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/path_service.h"
@@ skipping 228 matching lines @@
 
   // Killing the tab via task manager should remove the row.
   int tab = FindResourceIndex(MatchTab("title1.html"));
   ASSERT_NE(-1, tab);
   ASSERT_NE(-1, model()->GetTabId(tab));
   model()->Kill(tab);
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchTab("title1.html")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
 
   // Tab should reappear in task manager upon reload.
-  chrome::Reload(browser(), CURRENT_TAB);
+  chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("title1.html")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab()));
 }
 
 // Regression test for http://crbug.com/444945.
 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NavigateAwayFromHungRenderer) {
   ShowTaskManager();
 
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
@@ skipping 32 matching lines @@
       << "New WebContents must be in the same process as the old WebContents, "
       << "so that the new tab doesn't finish loading (what this test is all "
       << "about)";
   ASSERT_EQ(tab1->GetSiteInstance(), tab2->GetSiteInstance())
       << "New WebContents must initially be in the same site instance as the "
       << "old WebContents";
 
   // Now navigate this tab to a different site. This should wind up in a
   // different renderer process, so it should complete and show up in the task
   // manager.
-  tab2->OpenURL(content::OpenURLParams(url3, content::Referrer(), CURRENT_TAB,
+  tab2->OpenURL(content::OpenURLParams(url3, content::Referrer(),
+                                       WindowOpenDisposition::CURRENT_TAB,
                                        ui::PAGE_TRANSITION_TYPED, false));
 
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("iframe test")));
 }
 
 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeExtensionTabChanges) {
   ShowTaskManager();
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
 
@@ skipping 424 matching lines @@
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnyTab()));
   DevToolsWindowTesting::CloseDevToolsWindowSync(devtools);
 }
 
 IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest, KillSubframe) {
   ShowTaskManager();
 
   GURL main_url(embedded_test_server()->GetURL(
       "/cross-site/a.com/iframe_cross_site.html"));
   browser()->OpenURL(content::OpenURLParams(main_url, content::Referrer(),
-                                            CURRENT_TAB,
+                                            WindowOpenDisposition::CURRENT_TAB,
                                             ui::PAGE_TRANSITION_TYPED, false));
 
   ASSERT_NO_FATAL_FAILURE(
       WaitForTaskManagerRows(1, MatchTab("cross-site iframe test")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
 
   if (!ShouldExpectSubframes()) {
     ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe()));
   } else {
     ASSERT_NO_FATAL_FAILURE(
@@ skipping 35 matching lines @@
 // Tests what happens when a tab navigates to a site (a.com) that it previously
 // has a cross-process subframe into (b.com).
 IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest, NavigateToSubframeProcess) {
   ShowTaskManager();
 
   // Navigate the tab to a page on a.com with cross-process subframes to
   // b.com and c.com.
   GURL a_dotcom(embedded_test_server()->GetURL(
       "/cross-site/a.com/iframe_cross_site.html"));
   browser()->OpenURL(content::OpenURLParams(a_dotcom, content::Referrer(),
-                                            CURRENT_TAB,
+                                            WindowOpenDisposition::CURRENT_TAB,
                                             ui::PAGE_TRANSITION_TYPED, false));
 
   ASSERT_NO_FATAL_FAILURE(
       WaitForTaskManagerRows(1, MatchTab("cross-site iframe test")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
 
   if (!ShouldExpectSubframes()) {
     ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe()));
   } else {
     ASSERT_NO_FATAL_FAILURE(
         WaitForTaskManagerRows(1, MatchSubframe("http://b.com/")));
     ASSERT_NO_FATAL_FAILURE(
         WaitForTaskManagerRows(1, MatchSubframe("http://c.com/")));
     ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnySubframe()));
   }
 
   // Now navigate to a page on b.com with a simple (same-site) iframe.
   // This should not show any subframe resources in the task manager.
   GURL b_dotcom(
       embedded_test_server()->GetURL("/cross-site/b.com/iframe.html"));
 
   browser()->OpenURL(content::OpenURLParams(b_dotcom, content::Referrer(),
-                                            CURRENT_TAB,
+                                            WindowOpenDisposition::CURRENT_TAB,
                                             ui::PAGE_TRANSITION_TYPED, false));
 
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("iframe test")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe()));
   HideTaskManager();
   ShowTaskManager();
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("iframe test")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe()));
 }
 
 IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest,
                        NavigateToSiteWithSubframeToOriginalSite) {
   ShowTaskManager();
 
   // Navigate to a page on b.com with a simple (same-site) iframe.
   // This should not show any subframe resources in the task manager.
   GURL b_dotcom(
       embedded_test_server()->GetURL("/cross-site/b.com/iframe.html"));
 
   browser()->OpenURL(content::OpenURLParams(b_dotcom, content::Referrer(),
-                                            CURRENT_TAB,
+                                            WindowOpenDisposition::CURRENT_TAB,
                                             ui::PAGE_TRANSITION_TYPED, false));
 
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("iframe test")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe()));
 
   // Now navigate the tab to a page on a.com with cross-process subframes to
   // b.com and c.com.
   GURL a_dotcom(embedded_test_server()->GetURL(
       "/cross-site/a.com/iframe_cross_site.html"));
   browser()->OpenURL(content::OpenURLParams(a_dotcom, content::Referrer(),
-                                            CURRENT_TAB,
+                                            WindowOpenDisposition::CURRENT_TAB,
                                             ui::PAGE_TRANSITION_TYPED, false));
 
   ASSERT_NO_FATAL_FAILURE(
       WaitForTaskManagerRows(1, MatchTab("cross-site iframe test")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
 
   if (!ShouldExpectSubframes()) {
     ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe()));
   } else {
     ASSERT_NO_FATAL_FAILURE(
@@ skipping 21 matching lines @@
 // back to the site of the parent document (a.com).
 IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest,
                        CrossSiteIframeBecomesSameSite) {
   ShowTaskManager();
 
   // Navigate the tab to a page on a.com with cross-process subframes to
   // b.com and c.com.
   GURL a_dotcom(embedded_test_server()->GetURL(
       "/cross-site/a.com/iframe_cross_site.html"));
   browser()->OpenURL(content::OpenURLParams(a_dotcom, content::Referrer(),
-                                            CURRENT_TAB,
+                                            WindowOpenDisposition::CURRENT_TAB,
                                             ui::PAGE_TRANSITION_TYPED, false));
 
   ASSERT_NO_FATAL_FAILURE(
       WaitForTaskManagerRows(1, MatchTab("cross-site iframe test")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
 
   if (!ShouldExpectSubframes()) {
     ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe()));
   } else {
     ASSERT_NO_FATAL_FAILURE(
@@ skipping 38 matching lines @@
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
 }
 
 IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest,
                        LeavePageWithCrossSiteIframes) {
   ShowTaskManager();
 
   // Navigate the tab to a page on a.com with cross-process subframes.
   GURL a_dotcom_with_iframes(embedded_test_server()->GetURL(
       "/cross-site/a.com/iframe_cross_site.html"));
-  browser()->OpenURL(content::OpenURLParams(a_dotcom_with_iframes,
-                                            content::Referrer(), CURRENT_TAB,
-                                            ui::PAGE_TRANSITION_TYPED, false));
+  browser()->OpenURL(content::OpenURLParams(
+      a_dotcom_with_iframes, content::Referrer(),
+      WindowOpenDisposition::CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
 
   ASSERT_NO_FATAL_FAILURE(
       WaitForTaskManagerRows(1, MatchTab("cross-site iframe test")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
 
   if (!ShouldExpectSubframes()) {
     ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe()));
   } else {
     ASSERT_NO_FATAL_FAILURE(
         WaitForTaskManagerRows(1, MatchSubframe("http://b.com/")));
     ASSERT_NO_FATAL_FAILURE(
         WaitForTaskManagerRows(1, MatchSubframe("http://c.com/")));
     ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnySubframe()));
   }
 
   // Navigate the tab to a page on a.com without cross-process subframes, and
   // the subframe processes should disappear.
   GURL a_dotcom_simple(
       embedded_test_server()->GetURL("/cross-site/a.com/title2.html"));
-  browser()->OpenURL(content::OpenURLParams(a_dotcom_simple,
-                                            content::Referrer(), CURRENT_TAB,
-                                            ui::PAGE_TRANSITION_TYPED, false));
+  browser()->OpenURL(content::OpenURLParams(
+      a_dotcom_simple, content::Referrer(), WindowOpenDisposition::CURRENT_TAB,
+      ui::PAGE_TRANSITION_TYPED, false));
   ASSERT_NO_FATAL_FAILURE(
       WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe()));
 
   HideTaskManager();
   ShowTaskManager();
 
   ASSERT_NO_FATAL_FAILURE(
       WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe()));
 }
 
 IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest, OrderingOfDependentRows) {
   ShowTaskManager();
 
   GURL a_with_frames(embedded_test_server()->GetURL(
       "a.com", "/cross_site_iframe_factory.html?a(b,b,c(d,a,b,c))"));
   browser()->OpenURL(content::OpenURLParams(a_with_frames, content::Referrer(),
-                                            CURRENT_TAB,
+                                            WindowOpenDisposition::CURRENT_TAB,
                                             ui::PAGE_TRANSITION_TYPED, false));
 
   if (ShouldExpectSubframes()) {
     ASSERT_NO_FATAL_FAILURE(
         WaitForTaskManagerRows(1, MatchSubframe("http://b.com/")));
     ASSERT_NO_FATAL_FAILURE(
         WaitForTaskManagerRows(1, MatchSubframe("http://c.com/")));
     ASSERT_NO_FATAL_FAILURE(
         WaitForTaskManagerRows(1, MatchSubframe("http://d.com/")));
     ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnySubframe()));
   }
   ASSERT_NO_FATAL_FAILURE(
       WaitForTaskManagerRows(1, MatchTab("Cross-site iframe factory")));
 
   int index = FindResourceIndex(MatchTab("Cross-site iframe factory"));
   std::vector<int> subframe_offsets;
   if (ShouldExpectSubframes()) {
     subframe_offsets = {
         FindResourceIndex(MatchSubframe("http://b.com/")) - index,
         FindResourceIndex(MatchSubframe("http://c.com/")) - index,
         FindResourceIndex(MatchSubframe("http://d.com/")) - index};
     EXPECT_THAT(subframe_offsets, testing::UnorderedElementsAre(1, 2, 3));
   }
 
   // Opening a new tab should appear below the existing tab.
   GURL other_tab_url(embedded_test_server()->GetURL(
       "d.com", "/cross_site_iframe_factory.html?d(a(c(b)))"));
-  browser()->OpenURL(content::OpenURLParams(other_tab_url, content::Referrer(),
-                                            NEW_FOREGROUND_TAB,
-                                            ui::PAGE_TRANSITION_TYPED, false));
+  browser()->OpenURL(
+      content::OpenURLParams(other_tab_url, content::Referrer(),
+                             WindowOpenDisposition::NEW_FOREGROUND_TAB,
+                             ui::PAGE_TRANSITION_TYPED, false));
 
   ASSERT_NO_FATAL_FAILURE(
       WaitForTaskManagerRows(2, MatchTab("Cross-site iframe factory")));
   if (ShouldExpectSubframes()) {
     ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(6, MatchAnySubframe()));
     ASSERT_NO_FATAL_FAILURE(
         WaitForTaskManagerRows(2, MatchSubframe("http://b.com/")));
     ASSERT_NO_FATAL_FAILURE(
         WaitForTaskManagerRows(2, MatchSubframe("http://c.com/")));
     ASSERT_NO_FATAL_FAILURE(
@@ skipping 28 matching lines @@
 
     // Because the subframes for tab 2 are nested, their order is deterministic.
     EXPECT_EQ("Subframe: http://a.com/",
               base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 1)));
     EXPECT_EQ("Subframe: http://c.com/",
               base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 2)));
     EXPECT_EQ("Subframe: http://b.com/",
               base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 3)));
   }
 }