Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/sessions/better_session_restore_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 <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
@@ skipping 310 matching lines @@
       CloseBrowserSynchronously(browser);
 
     SessionServiceTestHelper helper;
     helper.SetService(
         SessionServiceFactory::GetForProfileForSessionRestore(profile));
     helper.SetForceBrowserNotAliveWithNoWindows(true);
     helper.ReleaseService();
 
     // Create a new window, which should trigger session restore.
     ui_test_utils::BrowserAddedObserver window_observer;
-    chrome::NewEmptyWindow(profile, chrome::HOST_DESKTOP_TYPE_NATIVE);
+    chrome::NewEmptyWindow(profile, ui::HOST_DESKTOP_TYPE_NATIVE);
     Browser* new_browser = window_observer.WaitForSingleNewBrowser();
     chrome::DecrementKeepAliveCount();
 
     return new_browser;
   }
 
   std::string fake_server_address() {
     return fake_server_address_;
   }
 
@@ skipping 134 matching lines @@
   CheckReloadedPageRestored(new_browser);
 }
 
 // Test that leaving a popup open will not prevent session restore.
 IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest,
                        SessionCookiesBrowserCloseWithPopupOpen) {
   // Set the startup preference to "continue where I left off" and visit a page
   // which stores a session cookie.
   StoreDataWithPage("session_cookies.html");
   Browser* popup = new Browser(Browser::CreateParams(
-      Browser::TYPE_POPUP,
-      browser()->profile(),
-      chrome::HOST_DESKTOP_TYPE_NATIVE));
+      Browser::TYPE_POPUP, browser()->profile(), ui::HOST_DESKTOP_TYPE_NATIVE));
   popup->window()->Show();
 
   Browser* new_browser = QuitBrowserAndRestore(browser(), false);
   // The browsing session will be continued; just wait for the page to reload
   // and check the stored data.
   CheckReloadedPageRestored(new_browser);
 }
 IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest,
                        CookiesClearedOnBrowserClose) {
   StoreDataWithPage("cookies.html");
@@ skipping 262 matching lines @@
     NavigateAndCheckStoredData(new_browser, "session_cookies.html");
   else
     StoreDataWithPage(new_browser, "session_cookies.html");
 }
 
 // Tests that session cookies are not cleared when only a popup window is open.
 IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest,
                        SessionCookiesBrowserCloseWithPopupOpen) {
   StoreDataWithPage("session_cookies.html");
   Browser* popup = new Browser(Browser::CreateParams(
-      Browser::TYPE_POPUP,
-      browser()->profile(),
-      chrome::HOST_DESKTOP_TYPE_NATIVE));
+      Browser::TYPE_POPUP, browser()->profile(), ui::HOST_DESKTOP_TYPE_NATIVE));
   popup->window()->Show();
   Browser* new_browser = QuitBrowserAndRestore(browser(), false);
   NavigateAndCheckStoredData(new_browser, "session_cookies.html");
 }
 
 // Tests that session cookies are cleared if the last window to close is a
 // popup.
 IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest,
                        SessionCookiesBrowserClosePopupLast) {
   StoreDataWithPage("session_cookies.html");
   Browser* popup = new Browser(Browser::CreateParams(
-      Browser::TYPE_POPUP,
-      browser()->profile(),
-      chrome::HOST_DESKTOP_TYPE_NATIVE));
+      Browser::TYPE_POPUP, browser()->profile(), ui::HOST_DESKTOP_TYPE_NATIVE));
   popup->window()->Show();
   CloseBrowserSynchronously(browser());
   Browser* new_browser = QuitBrowserAndRestore(popup, false);
   if (browser_defaults::kBrowserAliveWithNoWindows)
     NavigateAndCheckStoredData(new_browser, "session_cookies.html");
   else
     StoreDataWithPage(new_browser, "session_cookies.html");
 }
 
 IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, CookiesClearedOnBrowserClose) {
@@ skipping 42 matching lines @@
   CookieSettingsFactory::GetForProfile(new_browser->profile())
       ->SetDefaultCookieSetting(CONTENT_SETTING_SESSION_ONLY);
   // ... even if background mode is active.
   EnableBackgroundMode();
   new_browser = QuitBrowserAndRestore(new_browser, true);
   StoreDataWithPage(new_browser, "cookies.html");
   DisableBackgroundMode();
   new_browser = QuitBrowserAndRestore(new_browser, true);
   StoreDataWithPage(new_browser, "cookies.html");
 }