Revert of Componentize HistoryURLProvider/ScoredHistoryMatch.

Revert of Componentize HistoryURLProvider/ScoredHistoryMatch. (patchset #3 id:60001 of https://codereview.chromium.org/1181113005/)

Reason for revert:
Very speculative revert to attempt to fix ChromeBlacklistTrialTest.BlacklistDisabledRun on win unit_tests. If this doesn't fix it, https://codereview.chromium.org/1175603002 is next to try.

Original issue's description:
> Componentize HistoryURLProvider/ScoredHistoryMatch.
> 
> No changes are needed.
> 
> BUG=371538
> 
> Committed: https://crrev.com/66c202106ea7ab3f3c078a5edfb4abf0d23cee94
> Cr-Commit-Position: refs/heads/master@{#334780}

TBR=pkasting@chromium.org,blundell@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=371538

[phoglund_chromium, 2015-06-17 13:13:57]

Created Revert of Componentize HistoryURLProvider/ScoredHistoryMatch.

[commit-bot: I haz the power, 2015-06-17 13:14:13]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1187943006/1

[commit-bot: I haz the power, 2015-06-17 13:14:54]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-06-17 13:14:56]

Failed to apply patch for chrome/browser/autocomplete/history_quick_provider.cc:
While running git apply --index -3 -p1;
  error: patch failed: chrome/browser/autocomplete/history_quick_provider.cc:16
  Falling back to three-way merge...
  Applied patch to 'chrome/browser/autocomplete/history_quick_provider.cc' with
conflicts.
  U chrome/browser/autocomplete/history_quick_provider.cc

Patch:       chrome/browser/autocomplete/history_quick_provider.cc
Index: chrome/browser/autocomplete/history_quick_provider.cc
diff --git a/chrome/browser/autocomplete/history_quick_provider.cc
b/chrome/browser/autocomplete/history_quick_provider.cc
index
d67dab8c33e56372af08ec801deb4d3fb65d9d34..705b3f5ebdaa63d13f8f6b49c6316c374e3d5971
100644
--- a/chrome/browser/autocomplete/history_quick_provider.cc
+++ b/chrome/browser/autocomplete/history_quick_provider.cc
@@ -16,6 +16,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
+#include "chrome/browser/autocomplete/history_url_provider.h"
 #include "chrome/browser/autocomplete/in_memory_url_index.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/profiles/profile.h"
@@ -30,7 +31,6 @@
 #include "components/metrics/proto/omnibox_input_type.pb.h"
 #include "components/omnibox/autocomplete_match_type.h"
 #include "components/omnibox/autocomplete_result.h"
-#include "components/omnibox/history_url_provider.h"
 #include "components/omnibox/in_memory_url_index_types.h"
 #include "components/omnibox/omnibox_field_trial.h"
 #include "components/search_engines/template_url.h"

[commit-bot: I haz the power, 2015-06-17 13:15:02]

The CQ bit was unchecked by commit-bot@chromium.org