Componentize TestToolbarModel

chrome/chrome_tests_unit.gypi

Index: chrome/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index bd2b255c123fd4666db08623d90a22d4111397b7..a0dcf16e15db100365a6dd409b4303504156e587 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -153,12 +153,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',
@@ -1212,11 +1212,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',
@@ -1275,8 +1275,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',
@@ -1572,8 +1572,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',
@@ -1700,6 +1698,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',