Move chrome::HostDesktopType to ui::HostDesktopType

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

 // Copyright 2013 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/ash/launcher/chrome_launcher_controller.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 246 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestV2AppLauncherItemController);
 };
 
 }  // namespace
 
 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 {}
 
   void SetUp() override {
     BrowserWithTestWindowTest::SetUp();
 
     model_.reset(new ash::ShelfModel);
     model_observer_.reset(new TestShelfModelObserver);
     model_->AddObserver(model_observer_.get());
 
@@ skipping 147 matching lines @@
   }
 
   BrowserWindow* CreateBrowserWindow() override {
     return CreateTestBrowserWindowAura();
   }
 
   scoped_ptr<Browser> CreateBrowserWithTestWindowForProfile(Profile* profile) {
     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));
   }
 
   void AddAppListLauncherItem() {
     ash::ShelfItem app_list;
     app_list.type = ash::TYPE_APP_LIST;
     model_->Add(app_list);
   }
 
   void InitLauncherController() {
@@ skipping 230 matching lines @@
   V1App(Profile* profile, const std::string& app_name) {
     // Create a window.
     native_window_.reset(new aura::Window(NULL));
     native_window_->set_id(0);
     native_window_->SetType(ui::wm::WINDOW_TYPE_POPUP);
     native_window_->Init(ui::LAYER_TEXTURED);
     native_window_->Show();
     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);
   }
 
   ~V1App() override {
     // close all tabs. Note that we do not need to destroy the browser itself.
     browser_->tab_strip_model()->CloseAllTabs();
   }
 
@@ skipping 753 matching lines @@
 
   // Create a second test profile. The first is the one in profile() created in
   // BrowserWithTestWindowTest::SetUp().
   // No need to add the profiles to the MultiUserWindowManager here.
   // CreateMultiUserProfile() already does that.
   TestingProfile* profile2 = CreateMultiUserProfile("user2");
   const std::string& current_user =
       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();
   aura::Window* window = browser_window->GetNativeWindow();
   manager->SetWindowOwner(window, current_user);
 
   // Check that an activation of the window on its owner's desktop does not
   // change the visibility to another user.
   launcher_controller_->ActivateWindowOrMinimizeIfActive(browser_window, false);
   EXPECT_TRUE(manager->IsWindowOnDesktopOfUser(window, current_user));
@@ skipping 1191 matching lines @@
 
   EXPECT_EQ(1, app_icon_loader->fetch_count());
   ASSERT_EQ(initial_size + 1, model_->items().size());
   EXPECT_TRUE(launcher_controller_->IsAppPinned("1"));
   EXPECT_FALSE(launcher_controller_->IsAppPinned("0"));
   EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_->items()[app_index].type);
 
   launcher_controller_->UnpinAppWithID("1");
   ASSERT_EQ(initial_size, model_->items().size());
 }