Move chrome::HostDesktopType to ui::HostDesktopType

chrome/test/base/in_process_browser_test.cc

Index: chrome/test/base/in_process_browser_test.cc
diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc
index 5b83e3b544deefeb6b39b50cb1fb1bfa839e1f0d..96283757da1ff85c7b6596b82f3227563714bff0 100644
--- a/chrome/test/base/in_process_browser_test.cc
+++ b/chrome/test/base/in_process_browser_test.cc
@@ -92,21 +92,21 @@ const char kBrowserTestType[] = "browser";
 class SingleDesktopTestObserver : public chrome::BrowserListObserver,
                                   public base::NonThreadSafe {
  public:
-  explicit SingleDesktopTestObserver(chrome::HostDesktopType allowed_desktop);
+  explicit SingleDesktopTestObserver(ui::HostDesktopType allowed_desktop);
   ~SingleDesktopTestObserver() override;
 
   // chrome::BrowserListObserver:
   void OnBrowserAdded(Browser* browser) override;
 
  private:
-  chrome::HostDesktopType allowed_desktop_;
+  ui::HostDesktopType allowed_desktop_;
 
   DISALLOW_COPY_AND_ASSIGN(SingleDesktopTestObserver);
 };
 
 SingleDesktopTestObserver::SingleDesktopTestObserver(
-    chrome::HostDesktopType allowed_desktop)
-        : allowed_desktop_(allowed_desktop) {
+    ui::HostDesktopType allowed_desktop)
+    : allowed_desktop_(allowed_desktop) {
   BrowserList::AddObserver(this);
 }
 
@@ -454,7 +454,7 @@ void InProcessBrowserTest::OpenDevToolsWindow(
 
 Browser* InProcessBrowserTest::OpenURLOffTheRecord(Profile* profile,
                                                    const GURL& url) {
-  chrome::HostDesktopType active_desktop = chrome::GetActiveDesktop();
+  ui::HostDesktopType active_desktop = chrome::GetActiveDesktop();
   chrome::OpenURLOffTheRecord(profile, url, active_desktop);
   Browser* browser = chrome::FindTabbedBrowser(
       profile->GetOffTheRecordProfile(), false, active_desktop);
@@ -543,7 +543,7 @@ void InProcessBrowserTest::RunTestOnMainThreadLoop() {
   // Pump startup related events.
   content::RunAllPendingInMessageLoop();
 
-  chrome::HostDesktopType active_desktop = chrome::GetActiveDesktop();
+  ui::HostDesktopType active_desktop = chrome::GetActiveDesktop();
   // Self-adds/removes itself from the BrowserList observers.
   scoped_ptr<SingleDesktopTestObserver> single_desktop_test_observer;
   if (!multi_desktop_test_) {
@@ -622,9 +622,9 @@ void InProcessBrowserTest::RunTestOnMainThreadLoop() {
 
   QuitBrowsers();
   // All BrowserLists should be empty at this point.
-  for (chrome::HostDesktopType t = chrome::HOST_DESKTOP_TYPE_FIRST;
-       t < chrome::HOST_DESKTOP_TYPE_COUNT;
-       t = static_cast<chrome::HostDesktopType>(t + 1)) {
+  for (ui::HostDesktopType t = ui::HOST_DESKTOP_TYPE_FIRST;
+       t < ui::HOST_DESKTOP_TYPE_COUNT;
+       t = static_cast<ui::HostDesktopType>(t + 1)) {
     CHECK(BrowserList::GetInstance(t)->empty()) << t;
   }
 }