Convert WindowOpenDisposition to an enum class.

chrome/browser/ui/webui/options/options_ui_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 "chrome/browser/ui/webui/options/options_ui_browsertest.h"
 
 #include "base/scoped_observer.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
@@ skipping 96 matching lines @@
 OptionsUIBrowserTest::OptionsUIBrowserTest() {
 }
 
 void OptionsUIBrowserTest::NavigateToSettings() {
   NavigateToSettingsSubpage("");
 }
 
 void OptionsUIBrowserTest::NavigateToSettingsSubpage(
     const std::string& sub_page) {
   const GURL& url = chrome::GetSettingsUrl(sub_page);
-  ui_test_utils::NavigateToURLWithDisposition(browser(), url, CURRENT_TAB, 0);
+  ui_test_utils::NavigateToURLWithDisposition(
+      browser(), url, WindowOpenDisposition::CURRENT_TAB, 0);
 
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(web_contents);
   ASSERT_TRUE(web_contents->GetWebUI());
 
   content::WebUIController* controller =
       web_contents->GetWebUI()->GetController();
 #if !defined(OS_CHROMEOS)
   controller = static_cast<UberUI*>(controller)->
@@ skipping 164 matching lines @@
   NavigateToSettingsFrame();
 
   // Click a button that opens an overlay dialog.
   content::WebContents* contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(content::ExecuteScript(
       contents, "$('manage-default-search-engines').click();"));
 
   // Go back to the settings page.
   content::TestNavigationObserver observer(contents);
-  chrome::GoBack(browser(), CURRENT_TAB);
+  chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
   observer.Wait();
 
   // Verify that the settings page lists one profile.
   const char javascript[] =
       "domAutomationController.send("
       "    document.querySelectorAll('list#profiles-list > div[role=listitem]')"
       "        .length);";
   int profiles;
   ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
       contents, javascript, &profiles));
@@ skipping 15 matching lines @@
   run_loop.Run();
 
   // Verify that the settings page has updated and lists two profiles.
   ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
       contents, javascript, &profiles));
   EXPECT_EQ(2, profiles);
 }
 #endif
 
 }  // namespace options