Moves HistoryIndexRestoreObserver to components/omnibox/browser.

BUG=None
TEST=None

Review URL: https://codereview.chromium.org/1639463002

Cr-Commit-Position: refs/heads/master@{#371628}

chrome/browser/autocomplete/in_memory_url_index_unittest.cc

@@ -24,12 +24,12 @@
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/test/base/history_index_restore_observer.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "components/history/core/browser/history_backend.h"
 #include "components/history/core/browser/history_database.h"
 #include "components/history/core/browser/history_service.h"
+#include "components/omnibox/browser/history_index_restore_observer.h"
 #include "components/omnibox/browser/in_memory_url_index.h"
 #include "components/omnibox/browser/in_memory_url_index_types.h"
 #include "components/omnibox/browser/url_index_private_data.h"

chrome/chrome_tests_unit.gypi

@@ -1830,8 +1830,6 @@
         'test/base/dialog_test_browser_window.h',
         'test/base/find_in_page_observer.cc',
         'test/base/find_in_page_observer.h',
-        'test/base/history_index_restore_observer.cc',
-        'test/base/history_index_restore_observer.h',
         'test/base/scoped_browser_locale.cc',
         'test/base/scoped_browser_locale.h',
         'test/base/scoped_bundle_swizzler_mac.h',

chrome/test/BUILD.gn

@@ -42,8 +42,6 @@ source_set("test_support") {
     "base/dialog_test_browser_window.h",
     "base/find_in_page_observer.cc",
     "base/find_in_page_observer.h",
-    "base/history_index_restore_observer.cc",
-    "base/history_index_restore_observer.h",
     "base/scoped_browser_locale.cc",
     "base/scoped_browser_locale.h",
     "base/scoped_bundle_swizzler_mac.h",

chrome/test/base/testing_profile.cc

@@ -49,7 +49,6 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
-#include "chrome/test/base/history_index_restore_observer.h"
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/common/bookmark_constants.h"
@@ -66,6 +65,7 @@
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/keyed_service/core/refcounted_keyed_service.h"
 #include "components/omnibox/browser/autocomplete_classifier.h"
+#include "components/omnibox/browser/history_index_restore_observer.h"
 #include "components/omnibox/browser/in_memory_url_index.h"
 #include "components/policy/core/common/policy_service.h"
 #include "components/proxy_config/pref_proxy_config_tracker.h"

components/omnibox.gypi

@@ -181,6 +181,8 @@
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
+        'omnibox/browser/history_index_restore_observer.cc',
+        'omnibox/browser/history_index_restore_observer.h',
         'omnibox/browser/mock_autocomplete_provider_client.cc',
         'omnibox/browser/mock_autocomplete_provider_client.h',
         'omnibox/browser/test_scheme_classifier.cc',

components/omnibox/browser/BUILD.gn

@@ -159,6 +159,8 @@ proto_library("in_memory_url_index_cache_proto") {
 static_library("test_support") {
   testonly = true
   sources = [
+    "history_index_restore_observer.cc",
+    "history_index_restore_observer.h",
     "mock_autocomplete_provider_client.cc",
     "mock_autocomplete_provider_client.h",
     "test_scheme_classifier.cc",

chrome/test/base/history_index_restore_observer.cc → components/omnibox/browser/history_index_restore_observer.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/test/base/history_index_restore_observer.h"
+#include "components/omnibox/browser/history_index_restore_observer.h"
 
 HistoryIndexRestoreObserver::HistoryIndexRestoreObserver(
     const base::Closure& task)

chrome/test/base/history_index_restore_observer.h → components/omnibox/browser/history_index_restore_observer.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_TEST_BASE_HISTORY_INDEX_RESTORE_OBSERVER_H_
-#define CHROME_TEST_BASE_HISTORY_INDEX_RESTORE_OBSERVER_H_
+#ifndef COMPONENTS_OMNIBOX_BROWSER_HISTORY_INDEX_RESTORE_OBSERVER_H_
+#define COMPONENTS_OMNIBOX_BROWSER_HISTORY_INDEX_RESTORE_OBSERVER_H_
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
@@ -31,4 +31,4 @@ class HistoryIndexRestoreObserver
   DISALLOW_COPY_AND_ASSIGN(HistoryIndexRestoreObserver);
 };
 
-#endif  // CHROME_TEST_BASE_HISTORY_INDEX_RESTORE_OBSERVER_H_
+#endif  // COMPONENTS_OMNIBOX_BROWSER_HISTORY_INDEX_RESTORE_OBSERVER_H_