Convert WindowOpenDisposition to an enum class.

chrome/browser/history/history_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 <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 366 matching lines @@
       base::FilePath(), base::FilePath(FILE_PATH_LITERAL("title1.html")));
   GURL url3  = ui_test_utils::GetTestUrl(
       base::FilePath(), base::FilePath(FILE_PATH_LITERAL("title3.html")));
   GURL url4  = ui_test_utils::GetTestUrl(
       base::FilePath(), base::FilePath(FILE_PATH_LITERAL("simple.html")));
 
   ui_test_utils::NavigateToURL(browser(), url1);
   Browser* browser2 = CreateBrowser(browser()->profile());
   ui_test_utils::NavigateToURL(browser2, url2);
   ui_test_utils::NavigateToURLWithDisposition(
-      browser2, url3, NEW_FOREGROUND_TAB,
+      browser2, url3, WindowOpenDisposition::NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   ui_test_utils::NavigateToURLWithDisposition(
-      browser2, url4, NEW_FOREGROUND_TAB,
+      browser2, url4, WindowOpenDisposition::NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
 
   std::vector<GURL> urls(GetHistoryContents());
   ASSERT_EQ(4u, urls.size());
   ASSERT_EQ(url4, urls[0]);
   ASSERT_EQ(url3, urls[1]);
   ASSERT_EQ(url2, urls[2]);
   ASSERT_EQ(url1, urls[3]);
 }
 
@@ skipping 40 matching lines @@
 }
 
 // Verify that reloading a page brings it to top of history list.
 IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, ReloadBringPageToTop) {
   GURL url1 = GetTestUrl();
   GURL url2  = ui_test_utils::GetTestUrl(
       base::FilePath(), base::FilePath(FILE_PATH_LITERAL("title3.html")));
 
   ui_test_utils::NavigateToURL(browser(), url1);
   ui_test_utils::NavigateToURLWithDisposition(
-      browser(), url2, NEW_BACKGROUND_TAB,
+      browser(), url2, WindowOpenDisposition::NEW_BACKGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
 
   std::vector<GURL> urls(GetHistoryContents());
   ASSERT_EQ(2u, urls.size());
   ASSERT_EQ(url2, urls[0]);
   ASSERT_EQ(url1, urls[1]);
 
   content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   tab->GetController().Reload(false);
   content::WaitForLoadStop(tab);
 
   urls = GetHistoryContents();
   ASSERT_EQ(2u, urls.size());
   ASSERT_EQ(url1, urls[0]);
   ASSERT_EQ(url2, urls[1]);
 }
 
 // Verify that back/forward brings current page to top of history list.
 IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, BackForwardBringPageToTop) {
   GURL url1 = GetTestUrl();
   GURL url2  = ui_test_utils::GetTestUrl(
       base::FilePath(), base::FilePath(FILE_PATH_LITERAL("title3.html")));
 
   ui_test_utils::NavigateToURL(browser(), url1);
   ui_test_utils::NavigateToURL(browser(), url2);
 
   content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
-  chrome::GoBack(browser(), CURRENT_TAB);
+  chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
   content::WaitForLoadStop(tab);
 
   std::vector<GURL> urls(GetHistoryContents());
   ASSERT_EQ(2u, urls.size());
   ASSERT_EQ(url1, urls[0]);
   ASSERT_EQ(url2, urls[1]);
 
-  chrome::GoForward(browser(), CURRENT_TAB);
+  chrome::GoForward(browser(), WindowOpenDisposition::CURRENT_TAB);
   content::WaitForLoadStop(tab);
   urls = GetHistoryContents();
   ASSERT_EQ(2u, urls.size());
   ASSERT_EQ(url2, urls[0]);
   ASSERT_EQ(url1, urls[1]);
 }
 
 // Verify that submitting form adds target page to history list.
 IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, SubmitFormAddsTargetPage) {
   GURL form = ui_test_utils::GetTestUrl(
@@ skipping 27 matching lines @@
   // Even after navigate completes, the currently-active tab title is
   // 'Loading...' for a brief time while the history page loads.
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   base::string16 expected_title(base::ASCIIToUTF16("History"));
   content::TitleWatcher title_watcher(web_contents, expected_title);
   chrome::ExecuteCommand(browser(), IDC_SHOW_HISTORY);
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 
   ui_test_utils::NavigateToURLWithDisposition(
-      browser(),
-      GURL(url::kAboutBlankURL),
-      NEW_FOREGROUND_TAB,
+      browser(), GURL(url::kAboutBlankURL),
+      WindowOpenDisposition::NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   chrome::ExecuteCommand(browser(), IDC_SHOW_HISTORY);
 
   content::WebContents* active_web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_EQ(web_contents, active_web_contents);
   ASSERT_EQ(history_url, active_web_contents->GetURL());
 
   content::WebContents* second_tab =
       browser()->tab_strip_model()->GetWebContentsAt(1);
   ASSERT_NE(history_url, second_tab->GetURL());
 }