Convert WindowOpenDisposition to an enum class.

chrome/browser/ui/browser_navigator_browsertest_chromeos.cc

 // Copyright 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/browser_navigator_browsertest.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/chromeos/login/chrome_restart_request.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_test.h"
@@ skipping 32 matching lines @@
 IN_PROC_BROWSER_TEST_F(BrowserGuestSessionNavigatorTest,
                        Disposition_Settings_UseIncognitoWindow) {
   Browser* incognito_browser = CreateIncognitoBrowser();
 
   EXPECT_EQ(2u, chrome::GetTotalBrowserCount());
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
   EXPECT_EQ(1, incognito_browser->tab_strip_model()->count());
 
   // Navigate to the settings page.
   chrome::NavigateParams params(MakeNavigateParams(incognito_browser));
-  params.disposition = SINGLETON_TAB;
+  params.disposition = WindowOpenDisposition::SINGLETON_TAB;
   params.url = GURL("chrome://chrome/settings");
   params.window_action = chrome::NavigateParams::SHOW_WINDOW;
   params.path_behavior = chrome::NavigateParams::IGNORE_AND_NAVIGATE;
   chrome::Navigate(&params);
 
   // Settings page should be opened in incognito window.
   EXPECT_NE(browser(), params.browser);
   EXPECT_EQ(incognito_browser, params.browser);
   EXPECT_EQ(2, incognito_browser->tab_strip_model()->count());
   EXPECT_EQ(GURL("chrome://chrome/settings"),
@@ skipping 12 matching lines @@
   {
     const AccountId desktop_account_id(
         AccountId::FromUserEmail("desktop_user_id@fake.com"));
     TestMultiUserWindowManager* manager =
         new TestMultiUserWindowManager(browser(), desktop_account_id);
 
     EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
 
     // Navigate to the settings page.
     chrome::NavigateParams params(MakeNavigateParams(browser()));
-    params.disposition = NEW_POPUP;
+    params.disposition = WindowOpenDisposition::NEW_POPUP;
     params.url = GURL("chrome://chrome/settings");
     params.window_action = chrome::NavigateParams::SHOW_WINDOW;
     params.path_behavior = chrome::NavigateParams::IGNORE_AND_NAVIGATE;
     params.browser = browser();
     chrome::Navigate(&params);
 
     EXPECT_EQ(2u, chrome::GetTotalBrowserCount());
 
     aura::Window* created_window = manager->created_window();
     ASSERT_TRUE(created_window);
     EXPECT_TRUE(
         manager->IsWindowOnDesktopOfUser(created_window, desktop_account_id));
   }
   // Test 2: Test that a window which is not visiting does not cause an owner
   // assignment of a newly created browser.
   {
     const AccountId browser_owner =
         multi_user_util::GetAccountIdFromProfile(browser()->profile());
     TestMultiUserWindowManager* manager =
         new TestMultiUserWindowManager(browser(), browser_owner);
 
     // Navigate to the settings page.
     chrome::NavigateParams params(MakeNavigateParams(browser()));
-    params.disposition = NEW_POPUP;
+    params.disposition = WindowOpenDisposition::NEW_POPUP;
     params.url = GURL("chrome://chrome/settings");
     params.window_action = chrome::NavigateParams::SHOW_WINDOW;
     params.path_behavior = chrome::NavigateParams::IGNORE_AND_NAVIGATE;
     params.browser = browser();
     chrome::Navigate(&params);
 
     EXPECT_EQ(3u, chrome::GetTotalBrowserCount());
 
     // The ShowWindowForUser should not have been called since the window is
     // already on the correct desktop.
     ASSERT_FALSE(manager->created_window());
   }
 }
 
 }  // namespace