Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/sessions/session_restore_browsertest.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 <vector>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/memory_pressure_listener.h"
 #include "base/process/launch.h"
@@ skipping 109 matching lines @@
     Profile* profile = browser->profile();
 
     // Close the browser.
     g_browser_process->AddRefModule();
     CloseBrowserSynchronously(browser);
 
     // Create a new window, which should trigger session restore.
     ui_test_utils::BrowserAddedObserver window_observer;
     SessionRestoreTestHelper restore_observer;
     if (url.is_empty()) {
-      chrome::NewEmptyWindow(profile, chrome::HOST_DESKTOP_TYPE_NATIVE);
+      chrome::NewEmptyWindow(profile, ui::HOST_DESKTOP_TYPE_NATIVE);
     } else {
       chrome::NavigateParams params(profile,
                                     url,
                                     ui::PAGE_TRANSITION_LINK);
       chrome::Navigate(&params);
     }
     Browser* new_browser = window_observer.WaitForSingleNewBrowser();
     // Stop loading anything more if we are running out of space.
     if (!no_memory_pressure) {
       base::MemoryPressureListener::NotifyMemoryPressure(
@@ skipping 360 matching lines @@
         content::NotificationService::AllSources());
     chrome::AddSelectedTabWithURL(browser(), url3,
                                   ui::PAGE_TRANSITION_LINK);
     observer.Wait();
   }
 
   TabRestoreService* service =
       TabRestoreServiceFactory::GetForProfile(browser()->profile());
   service->ClearEntries();
 
-  chrome::HostDesktopType host_desktop_type = browser()->host_desktop_type();
+  ui::HostDesktopType host_desktop_type = browser()->host_desktop_type();
 
   browser()->window()->Close();
 
   // Expect a window with three tabs.
   ASSERT_EQ(1U, service->entries().size());
   ASSERT_EQ(TabRestoreService::WINDOW, service->entries().front()->type);
   const TabRestoreService::Window* window =
       static_cast<TabRestoreService::Window*>(service->entries().front());
   EXPECT_EQ(3U, window->tabs.size());
 
@@ skipping 43 matching lines @@
       base::FilePath(FILE_PATH_LITERAL("title1.html"))));
 
   // Add a single tab.
   ui_test_utils::NavigateToURL(browser(), url);
 
   TabRestoreService* service =
       TabRestoreServiceFactory::GetForProfile(browser()->profile());
   service->ClearEntries();
   EXPECT_EQ(0U, service->entries().size());
 
-  chrome::HostDesktopType host_desktop_type = browser()->host_desktop_type();
+  ui::HostDesktopType host_desktop_type = browser()->host_desktop_type();
 
   // Close the window.
   browser()->window()->Close();
 
   // Expect the window to be converted to a tab by the TRS.
   EXPECT_EQ(1U, service->entries().size());
   ASSERT_EQ(TabRestoreService::TAB, service->entries().front()->type);
   const TabRestoreService::Tab* tab =
       static_cast<TabRestoreService::Tab*>(service->entries().front());
 
@@ skipping 857 matching lines @@
     browser()->tab_strip_model()->ActivateTabAt(i, true);
 
   // Close the browser.
   g_browser_process->AddRefModule();
   CloseBrowserSynchronously(browser());
 
   StartObserving(kExpectedNumTabs);
 
   // 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();
   ASSERT_TRUE(new_browser != NULL);
   WaitForAllTabsToStartLoading();
   g_browser_process->ReleaseModule();
 
   ASSERT_EQ(static_cast<size_t>(kExpectedNumTabs), web_contents().size());
   // Test that we have observed the tabs being loaded in the inverse order of
   // their activation (MRU). Also validate that their last active time is in the
   // correct order.
   for (size_t i = 0; i < web_contents().size(); i++) {
@@ skipping 17 matching lines @@
   // Close the browser that gets opened automatically so we can track the order
   // of loading of the tabs.
   g_browser_process->AddRefModule();
   CloseBrowserSynchronously(browser());
   // We have an extra tab that is added when the test starts, which gets ignored
   // later when we test for proper order.
   StartObserving(kExpectedNumTabs + 1);
 
   // 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();
   ASSERT_TRUE(new_browser != NULL);
   WaitForAllTabsToStartLoading();
   g_browser_process->ReleaseModule();
 
   ASSERT_EQ(static_cast<size_t>(kExpectedNumTabs + 1), web_contents().size());
 
   // Test that we have observed the tabs being loaded in the inverse order of
   // their activation (MRU). Also validate that their last active time is in the
   // correct order.
   //
   // Note that we ignore the first tab as it's an empty one that is added
   // automatically at the start of the test.
   for (size_t i = 1; i < web_contents().size(); i++) {
     GURL expected_url = GURL(kUrls[activation_order[kExpectedNumTabs - i]]);
     ASSERT_EQ(expected_url, web_contents()[i]->GetLastCommittedURL());
     if (i > 0) {
       ASSERT_GT(web_contents()[i - 1]->GetLastActiveTime(),
                 web_contents()[i]->GetLastActiveTime());
     }
   }
 }