Componentize TestToolbarModel

This will be needed by upcoming CL that componentizes omnibox_edit_unittest.cc.

TBR=jochen

Review URL: https://codereview.chromium.org/1634743003

Cr-Commit-Position: refs/heads/master@{#372097}

chrome/browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm

@@ -13,8 +13,8 @@
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #include "chrome/browser/ui/cocoa/run_loop_testing.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/browser/ui/toolbar/test_toolbar_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
+#include "components/toolbar/test_toolbar_model.h"
 #include "components/ui/zoom/page_zoom.h"
 #include "components/ui/zoom/zoom_controller.h"
 #include "content/public/browser/host_zoom_map.h"

chrome/browser/ui/omnibox/omnibox_edit_unittest.cc

@@ -10,10 +10,10 @@
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/omnibox/chrome_omnibox_client.h"
 #include "chrome/browser/ui/omnibox/chrome_omnibox_edit_controller.h"
-#include "chrome/browser/ui/toolbar/test_toolbar_model.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/omnibox/browser/omnibox_edit_model.h"
 #include "components/omnibox/browser/omnibox_view.h"
+#include "components/toolbar/test_toolbar_model.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/ui/omnibox/omnibox_view_browsertest.cc

@@ -25,7 +25,6 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/location_bar/location_bar.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/browser/ui/toolbar/test_toolbar_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
@@ -45,6 +44,7 @@
 #include "components/omnibox/browser/omnibox_view.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
+#include "components/toolbar/test_toolbar_model.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "net/dns/mock_host_resolver.h"

chrome/browser/ui/views/frame/web_app_left_header_view_ash_unittest.cc

@@ -8,11 +8,11 @@
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/values.h"
-#include "chrome/browser/ui/toolbar/test_toolbar_model.h"
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/test_with_browser_view.h"
 #include "chrome/common/chrome_switches.h"
+#include "components/toolbar/test_toolbar_model.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_constants.h"

chrome/chrome_tests.gypi

@@ -519,8 +519,6 @@
       'browser/ui/toolbar/component_toolbar_actions_browsertest.cc',
       'browser/ui/toolbar/mock_component_toolbar_actions_factory.cc',
       'browser/ui/toolbar/mock_component_toolbar_actions_factory.h',
-      'browser/ui/toolbar/test_toolbar_model.cc',
-      'browser/ui/toolbar/test_toolbar_model.h',
       'browser/ui/website_settings/mock_permission_bubble_view.cc',
       'browser/ui/website_settings/mock_permission_bubble_view.h',
       'browser/ui/website_settings/permission_bubble_browser_test_util.cc',
@@ -1073,8 +1071,6 @@
       'browser/ui/search/instant_test_utils.h',
       'browser/ui/search/local_ntp_browsertest.cc',
       'browser/ui/startup/startup_browser_creator_interactive_uitest.cc',
-      'browser/ui/toolbar/test_toolbar_model.cc',
-      'browser/ui/toolbar/test_toolbar_model.h',
       'browser/ui/translate/translate_bubble_test_utils.h',
       'browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc',
       'browser/ui/webui/options/language_dictionary_interactive_uitest.cc',

chrome/chrome_tests_unit.gypi

@@ -152,12 +152,12 @@
       'browser/net/spdyproxy/data_reduction_proxy_chrome_settings_unittest.cc',
       'browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc',
       'browser/net/url_info_unittest.cc',
-      'browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc',
-      'browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h',
       'browser/page_load_metrics/observers/aborts_page_load_metrics_observer_unittest.cc',
       'browser/page_load_metrics/observers/core_page_load_metrics_observer_unittest.cc',
       'browser/page_load_metrics/observers/from_gws_page_load_metrics_observer_unittest.cc',
       'browser/page_load_metrics/observers/google_captcha_observer_unittest.cc',
+      'browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc',
+      'browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h',
       'browser/password_manager/chrome_password_manager_client_unittest.cc',
       'browser/password_manager/password_manager_internals_service_unittest.cc',
       'browser/password_manager/password_store_mac_unittest.cc',
@@ -1211,11 +1211,11 @@
       'browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm',
       'browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm',
       'browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell_unittest.mm',
+      'browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm',
+      'browser/ui/cocoa/browser/zoom_bubble_controller_unittest.mm',
       'browser/ui/cocoa/browser_window_cocoa_unittest.mm',
       'browser/ui/cocoa/browser_window_controller_unittest.mm',
       'browser/ui/cocoa/browser_window_layout_unittest.mm',
-      'browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm',
-      'browser/ui/cocoa/browser/zoom_bubble_controller_unittest.mm',
       'browser/ui/cocoa/bubble_view_unittest.mm',
       'browser/ui/cocoa/chrome_browser_window_unittest.mm',
       'browser/ui/cocoa/clickhold_button_cell_unittest.mm',
@@ -1274,8 +1274,8 @@
       'browser/ui/cocoa/infobars/translate_infobar_unittest.mm',
       'browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm',
       'browser/ui/cocoa/location_bar/autocomplete_text_field_editor_unittest.mm',
-      'browser/ui/cocoa/location_bar/autocomplete_text_field_unittest_helper.mm',
       'browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm',
+      'browser/ui/cocoa/location_bar/autocomplete_text_field_unittest_helper.mm',
       'browser/ui/cocoa/location_bar/ev_bubble_decoration_unittest.mm',
       'browser/ui/cocoa/location_bar/image_decoration_unittest.mm',
       'browser/ui/cocoa/location_bar/keyword_hint_decoration_unittest.mm',
@@ -1568,8 +1568,6 @@
       'browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc',
       'browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.cc',
       'browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h',
-      'browser/ui/toolbar/test_toolbar_model.cc',
-      'browser/ui/toolbar/test_toolbar_model.h',
       'browser/ui/toolbar/toolbar_actions_bar_unittest.cc',
       'browser/ui/toolbar/toolbar_actions_bar_unittest.h',
       'browser/ui/toolbar/toolbar_actions_model_unittest.cc',
@@ -1697,6 +1695,7 @@
         '../components/components.gyp:sync_driver_test_support',
         '../components/components.gyp:sync_sessions_test_support',
         '../components/components.gyp:syncable_prefs_test_support',
+        '../components/components.gyp:toolbar_test_support',
         '../components/components.gyp:update_client_test_support',
         '../components/components.gyp:user_prefs_tracked_test_support',
         '../content/content.gyp:content_app_both',

chrome/test/BUILD.gn

@@ -108,6 +108,7 @@ source_set("test_support") {
     "//components/sync_driver:test_support",
     "//components/sync_sessions:test_support",
     "//components/syncable_prefs:test_support",
+    "//components/toolbar:test_support",
     "//components/ui/zoom:test_support",
     "//components/update_client:test_support",
     "//content/public/app:both",

components/toolbar.gypi

@@ -22,5 +22,31 @@
         'toolbar/toolbar_model.h',
       ],
     },
+    {
+      # GN version: //components/toolbar:test_support
+      'target_name': 'toolbar_test_support',
+      'type': 'static_library',
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../ui/gfx/gfx.gyp:gfx_vector_icons',
+        'components_resources.gyp:components_resources',
+        'toolbar',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'toolbar/test_toolbar_model.cc',
+        'toolbar/test_toolbar_model.h',
+      ],
+      'conditions': [
+        ['toolkit_views==1', {
+          # Needed to get the TOOLKIT_VIEWS define.
+          'dependencies': [
+            '<(DEPTH)/ui/views/views.gyp:views',
+          ],
+        }],
+      ],
+    },
   ],
 }

components/toolbar/BUILD.gn

@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/ui.gni")
+
 source_set("toolbar") {
   sources = [
     "toolbar_model.cc",
@@ -14,3 +16,24 @@ source_set("toolbar") {
     "//url",
   ]
 }
+
+source_set("test_support") {
+  testonly = true
+
+  sources = [
+    "test_toolbar_model.cc",
+    "test_toolbar_model.h",
+  ]
+
+  deps = [
+    ":toolbar",
+    "//base",
+    "//components/resources",
+    "//ui/gfx",
+  ]
+
+  if (toolkit_views) {
+    # Needed to get the TOOLKIT_VIEWS define.
+    deps += [ "//ui/views" ]
+  }
+}

components/toolbar/DEPS

 include_rules = [
+  "+components/grit",
   "+components/security_state",
+  "+ui/gfx",
 ]

chrome/browser/ui/toolbar/test_toolbar_model.cc → components/toolbar/test_toolbar_model.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/toolbar/test_toolbar_model.h"
+#include "components/toolbar/test_toolbar_model.h"
 
-#include "grit/components_scaled_resources.h"
+#include "components/grit/components_scaled_resources.h"
 #include "ui/gfx/vector_icons_public.h"
 
 TestToolbarModel::TestToolbarModel()

chrome/browser/ui/toolbar/test_toolbar_model.h → components/toolbar/test_toolbar_model.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_TOOLBAR_TEST_TOOLBAR_MODEL_H_
-#define CHROME_BROWSER_UI_TOOLBAR_TEST_TOOLBAR_MODEL_H_
+#ifndef COMPONENTS_TOOLBAR_TEST_TOOLBAR_MODEL_H_
+#define COMPONENTS_TOOLBAR_TEST_TOOLBAR_MODEL_H_
 
 #include <stddef.h>
 
@@ -65,4 +65,4 @@ class TestToolbarModel : public ToolbarModel {
   DISALLOW_COPY_AND_ASSIGN(TestToolbarModel);
 };
 
-#endif  // CHROME_BROWSER_UI_TOOLBAR_TEST_TOOLBAR_MODEL_H_
+#endif  // COMPONENTS_TOOLBAR_TEST_TOOLBAR_MODEL_H_