Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
index 370a08aaca4af46f5c4fa3932aab80cfb7cf506b..e6248b891604c9d836c39074cd58854ae73b730b 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
@@ -264,13 +264,11 @@ class TestV2AppLauncherItemController : public LauncherItemController {
 class ChromeLauncherControllerTest : public BrowserWithTestWindowTest {
  protected:
   ChromeLauncherControllerTest()
-      : BrowserWithTestWindowTest(
-            Browser::TYPE_TABBED,
-            chrome::HOST_DESKTOP_TYPE_ASH,
-            false),
+      : BrowserWithTestWindowTest(Browser::TYPE_TABBED,
+                                  ui::HOST_DESKTOP_TYPE_ASH,
+                                  false),
         test_controller_(NULL),
-        extension_service_(NULL) {
-  }
+        extension_service_(NULL) {}
 
   ~ChromeLauncherControllerTest() override {}
 
@@ -438,7 +436,7 @@ class ChromeLauncherControllerTest : public BrowserWithTestWindowTest {
     TestBrowserWindow* browser_widnow = CreateTestBrowserWindowAura();
     new TestBrowserWindowOwner(browser_widnow);
     return make_scoped_ptr(CreateBrowser(profile, Browser::TYPE_TABBED, false,
-                                         chrome::HOST_DESKTOP_TYPE_ASH,
+                                         ui::HOST_DESKTOP_TYPE_ASH,
                                          browser_widnow));
   }
 
@@ -689,12 +687,9 @@ class V1App : public TestBrowserWindow {
     aura::client::ParentWindowWithContext(native_window_.get(),
                                           ash::Shell::GetPrimaryRootWindow(),
                                           gfx::Rect(10, 10, 20, 30));
-    Browser::CreateParams params =
-        Browser::CreateParams::CreateForApp(kCrxAppPrefix + app_name,
-                                            true /* trusted_source */,
-                                            gfx::Rect(),
-                                            profile,
-                                            chrome::HOST_DESKTOP_TYPE_ASH);
+    Browser::CreateParams params = Browser::CreateParams::CreateForApp(
+        kCrxAppPrefix + app_name, true /* trusted_source */, gfx::Rect(),
+        profile, ui::HOST_DESKTOP_TYPE_ASH);
     params.window = this;
     browser_.reset(new Browser(params));
     chrome::AddTabAt(browser_.get(), GURL(), 0, true);
@@ -1468,7 +1463,7 @@ TEST_F(MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest,
       multi_user_util::GetUserIDFromProfile(profile());
 
   // Create a browser window with a native window for the current user.
-  Browser::CreateParams params(profile(), chrome::HOST_DESKTOP_TYPE_ASH);
+  Browser::CreateParams params(profile(), ui::HOST_DESKTOP_TYPE_ASH);
   scoped_ptr<Browser> browser(
       chrome::CreateBrowserWithAuraTestWindowForParams(nullptr, &params));
   BrowserWindow* browser_window = browser->window();