Revert of Componentize HistoryURLProvider/ScoredHistoryMatch.

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

Reason for revert:
Speculative revert to fix the Windows unit_test failures.

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
Committed: https://crrev.com/1b7219bbfc7470b6e48d008fa5e55e29e7f7898e
Cr-Commit-Position: refs/heads/master@{#334868}

[paulmeyer, 2015-06-17 17:18:19]

Created Revert of Componentize HistoryURLProvider/ScoredHistoryMatch.

[commit-bot: I haz the power, 2015-06-17 17:18:29]

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

[commit-bot: I haz the power, 2015-06-17 17:19:58]

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

[commit-bot: I haz the power, 2015-06-17 17:19:59]

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

Patch:       chrome/browser/autocomplete/in_memory_url_index.h
Index: chrome/browser/autocomplete/in_memory_url_index.h
diff --git a/chrome/browser/autocomplete/in_memory_url_index.h
b/chrome/browser/autocomplete/in_memory_url_index.h
index
c881a1ff132ca4566b059cb4a5dd5d8f539d6a79..2b3199cf1f332db2cb2b5fd60b2818959c0ddf6a
100644
--- a/chrome/browser/autocomplete/in_memory_url_index.h
+++ b/chrome/browser/autocomplete/in_memory_url_index.h
@@ -18,11 +18,11 @@
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/task/cancelable_task_tracker.h"
+#include "chrome/browser/autocomplete/scored_history_match.h"
 #include "components/history/core/browser/history_db_task.h"
 #include "components/history/core/browser/history_service_observer.h"
 #include "components/history/core/browser/history_types.h"
 #include "components/keyed_service/core/keyed_service.h"
-#include "components/omnibox/scored_history_match.h"
 
 class HistoryQuickProviderTest;

[commit-bot: I haz the power, 2015-06-17 17:20:53]

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

[paulmeyer, 2015-06-17 17:28:43]

The CQ bit was checked by paulmeyer@chromium.org

[commit-bot: I haz the power, 2015-06-17 17:29:21]

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

[commit-bot: I haz the power, 2015-06-17 17:31:55]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2015-06-17 17:32:50]

Patchset 1 (id:??) landed as
https://crrev.com/1b7219bbfc7470b6e48d008fa5e55e29e7f7898e
Cr-Commit-Position: refs/heads/master@{#334868}

[paulmeyer, 2015-06-17 17:56:55]

A revert of this CL (patchset #1 id:1) has been created in
https://codereview.chromium.org/1191953004/ by paulmeyer@chromium.org.

The reason for reverting is: This revert broke other things. Reverting the
revert..