Revert of Revert of Componentize HistoryURLProvider/ScoredHistoryMatch.

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 001ba4a29f7954381163db575ecedcec0d94ce15..5031cb05afe08dbf50f3cf0d7f0f7b68ed952614 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -28,7 +28,6 @@
       'browser/autocomplete/history_quick_provider_unittest.cc',
       'browser/autocomplete/history_url_provider_unittest.cc',
       'browser/autocomplete/in_memory_url_index_unittest.cc',
-      'browser/autocomplete/scored_history_match_unittest.cc',
       'browser/autocomplete/search_provider_unittest.cc',
       'browser/autocomplete/shortcuts_backend_unittest.cc',
       'browser/autocomplete/shortcuts_database_unittest.cc',
@@ -125,8 +124,8 @@
       'browser/logging_chrome_unittest.cc',
       'browser/mac/keystone_glue_unittest.mm',
       'browser/manifest/manifest_icon_selector_unittest.cc',
+      'browser/media/midi_permission_context_unittest.cc',
       'browser/media/native_desktop_media_list_unittest.cc',
-      'browser/media/midi_permission_context_unittest.cc',
       'browser/metrics/chrome_metrics_service_accessor_unittest.cc',
       'browser/metrics/cloned_install_detector_unittest.cc',
       'browser/metrics/drive_metrics_provider_unittest.cc',
@@ -929,10 +928,10 @@
       'browser/ui/window_sizer/window_sizer_ash_unittest.cc',
     ],
     'chrome_test_support_unit_ash_sources': [
+      'browser/ui/ash/launcher/test/launcher_application_menu_item_model_test_api.cc',
+      'browser/ui/ash/launcher/test/launcher_application_menu_item_model_test_api.h',
       'browser/ui/ash/launcher/test/test_chrome_launcher_app_menu_item.cc',
       'browser/ui/ash/launcher/test/test_chrome_launcher_app_menu_item.h',
-      'browser/ui/ash/launcher/test/launcher_application_menu_item_model_test_api.cc',
-      'browser/ui/ash/launcher/test/launcher_application_menu_item_model_test_api.h',
     ],
     'chrome_unit_tests_task_manager_sources': [
       # New Task Manager Tests Sources:
@@ -1443,9 +1442,9 @@
       'browser/media/router/create_session_request_unittest.cc',
       'browser/media/router/issue_manager_unittest.cc',
       'browser/media/router/issue_unittest.cc',
+      'browser/media/router/media_route_unittest.cc',
       'browser/media/router/media_router_mojo_impl_unittest.cc',
       'browser/media/router/media_router_type_converters_unittest.cc',
-      'browser/media/router/media_route_unittest.cc',
       'browser/media/router/media_sink_unittest.cc',
       'browser/media/router/media_source_helper_unittest.cc',
       'browser/media/router/media_source_unittest.cc',