Componentize ScoredHistoryMatch

chrome/browser/history/DEPS

Index: chrome/browser/history/DEPS
diff --git a/chrome/browser/history/DEPS b/chrome/browser/history/DEPS
index f32222953468c74d0604c03e189afe64b008ee9e..901dd1cd87197b3afdacdb5b0776e11e18a03c39 100644
--- a/chrome/browser/history/DEPS
+++ b/chrome/browser/history/DEPS
@@ -18,7 +18,6 @@ include_rules = [
   #
   # Do not add to the list of temporarily-allowed dependencies below,
   # and please do not introduce more #includes of these files.
-  "!chrome/browser/autocomplete/history_url_provider.h",
   "!chrome/browser/chrome_notification_types.h",
   "!chrome/browser/prerender/prerender_contents.h",
   "!chrome/browser/prerender/prerender_manager.h",
@@ -32,8 +31,6 @@ include_rules = [
   "!chrome/browser/ui/browser_finder.h",
   "!components/bookmarks/browser/bookmark_utils.h",
   "!components/dom_distiller/core/url_constants.h",
-  "!components/omnibox/omnibox_field_trial.h",
-  "!components/omnibox/url_prefix.h",
   "!components/visitedlink/browser/visitedlink_delegate.h",
   "!components/visitedlink/browser/visitedlink_master.h",
 ]
@@ -62,7 +59,7 @@ specific_include_rules = {
   # Do not add to the list of temporarily-allowed dependencies below,
   # and please do not introduce more #includes of these files.
   '.*_[a-z]*test\.cc': [
-    "!chrome/browser/autocomplete/scored_history_match_builder.h",
+    "!chrome/browser/autocomplete/scored_history_match_builder_impl.h",
     "!chrome/browser/bookmarks/bookmark_model_factory.h",
     "!chrome/browser/sync/profile_sync_service.h",
     "!chrome/browser/sync/profile_sync_service_factory.h",