Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/ui/ash/accelerator_commands_browsertest.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 "ash/accelerators/accelerator_commands.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/wm/window_state.h"
 #include "base/command_line.h"
@@ skipping 138 matching lines @@
   EXPECT_TRUE(IsInitialShowState(window_state));
 
   // 2) ToggleFullscreen() should have no effect on windows which cannot be
   // maximized.
   window_state->window()->SetProperty(aura::client::kCanMaximizeKey, false);
   ash::accelerators::ToggleFullscreen();
   EXPECT_TRUE(IsInitialShowState(window_state));
 
   // 3) Hosted apps.
   Browser::CreateParams browser_create_params(
-      Browser::CreateParams::CreateForApp("Test",
-                                          true /* trusted_source */,
-                                          gfx::Rect(),
-                                          browser()->profile(),
-                                          chrome::HOST_DESKTOP_TYPE_ASH));
+      Browser::CreateParams::CreateForApp("Test", true /* trusted_source */,
+                                          gfx::Rect(), browser()->profile(),
+                                          ui::HOST_DESKTOP_TYPE_ASH));
 
   Browser* app_host_browser = new Browser(browser_create_params);
   ASSERT_TRUE(app_host_browser->is_app());
   AddBlankTabAndShow(app_host_browser);
   window_state =
       ash::wm::GetWindowState(app_host_browser->window()->GetNativeWindow());
   ASSERT_TRUE(window_state->IsActive());
   SetToInitialShowState(window_state);
   EXPECT_TRUE(IsInitialShowState(window_state));
 
   ash::accelerators::ToggleFullscreen();
   EXPECT_TRUE(window_state->IsFullscreen());
   EXPECT_TRUE(IsInImmersiveFullscreen(window_state));
 
   ash::accelerators::ToggleFullscreen();
   EXPECT_TRUE(IsInitialShowState(window_state));
 
   // 4) Popup browser windows.
   browser_create_params = Browser::CreateParams(
-      Browser::TYPE_POPUP, browser()->profile(), chrome::HOST_DESKTOP_TYPE_ASH);
+      Browser::TYPE_POPUP, browser()->profile(), ui::HOST_DESKTOP_TYPE_ASH);
   Browser* popup_browser = new Browser(browser_create_params);
   ASSERT_TRUE(popup_browser->is_type_popup());
   ASSERT_FALSE(popup_browser->is_app());
   AddBlankTabAndShow(popup_browser);
   window_state =
       ash::wm::GetWindowState(popup_browser->window()->GetNativeWindow());
   ASSERT_TRUE(window_state->IsActive());
   SetToInitialShowState(window_state);
   EXPECT_TRUE(IsInitialShowState(window_state));
 
@@ skipping 131 matching lines @@
     CloseAppWindow(app_window);
   }
 }
 
 INSTANTIATE_TEST_CASE_P(InitiallyRestored,
                         AcceleratorCommandsPlatformAppFullscreenBrowserTest,
                         Values(ui::SHOW_STATE_NORMAL));
 INSTANTIATE_TEST_CASE_P(InitiallyMaximized,
                         AcceleratorCommandsPlatformAppFullscreenBrowserTest,
                         Values(ui::SHOW_STATE_MAXIMIZED));