Move chrome::HostDesktopType to ui::HostDesktopType

chrome/test/base/in_process_browser_test.cc

 // Copyright (c) 2012 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/test/base/in_process_browser_test.h"
 
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 74 matching lines @@
 namespace {
 
 // Passed as value of kTestType.
 const char kBrowserTestType[] = "browser";
 
 // A BrowserListObserver that makes sure that all browsers created are on the
 // |allowed_desktop_|.
 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);
 }
 
 SingleDesktopTestObserver::~SingleDesktopTestObserver() {
   BrowserList::RemoveObserver(this);
 }
 
 void SingleDesktopTestObserver::OnBrowserAdded(Browser* browser) {
   CHECK(CalledOnValidThread());
   CHECK_EQ(browser->host_desktop_type(), allowed_desktop_);
@@ skipping 327 matching lines @@
 #if !defined(OS_MACOSX)
 void InProcessBrowserTest::OpenDevToolsWindow(
     content::WebContents* web_contents) {
   ASSERT_FALSE(content::DevToolsAgentHost::HasFor(web_contents));
   DevToolsWindow::OpenDevToolsWindow(web_contents);
   ASSERT_TRUE(content::DevToolsAgentHost::HasFor(web_contents));
 }
 
 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);
   content::TestNavigationObserver observer(
       browser->tab_strip_model()->GetActiveWebContents());
   observer.Wait();
   return browser;
 }
 
 // Creates a browser with a single tab (about:blank), waits for the tab to
@@ skipping 68 matching lines @@
   return new_command_line;
 }
 #endif
 
 void InProcessBrowserTest::RunTestOnMainThreadLoop() {
   AfterStartupTaskUtils::SetBrowserStartupIsComplete();
 
   // 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_) {
     single_desktop_test_observer.reset(
         new SingleDesktopTestObserver(active_desktop));
   }
 
   const BrowserList* active_browser_list =
       BrowserList::GetInstance(active_desktop);
   if (!active_browser_list->empty()) {
@@ skipping 58 matching lines @@
 #endif
 
   // Sometimes tests leave Quit tasks in the MessageLoop (for shame), so let's
   // run all pending messages here to avoid preempting the QuitBrowsers tasks.
   // TODO(jbates) Once crbug.com/134753 is fixed, this can be removed because it
   // will not be possible to post Quit tasks.
   content::RunAllPendingInMessageLoop();
 
   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;
   }
 }
 
 void InProcessBrowserTest::QuitBrowsers() {
   if (chrome::GetTotalBrowserCount() == 0) {
     chrome::NotifyAppTerminating();
     return;
   }
 
@@ skipping 12 matching lines @@
   // On the Mac, this eventually reaches
   // -[BrowserWindowController windowWillClose:], which will post a deferred
   // -autorelease on itself to ultimately destroy the Browser object. The line
   // below is necessary to pump these pending messages to ensure all Browsers
   // get deleted.
   content::RunAllPendingInMessageLoop();
   delete autorelease_pool_;
   autorelease_pool_ = NULL;
 #endif
 }