Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/ui/browser_iterator_unittest.cc

Index: chrome/browser/ui/browser_iterator_unittest.cc
diff --git a/chrome/browser/ui/browser_iterator_unittest.cc b/chrome/browser/ui/browser_iterator_unittest.cc
index 61a64174f099d785344eb4e1c7f2337ab0ee4b42..9080acadf3a4fd5b9712b31358597fa85532dcd2 100644
--- a/chrome/browser/ui/browser_iterator_unittest.cc
+++ b/chrome/browser/ui/browser_iterator_unittest.cc
@@ -21,9 +21,8 @@ class BrowserIteratorTestWithInitialWindowInAsh
  public:
   BrowserIteratorTestWithInitialWindowInAsh()
       : BrowserWithTestWindowTest(Browser::TYPE_TABBED,
-                                  chrome::HOST_DESKTOP_TYPE_ASH,
-                                  false) {
-  }
+                                  ui::HOST_DESKTOP_TYPE_ASH,
+                                  false) {}
 };
 
 // Helper function to iterate and count all the browsers.
@@ -37,9 +36,8 @@ size_t CountAllBrowsers() {
 }
 
 TEST_F(BrowserIteratorTest, BrowsersOnMultipleDesktops) {
-  Browser::CreateParams native_params(profile(),
-                                      chrome::HOST_DESKTOP_TYPE_NATIVE);
-  Browser::CreateParams ash_params(profile(), chrome::HOST_DESKTOP_TYPE_ASH);
+  Browser::CreateParams native_params(profile(), ui::HOST_DESKTOP_TYPE_NATIVE);
+  Browser::CreateParams ash_params(profile(), ui::HOST_DESKTOP_TYPE_ASH);
   // Note, browser 1 is on the native desktop.
   scoped_ptr<Browser> browser2(
       chrome::CreateBrowserWithTestWindowForParams(&native_params));
@@ -52,13 +50,12 @@ TEST_F(BrowserIteratorTest, BrowsersOnMultipleDesktops) {
 
   // Sanity checks.
   BrowserList* native_list =
-      BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE);
+      BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_NATIVE);
 #if defined(OS_CHROMEOS)
   // On Chrome OS, the native list and the ash list are the same.
   EXPECT_EQ(5U, native_list->size());
 #else
-  BrowserList* ash_list =
-      BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
+  BrowserList* ash_list = BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_ASH);
   EXPECT_EQ(3U, native_list->size());
   EXPECT_EQ(2U, ash_list->size());
 #endif
@@ -69,8 +66,7 @@ TEST_F(BrowserIteratorTest, BrowsersOnMultipleDesktops) {
 }
 
 TEST_F(BrowserIteratorTest, NoBrowsersOnAshDesktop) {
-  Browser::CreateParams native_params(profile(),
-                                      chrome::HOST_DESKTOP_TYPE_NATIVE);
+  Browser::CreateParams native_params(profile(), ui::HOST_DESKTOP_TYPE_NATIVE);
   // Note, browser 1 is on the native desktop.
   scoped_ptr<Browser> browser2(
       chrome::CreateBrowserWithTestWindowForParams(&native_params));
@@ -79,13 +75,12 @@ TEST_F(BrowserIteratorTest, NoBrowsersOnAshDesktop) {
 
   // Sanity checks.
   BrowserList* native_list =
-      BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE);
+      BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_NATIVE);
   EXPECT_EQ(3U, native_list->size());
 #if !defined(OS_CHROMEOS)
   // On non-Chrome OS platforms the Ash list is independent from the native
   // list, double-check that it's empty.
-  BrowserList* ash_list =
-      BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
+  BrowserList* ash_list = BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_ASH);
   EXPECT_EQ(0U, ash_list->size());
 #endif
 
@@ -95,21 +90,20 @@ TEST_F(BrowserIteratorTest, NoBrowsersOnAshDesktop) {
 }
 
 TEST_F(BrowserIteratorTestWithInitialWindowInAsh, NoBrowsersOnNativeDesktop) {
-  Browser::CreateParams ash_params(profile(), chrome::HOST_DESKTOP_TYPE_ASH);
+  Browser::CreateParams ash_params(profile(), ui::HOST_DESKTOP_TYPE_ASH);
   // Note, browser 1 is on the ash desktop.
   scoped_ptr<Browser> browser2(
       chrome::CreateBrowserWithTestWindowForParams(&ash_params));
   scoped_ptr<Browser> browser3(
       chrome::CreateBrowserWithTestWindowForParams(&ash_params));
 
-  BrowserList* ash_list =
-      BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
+  BrowserList* ash_list = BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_ASH);
   EXPECT_EQ(3U, ash_list->size());
 #if !defined(OS_CHROMEOS)
   // On non-Chrome OS platforms the native list is independent from the Ash
   // list; double-check that it's empty.
   BrowserList* native_list =
-      BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE);
+      BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_NATIVE);
   EXPECT_EQ(0U, native_list->size());
 #endif