Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/ui/toolbar/toolbar_model_unittest.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 "components/toolbar/toolbar_model.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
@@ skipping 123 matching lines @@
 
 }  // namespace
 
 
 // ToolbarModelTest -----------------------------------------------------------
 
 class ToolbarModelTest : public BrowserWithTestWindowTest {
  public:
   ToolbarModelTest();
   ToolbarModelTest(Browser::Type browser_type,
-                   chrome::HostDesktopType host_desktop_type,
+                   ui::HostDesktopType host_desktop_type,
                    bool hosted_app);
   ~ToolbarModelTest() override;
 
   // BrowserWithTestWindowTest:
   void SetUp() override;
 
  protected:
   void NavigateAndCheckText(const GURL& url,
                             const base::string16& expected_text,
                             bool would_perform_search_term_replacement,
                             bool should_display_url);
 
  private:
   scoped_ptr<base::FieldTrialList> field_trial_list_;
 
   DISALLOW_COPY_AND_ASSIGN(ToolbarModelTest);
 };
 
 ToolbarModelTest::ToolbarModelTest() {
 }
 
-ToolbarModelTest::ToolbarModelTest(
-    Browser::Type browser_type,
-    chrome::HostDesktopType host_desktop_type,
-    bool hosted_app)
-    : BrowserWithTestWindowTest(browser_type,
-                                host_desktop_type,
-                                hosted_app) {
-}
+ToolbarModelTest::ToolbarModelTest(Browser::Type browser_type,
+                                   ui::HostDesktopType host_desktop_type,
+                                   bool hosted_app)
+    : BrowserWithTestWindowTest(browser_type, host_desktop_type, hosted_app) {}
 
 ToolbarModelTest::~ToolbarModelTest() {
 }
 
 void ToolbarModelTest::SetUp() {
   BrowserWithTestWindowTest::SetUp();
   TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
       profile(), &TemplateURLServiceFactory::BuildInstanceFor);
   AutocompleteClassifierFactory::GetInstance()->SetTestingFactoryAndUse(
       profile(), &AutocompleteClassifierFactory::BuildInstanceFor);
@@ skipping 42 matching lines @@
 
 class PopupToolbarModelTest : public ToolbarModelTest {
  public:
   PopupToolbarModelTest();
   ~PopupToolbarModelTest() override;
 
   DISALLOW_COPY_AND_ASSIGN(PopupToolbarModelTest);
 };
 
 PopupToolbarModelTest::PopupToolbarModelTest()
-      : ToolbarModelTest(Browser::TYPE_POPUP,
-                         chrome::HOST_DESKTOP_TYPE_NATIVE,
-                         false) {
-}
+    : ToolbarModelTest(Browser::TYPE_POPUP,
+                       ui::HOST_DESKTOP_TYPE_NATIVE,
+                       false) {}
 
 PopupToolbarModelTest::~PopupToolbarModelTest() {
 }
 
 // Actual tests ---------------------------------------------------------------
 
 // Test that we only replace URLs when query extraction and URL replacement
 // are enabled.
 TEST_F(ToolbarModelTest, ShouldDisplayURL_QueryExtraction) {
   AddTab(browser(), GURL(url::kAboutBlankURL));
@@ skipping 105 matching lines @@
 
   // Disabling URL replacement should reset to only showing URLs.
   browser()->toolbar_model()->set_url_replacement_enabled(false);
   for (size_t i = 0; i < arraysize(test_items); ++i) {
     const TestItem& test_item = test_items[i];
     NavigateAndCheckText(test_item.url,
                          test_item.expected_text_url_replacement_inactive,
                          false, test_item.should_display_url);
   }
 }