Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/ui/startup/startup_browser_creator_browsertest.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 <algorithm>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/prefs/pref_service.h"
@@ skipping 207 matching lines @@
 // background application.
 IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest,
                        StartupURLsOnNewWindowWithNoTabbedBrowsers) {
   // Use a couple same-site HTTP URLs.
   ASSERT_TRUE(test_server()->Start());
   std::vector<GURL> urls;
   urls.push_back(test_server()->GetURL("files/title1.html"));
   urls.push_back(test_server()->GetURL("files/title2.html"));
 
   Profile* profile = browser()->profile();
-  chrome::HostDesktopType host_desktop_type = browser()->host_desktop_type();
+  ui::HostDesktopType host_desktop_type = browser()->host_desktop_type();
 
   // Set the startup preference to open these URLs.
   SessionStartupPref pref(SessionStartupPref::URLS);
   pref.urls = urls;
   SessionStartupPref::SetStartupPref(profile, pref);
 
   // Keep the browser process running while browsers are closed.
   g_browser_process->AddRefModule();
 
   // Close the browser.
@@ skipping 44 matching lines @@
     {
       StartupBrowserCreatorImpl launch(base::FilePath(), dummy, first_run);
       ASSERT_TRUE(launch.Launch(profile, std::vector<GURL>(), false,
                                 host_desktop_type));
     }
 
     // Find the new browser and ensure that it has only the specified URLs this
     // time. Both the original browser created by the fixture and the one
     // created above have been closed, so the new browser is the only one
     // remaining.
-    new_browser = FindTabbedBrowser(profile, true, host_desktop_type);
+    new_browser = chrome::FindTabbedBrowser(profile, true, host_desktop_type);
     ASSERT_TRUE(new_browser);
     ASSERT_EQ(static_cast<int>(urls.size()),
               new_browser->tab_strip_model()->count());
   }
 
   g_browser_process->ReleaseModule();
 }
 
 // Verify that startup URLs aren't used when the process already exists
 // and has other tabbed browser windows.  This is the common case of starting a
@@ skipping 649 matching lines @@
   // Open a page with profile_last.
   Browser* browser_last = new Browser(
       Browser::CreateParams(Browser::TYPE_TABBED, profile_last,
                             browser()->host_desktop_type()));
   chrome::NewTab(browser_last);
   ui_test_utils::NavigateToURL(browser_last,
                                test_server()->GetURL("files/empty.html"));
   CloseBrowserAsynchronously(browser_last);
 
   // Close the main browser.
-  chrome::HostDesktopType original_desktop_type =
-      browser()->host_desktop_type();
+  ui::HostDesktopType original_desktop_type = browser()->host_desktop_type();
   CloseBrowserAsynchronously(browser());
 
   // Do a simple non-process-startup browser launch.
   base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
 
   StartupBrowserCreator browser_creator;
   std::vector<Profile*> last_opened_profiles;
   last_opened_profiles.push_back(profile_home1);
   last_opened_profiles.push_back(profile_home2);
   last_opened_profiles.push_back(profile_last);
@@ skipping 651 matching lines @@
   ASSERT_EQ(1, tab_strip->count());
   EXPECT_EQ("title1.html",
             tab_strip->GetWebContentsAt(0)->GetURL().ExtractFileName());
 }
 #endif  // defined(ENABLE_CONFIGURATION_POLICY)
 
 #endif  // !defined(OS_LINUX) || !defined(GOOGLE_CHROME_BUILD) ||
         // defined(ENABLE_CONFIGURATION_POLICY)
 
 #endif  // !defined(OS_CHROMEOS)