diff options
77 files changed, 97 insertions, 85 deletions
diff --git a/chrome/browser/android/provider/chrome_browser_provider.cc b/chrome/browser/android/provider/chrome_browser_provider.cc index 62b8864..5ad53c3 100644 --- a/chrome/browser/android/provider/chrome_browser_provider.cc +++ b/chrome/browser/android/provider/chrome_browser_provider.cc @@ -30,11 +30,11 @@ #include "chrome/browser/history/top_sites.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_utils.h" +#include "components/search_engines/template_url.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/autocomplete/autocomplete_controller.cc b/chrome/browser/autocomplete/autocomplete_controller.cc index 01a2df1..9519900 100644 --- a/chrome/browser/autocomplete/autocomplete_controller.cc +++ b/chrome/browser/autocomplete/autocomplete_controller.cc @@ -27,8 +27,8 @@ #include "chrome/browser/omnibox/omnibox_field_trial.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search/search.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" +#include "components/search_engines/template_url.h" #include "content/public/browser/notification_service.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/autocomplete/autocomplete_match.cc b/chrome/browser/autocomplete/autocomplete_match.cc index 59365b7..37dfca0 100644 --- a/chrome/browser/autocomplete/autocomplete_match.cc +++ b/chrome/browser/autocomplete/autocomplete_match.cc @@ -12,10 +12,10 @@ #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "chrome/browser/autocomplete/autocomplete_provider.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" +#include "components/search_engines/template_url.h" #include "content/public/common/url_constants.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/autocomplete/autocomplete_match.h b/chrome/browser/autocomplete/autocomplete_match.h index e772484..e92766a 100644 --- a/chrome/browser/autocomplete/autocomplete_match.h +++ b/chrome/browser/autocomplete/autocomplete_match.h @@ -10,8 +10,8 @@ #include <vector> #include "base/memory/scoped_ptr.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/common/autocomplete_match_type.h" +#include "components/search_engines/template_url.h" #include "content/public/common/page_transition_types.h" #include "url/gurl.h" diff --git a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc index 08a4852..a4de90c 100644 --- a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc +++ b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc @@ -19,13 +19,13 @@ #include "chrome/browser/autocomplete/keyword_provider.h" #include "chrome/browser/autocomplete/search_provider.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "components/metrics/proto/omnibox_event.pb.h" #include "components/search_engines/search_engines_switches.h" +#include "components/search_engines/template_url.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/autocomplete/base_search_provider.cc b/chrome/browser/autocomplete/base_search_provider.cc index 5193e75..8104dc2 100644 --- a/chrome/browser/autocomplete/base_search_provider.cc +++ b/chrome/browser/autocomplete/base_search_provider.cc @@ -22,7 +22,6 @@ #include "chrome/browser/search/instant_service.h" #include "chrome/browser/search/instant_service_factory.h" #include "chrome/browser/search/search.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" @@ -33,6 +32,7 @@ #include "components/autocomplete/url_prefix.h" #include "components/metrics/proto/omnibox_event.pb.h" #include "components/metrics/proto/omnibox_input_type.pb.h" +#include "components/search_engines/template_url.h" #include "components/sync_driver/sync_prefs.h" #include "components/url_fixer/url_fixer.h" #include "content/public/common/url_constants.h" diff --git a/chrome/browser/autocomplete/history_quick_provider.cc b/chrome/browser/autocomplete/history_quick_provider.cc index 7ffe62d..5291c7e 100644 --- a/chrome/browser/autocomplete/history_quick_provider.cc +++ b/chrome/browser/autocomplete/history_quick_provider.cc @@ -28,7 +28,6 @@ #include "chrome/browser/omnibox/omnibox_field_trial.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search/search.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/common/autocomplete_match_type.h" @@ -36,6 +35,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "components/metrics/proto/omnibox_input_type.pb.h" +#include "components/search_engines/template_url.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "net/base/escape.h" diff --git a/chrome/browser/autocomplete/history_quick_provider_unittest.cc b/chrome/browser/autocomplete/history_quick_provider_unittest.cc index 46cac17..6bc9be2 100644 --- a/chrome/browser/autocomplete/history_quick_provider_unittest.cc +++ b/chrome/browser/autocomplete/history_quick_provider_unittest.cc @@ -29,7 +29,6 @@ #include "chrome/browser/history/in_memory_url_index.h" #include "chrome/browser/history/url_database.h" #include "chrome/browser/history/url_index_private_data.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/common/pref_names.h" @@ -37,6 +36,7 @@ #include "chrome/test/base/testing_profile.h" #include "components/bookmarks/test/bookmark_test_helpers.h" #include "components/metrics/proto/omnibox_event.pb.h" +#include "components/search_engines/template_url.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_browser_thread.h" #include "content/public/test/test_utils.h" diff --git a/chrome/browser/autocomplete/history_url_provider.h b/chrome/browser/autocomplete/history_url_provider.h index 9c675fb..e127728 100644 --- a/chrome/browser/autocomplete/history_url_provider.h +++ b/chrome/browser/autocomplete/history_url_provider.h @@ -14,7 +14,7 @@ #include "chrome/browser/autocomplete/history_provider.h" #include "chrome/browser/autocomplete/history_provider_util.h" #include "chrome/browser/omnibox/omnibox_field_trial.h" -#include "chrome/browser/search_engines/template_url.h" +#include "components/search_engines/template_url.h" class Profile; class SearchTermsData; diff --git a/chrome/browser/autocomplete/history_url_provider_unittest.cc b/chrome/browser/autocomplete/history_url_provider_unittest.cc index 5dae6ca..363f002 100644 --- a/chrome/browser/autocomplete/history_url_provider_unittest.cc +++ b/chrome/browser/autocomplete/history_url_provider_unittest.cc @@ -19,7 +19,6 @@ #include "chrome/browser/autocomplete/history_quick_provider.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/common/pref_names.h" @@ -27,6 +26,7 @@ #include "chrome/test/base/testing_profile.h" #include "components/metrics/proto/omnibox_event.pb.h" #include "components/metrics/proto/omnibox_input_type.pb.h" +#include "components/search_engines/template_url.h" #include "components/url_fixer/url_fixer.h" #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/autocomplete/keyword_provider.cc b/chrome/browser/autocomplete/keyword_provider.cc index 8affa3f..8825865 100644 --- a/chrome/browser/autocomplete/keyword_provider.cc +++ b/chrome/browser/autocomplete/keyword_provider.cc @@ -15,10 +15,10 @@ #include "chrome/browser/autocomplete/keyword_extensions_delegate.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "components/metrics/proto/omnibox_input_type.pb.h" +#include "components/search_engines/template_url.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "extensions/browser/extension_system.h" diff --git a/chrome/browser/autocomplete/keyword_provider_unittest.cc b/chrome/browser/autocomplete/keyword_provider_unittest.cc index 7aa2f39..27467b1 100644 --- a/chrome/browser/autocomplete/keyword_provider_unittest.cc +++ b/chrome/browser/autocomplete/keyword_provider_unittest.cc @@ -7,11 +7,11 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/autocomplete/keyword_provider.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/test/base/testing_browser_process.h" #include "components/metrics/proto/omnibox_event.pb.h" #include "components/search_engines/search_engines_switches.h" +#include "components/search_engines/template_url.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" diff --git a/chrome/browser/autocomplete/search_provider.h b/chrome/browser/autocomplete/search_provider.h index 7e5dfdf..26d43a4 100644 --- a/chrome/browser/autocomplete/search_provider.h +++ b/chrome/browser/autocomplete/search_provider.h @@ -18,8 +18,8 @@ #include "base/timer/timer.h" #include "chrome/browser/autocomplete/base_search_provider.h" #include "chrome/browser/history/history_types.h" -#include "chrome/browser/search_engines/template_url.h" #include "components/metrics/proto/omnibox_input_type.pb.h" +#include "components/search_engines/template_url.h" class Profile; class SearchProviderTest; diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc index e80e6e7..24d157d 100644 --- a/chrome/browser/autocomplete/search_provider_unittest.cc +++ b/chrome/browser/autocomplete/search_provider_unittest.cc @@ -26,7 +26,6 @@ #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/omnibox/omnibox_field_trial.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/signin/signin_manager_factory.h" @@ -40,6 +39,7 @@ #include "components/metrics/proto/omnibox_event.pb.h" #include "components/search_engines/search_engine_type.h" #include "components/search_engines/search_engines_switches.h" +#include "components/search_engines/template_url.h" #include "components/signin/core/browser/signin_manager.h" #include "components/sync_driver/pref_names.h" #include "components/variations/entropy_provider.h" diff --git a/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc b/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc index 73e2be1..1e2bf13 100644 --- a/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc +++ b/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc @@ -11,12 +11,12 @@ #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" #include "chrome/browser/omnibox/omnibox_field_trial.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" #include "components/metrics/proto/omnibox_event.pb.h" +#include "components/search_engines/template_url.h" #include "components/variations/entropy_provider.h" #include "components/variations/variations_associated_data.h" #include "content/public/test/test_browser_thread_bundle.h" diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chrome/browser/extensions/api/omnibox/omnibox_api.cc index c72b999..e1da4d5 100644 --- a/chrome/browser/extensions/api/omnibox/omnibox_api.cc +++ b/chrome/browser/extensions/api/omnibox/omnibox_api.cc @@ -10,11 +10,11 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/common/extensions/api/omnibox.h" #include "chrome/common/extensions/api/omnibox/omnibox_handler.h" +#include "components/search_engines/template_url.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "extensions/browser/event_router.h" diff --git a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc index bb75dad..a18d45a 100644 --- a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc +++ b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc @@ -9,12 +9,12 @@ #include "chrome/browser/extensions/api/preference/preference_api.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/common/extensions/manifest_handlers/settings_overrides_handler.h" #include "chrome/common/pref_names.h" #include "components/search_engines/search_engines_pref_names.h" +#include "components/search_engines/template_url.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_prefs_factory.h" #include "extensions/browser/extension_registry.h" diff --git a/chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest.cc b/chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest.cc index d0bde17..c4ff508 100644 --- a/chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest.cc +++ b/chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest.cc @@ -8,10 +8,10 @@ #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/common/pref_names.h" +#include "components/search_engines/template_url.h" namespace { diff --git a/chrome/browser/importer/firefox_importer_browsertest.cc b/chrome/browser/importer/firefox_importer_browsertest.cc index c56af96..5f1575b 100644 --- a/chrome/browser/importer/firefox_importer_browsertest.cc +++ b/chrome/browser/importer/firefox_importer_browsertest.cc @@ -14,7 +14,6 @@ #include "chrome/browser/importer/external_process_importer_host.h" #include "chrome/browser/importer/importer_progress_observer.h" #include "chrome/browser/importer/importer_unittest_utils.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/importer/imported_bookmark_entry.h" @@ -22,6 +21,7 @@ #include "chrome/common/importer/importer_data_types.h" #include "chrome/test/base/in_process_browser_test.h" #include "components/autofill/core/common/password_form.h" +#include "components/search_engines/template_url.h" #include "testing/gtest/include/gtest/gtest.h" // TODO(estade): some of these are disabled on mac. http://crbug.com/48007 diff --git a/chrome/browser/importer/ie_importer_browsertest_win.cc b/chrome/browser/importer/ie_importer_browsertest_win.cc index e0e62d8..b41153e 100644 --- a/chrome/browser/importer/ie_importer_browsertest_win.cc +++ b/chrome/browser/importer/ie_importer_browsertest_win.cc @@ -31,7 +31,6 @@ #include "chrome/browser/importer/external_process_importer_host.h" #include "chrome/browser/importer/importer_progress_observer.h" #include "chrome/browser/importer/importer_unittest_utils.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/importer/ie_importer_test_registry_overrider_win.h" @@ -44,6 +43,7 @@ #include "chrome/test/base/testing_profile.h" #include "components/autofill/core/common/password_form.h" #include "components/os_crypt/ie7_password_win.h" +#include "components/search_engines/template_url.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/browser/importer/in_process_importer_bridge.cc b/chrome/browser/importer/in_process_importer_bridge.cc index 320edf2..3162aee 100644 --- a/chrome/browser/importer/in_process_importer_bridge.cc +++ b/chrome/browser/importer/in_process_importer_bridge.cc @@ -8,12 +8,12 @@ #include "base/file_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/importer/external_process_importer_host.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_parser.h" #include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/common/importer/imported_bookmark_entry.h" #include "chrome/common/importer/imported_favicon_usage.h" #include "components/autofill/core/common/password_form.h" +#include "components/search_engines/template_url.h" #include "content/public/browser/browser_thread.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc index 5fa1777..90f7e0f 100644 --- a/chrome/browser/importer/profile_writer.cc +++ b/chrome/browser/importer/profile_writer.cc @@ -21,7 +21,6 @@ #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/password_manager/password_store_factory.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/webdata/web_data_service.h" @@ -30,6 +29,7 @@ #include "chrome/common/pref_names.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/password_manager/core/browser/password_store.h" +#include "components/search_engines/template_url.h" namespace { diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index 062e06a..e83e981 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -53,7 +53,6 @@ #include "chrome/browser/search/instant_service.h" #include "chrome/browser/search/instant_service_factory.h" #include "chrome/browser/search/search.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/translate/chrome_translate_client.h" @@ -88,6 +87,7 @@ #include "components/policy/core/common/policy_pref_names.h" #include "components/policy/core/common/policy_service.h" #include "components/policy/core/common/policy_service_impl.h" +#include "components/search_engines/template_url.h" #include "components/translate/core/browser/language_state.h" #include "components/translate/core/browser/translate_infobar_delegate.h" #include "content/public/browser/browser_child_process_host_iterator.h" diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc index 80b0972..7d928d8 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -42,7 +42,6 @@ #include "chrome/browser/renderer_context_menu/spellchecker_submenu_observer.h" #include "chrome/browser/renderer_context_menu/spelling_menu_observer.h" #include "chrome/browser/search/search.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/spellchecker/spellcheck_host_metrics.h" @@ -66,6 +65,7 @@ #include "chrome/common/url_constants.h" #include "components/google/core/browser/google_util.h" #include "components/metrics/proto/omnibox_input_type.pb.h" +#include "components/search_engines/template_url.h" #include "components/translate/core/browser/translate_download_manager.h" #include "components/translate/core/browser/translate_manager.h" #include "components/translate/core/browser/translate_prefs.h" diff --git a/chrome/browser/rlz/rlz.cc b/chrome/browser/rlz/rlz.cc index 0d1dd92..86b6c6d 100644 --- a/chrome/browser/rlz/rlz.cc +++ b/chrome/browser/rlz/rlz.cc @@ -22,13 +22,13 @@ #include "chrome/browser/google/google_brand.h" #include "chrome/browser/omnibox/omnibox_log.h" #include "chrome/browser/prefs/session_startup_pref.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/startup/startup_browser_creator.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "components/google/core/browser/google_util.h" +#include "components/search_engines/template_url.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/search/instant_unittest_base.cc b/chrome/browser/search/instant_unittest_base.cc index 996b301..d6c8a42 100644 --- a/chrome/browser/search/instant_unittest_base.cc +++ b/chrome/browser/search/instant_unittest_base.cc @@ -12,7 +12,6 @@ #include "chrome/browser/search/instant_service.h" #include "chrome/browser/search/instant_service_factory.h" #include "chrome/browser/search/search.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" @@ -22,6 +21,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "components/google/core/browser/google_pref_names.h" #include "components/google/core/browser/google_url_tracker.h" +#include "components/search_engines/template_url.h" #include "components/variations/entropy_provider.h" InstantUnitTestBase::InstantUnitTestBase() { diff --git a/chrome/browser/search/search_terms_tracker.cc b/chrome/browser/search/search_terms_tracker.cc index dcb78aa..172cfba 100644 --- a/chrome/browser/search/search_terms_tracker.cc +++ b/chrome/browser/search/search_terms_tracker.cc @@ -5,9 +5,9 @@ #include "chrome/browser/search/search_terms_tracker.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" +#include "components/search_engines/template_url.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/search_engines/default_search_policy_handler.cc b/chrome/browser/search_engines/default_search_policy_handler.cc index 9c6b410..2ef354b 100644 --- a/chrome/browser/search_engines/default_search_policy_handler.cc +++ b/chrome/browser/search_engines/default_search_policy_handler.cc @@ -9,11 +9,11 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "chrome/browser/search_engines/default_search_manager.h" -#include "chrome/browser/search_engines/template_url.h" #include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" #include "components/search_engines/search_engines_pref_names.h" #include "components/search_engines/search_terms_data.h" +#include "components/search_engines/template_url.h" #include "grit/components_strings.h" #include "policy/policy_constants.h" diff --git a/chrome/browser/search_engines/default_search_pref_migration_unittest.cc b/chrome/browser/search_engines/default_search_pref_migration_unittest.cc index da1a6ba..1053a2b 100644 --- a/chrome/browser/search_engines/default_search_pref_migration_unittest.cc +++ b/chrome/browser/search_engines/default_search_pref_migration_unittest.cc @@ -13,10 +13,10 @@ #include "base/prefs/pref_service.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/test/base/testing_pref_service_syncable.h" #include "chrome/test/base/testing_profile.h" +#include "components/search_engines/template_url.h" #include "testing/gtest/include/gtest/gtest.h" class DefaultSearchPrefMigrationTest : public testing::Test { diff --git a/chrome/browser/search_engines/search_host_to_urls_map.cc b/chrome/browser/search_engines/search_host_to_urls_map.cc index 2b32928..95b66fd 100644 --- a/chrome/browser/search_engines/search_host_to_urls_map.cc +++ b/chrome/browser/search_engines/search_host_to_urls_map.cc @@ -5,7 +5,7 @@ #include "chrome/browser/search_engines/search_host_to_urls_map.h" #include "base/memory/scoped_ptr.h" -#include "chrome/browser/search_engines/template_url.h" +#include "components/search_engines/template_url.h" SearchHostToURLsMap::SearchHostToURLsMap() : initialized_(false) { diff --git a/chrome/browser/search_engines/search_host_to_urls_map_unittest.cc b/chrome/browser/search_engines/search_host_to_urls_map_unittest.cc index e21f045..cbb0ce3 100644 --- a/chrome/browser/search_engines/search_host_to_urls_map_unittest.cc +++ b/chrome/browser/search_engines/search_host_to_urls_map_unittest.cc @@ -5,8 +5,8 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/search_engines/search_host_to_urls_map.h" -#include "chrome/browser/search_engines/template_url.h" #include "components/search_engines/search_terms_data.h" +#include "components/search_engines/template_url.h" #include "testing/gtest/include/gtest/gtest.h" typedef SearchHostToURLsMap::TemplateURLSet TemplateURLSet; diff --git a/chrome/browser/search_engines/search_provider_install_data.cc b/chrome/browser/search_engines/search_provider_install_data.cc index 2bbbcd0..737909a 100644 --- a/chrome/browser/search_engines/search_provider_install_data.cc +++ b/chrome/browser/search_engines/search_provider_install_data.cc @@ -16,12 +16,12 @@ #include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/google/google_url_tracker_factory.h" #include "chrome/browser/search_engines/search_host_to_urls_map.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" #include "chrome/browser/search_engines/util.h" #include "components/google/core/browser/google_url_tracker.h" +#include "components/search_engines/template_url.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_process_host_observer.h" diff --git a/chrome/browser/search_engines/search_provider_install_data_unittest.cc b/chrome/browser/search_engines/search_provider_install_data_unittest.cc index 2c4b7ca..45eeb19 100644 --- a/chrome/browser/search_engines/search_provider_install_data_unittest.cc +++ b/chrome/browser/search_engines/search_provider_install_data_unittest.cc @@ -12,13 +12,13 @@ #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/search_engines/search_provider_install_data.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_test_util.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service_syncable.h" #include "chrome/test/base/testing_profile.h" +#include "components/search_engines/template_url.h" #include "content/public/test/mock_render_process_host.h" #include "content/public/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/search_engines/template_url_fetcher.cc b/chrome/browser/search_engines/template_url_fetcher.cc index fe04245..10a0540 100644 --- a/chrome/browser/search_engines/template_url_fetcher.cc +++ b/chrome/browser/search_engines/template_url_fetcher.cc @@ -9,12 +9,12 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_fetcher_callbacks.h" #include "chrome/browser/search_engines/template_url_parser.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" +#include "components/search_engines/template_url.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/search_engines/template_url_fetcher_unittest.cc b/chrome/browser/search_engines/template_url_fetcher_unittest.cc index 8ec7e48..0387139 100644 --- a/chrome/browser/search_engines/template_url_fetcher_unittest.cc +++ b/chrome/browser/search_engines/template_url_fetcher_unittest.cc @@ -7,7 +7,6 @@ #include "base/message_loop/message_loop.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_fetcher.h" #include "chrome/browser/search_engines/template_url_fetcher_callbacks.h" #include "chrome/browser/search_engines/template_url_fetcher_factory.h" @@ -15,6 +14,7 @@ #include "chrome/browser/search_engines/template_url_service_test_util.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/base/testing_profile.h" +#include "components/search_engines/template_url.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" diff --git a/chrome/browser/search_engines/template_url_parser.cc b/chrome/browser/search_engines/template_url_parser.cc index f3481fd..8304a79 100644 --- a/chrome/browser/search_engines/template_url_parser.cc +++ b/chrome/browser/search_engines/template_url_parser.cc @@ -13,8 +13,8 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" +#include "components/search_engines/template_url.h" #include "libxml/parser.h" #include "libxml/xmlwriter.h" #include "ui/gfx/favicon_size.h" diff --git a/chrome/browser/search_engines/template_url_parser_unittest.cc b/chrome/browser/search_engines/template_url_parser_unittest.cc index 67dda32..e59d1db 100644 --- a/chrome/browser/search_engines/template_url_parser_unittest.cc +++ b/chrome/browser/search_engines/template_url_parser_unittest.cc @@ -6,10 +6,10 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_parser.h" #include "chrome/common/chrome_paths.h" #include "components/search_engines/search_terms_data.h" +#include "components/search_engines/template_url.h" #include "testing/gtest/include/gtest/gtest.h" using base::ASCIIToUTF16; diff --git a/chrome/browser/search_engines/template_url_prepopulate_data.cc b/chrome/browser/search_engines/template_url_prepopulate_data.cc index fe2af17..b960eeb 100644 --- a/chrome/browser/search_engines/template_url_prepopulate_data.cc +++ b/chrome/browser/search_engines/template_url_prepopulate_data.cc @@ -15,11 +15,11 @@ #include "base/strings/string_piece.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/common/pref_names.h" #include "components/google/core/browser/google_util.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/search_engines/prepopulated_engines.h" +#include "components/search_engines/template_url.h" #include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc b/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc index e0411f3..6f3d8a6 100644 --- a/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc +++ b/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc @@ -6,7 +6,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_vector.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/common/chrome_switches.h" @@ -15,6 +14,7 @@ #include "components/pref_registry/testing_pref_service_syncable.h" #include "components/search_engines/prepopulated_engines.h" #include "components/search_engines/search_terms_data.h" +#include "components/search_engines/template_url.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc index f3b5486..5892c91 100644 --- a/chrome/browser/search_engines/template_url_service.cc +++ b/chrome/browser/search_engines/template_url_service.cc @@ -30,7 +30,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/rlz/rlz.h" #include "chrome/browser/search_engines/search_host_to_urls_map.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/browser/search_engines/template_url_service_observer.h" #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" @@ -38,6 +37,7 @@ #include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/env_vars.h" #include "components/search_engines/search_engines_pref_names.h" +#include "components/search_engines/template_url.h" #include "components/url_fixer/url_fixer.h" #include "content/public/browser/notification_service.h" #include "extensions/common/constants.h" diff --git a/chrome/browser/search_engines/template_url_service_android.cc b/chrome/browser/search_engines/template_url_service_android.cc index a3de972..f4bd60d 100644 --- a/chrome/browser/search_engines/template_url_service_android.cc +++ b/chrome/browser/search_engines/template_url_service_android.cc @@ -10,12 +10,12 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/search_engines/util.h" #include "components/google/core/browser/google_util.h" +#include "components/search_engines/template_url.h" #include "jni/TemplateUrlService_jni.h" #include "net/base/url_util.h" diff --git a/chrome/browser/search_engines/template_url_service_sync_unittest.cc b/chrome/browser/search_engines/template_url_service_sync_unittest.cc index 9c83664..fb9479e 100644 --- a/chrome/browser/search_engines/template_url_service_sync_unittest.cc +++ b/chrome/browser/search_engines/template_url_service_sync_unittest.cc @@ -8,7 +8,6 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" @@ -17,6 +16,7 @@ #include "chrome/test/base/testing_pref_service_syncable.h" #include "chrome/test/base/testing_profile.h" #include "components/search_engines/search_engines_pref_names.h" +#include "components/search_engines/template_url.h" #include "extensions/common/constants.h" #include "net/base/net_util.h" #include "sync/api/sync_change_processor_wrapper_for_test.h" diff --git a/chrome/browser/search_engines/template_url_service_unittest.cc b/chrome/browser/search_engines/template_url_service_unittest.cc index b3c2109..802048a 100644 --- a/chrome/browser/search_engines/template_url_service_unittest.cc +++ b/chrome/browser/search_engines/template_url_service_unittest.cc @@ -19,13 +19,13 @@ #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/search_engines/search_host_to_urls_map.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_test_util.h" #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" #include "chrome/browser/webdata/web_data_service_factory.h" #include "chrome/test/base/testing_profile.h" +#include "components/search_engines/template_url.h" #include "components/webdata/common/web_database.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/search_engines/template_url_service_util_unittest.cc b/chrome/browser/search_engines/template_url_service_util_unittest.cc index 0a5ee33..caed3db 100644 --- a/chrome/browser/search_engines/template_url_service_util_unittest.cc +++ b/chrome/browser/search_engines/template_url_service_util_unittest.cc @@ -5,10 +5,10 @@ #include "base/memory/scoped_vector.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/util.h" #include "components/search_engines/search_terms_data.h" +#include "components/search_engines/template_url.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/browser/search_engines/template_url_unittest.cc b/chrome/browser/search_engines/template_url_unittest.cc index 4d71d0f..2c3d38b 100644 --- a/chrome/browser/search_engines/template_url_unittest.cc +++ b/chrome/browser/search_engines/template_url_unittest.cc @@ -7,11 +7,11 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/search_engines/template_url.h" #include "components/metrics/proto/omnibox_event.pb.h" #include "components/metrics/proto/omnibox_input_type.pb.h" #include "components/search_engines/search_engines_switches.h" #include "components/search_engines/search_terms_data.h" +#include "components/search_engines/template_url.h" #include "testing/gtest/include/gtest/gtest.h" using base::ASCIIToUTF16; diff --git a/chrome/browser/search_engines/util.cc b/chrome/browser/search_engines/util.cc index 791f0e3..873a609 100644 --- a/chrome/browser/search_engines/util.cc +++ b/chrome/browser/search_engines/util.cc @@ -14,10 +14,10 @@ #include "base/prefs/pref_service.h" #include "base/time/time.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" +#include "components/search_engines/template_url.h" #include "content/public/browser/browser_thread.h" using content::BrowserThread; diff --git a/chrome/browser/sync/test/integration/search_engines_helper.cc b/chrome/browser/sync/test/integration/search_engines_helper.cc index 9a4fb3c..69a6705 100644 --- a/chrome/browser/sync/test/integration/search_engines_helper.cc +++ b/chrome/browser/sync/test/integration/search_engines_helper.cc @@ -11,12 +11,12 @@ #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" #include "chrome/browser/sync/test/integration/sync_test.h" +#include "components/search_engines/template_url.h" using sync_datatype_helper::test; diff --git a/chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc b/chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc index f66149e..b634531 100644 --- a/chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc @@ -3,7 +3,6 @@ // found in the LICENSE file. #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" @@ -11,6 +10,7 @@ #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" #include "chrome/browser/sync/test/integration/sync_test.h" +#include "components/search_engines/template_url.h" using base::ASCIIToUTF16; using sync_integration_test_util::AwaitCommitActivityCompletion; diff --git a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm index ec60b8b..20a9635 100644 --- a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm @@ -9,8 +9,8 @@ #import "base/mac/mac_util.h" #include "base/strings/string16.h" #include "base/strings/sys_string_conversions.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" +#include "components/search_engines/template_url.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" diff --git a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm index ca59034..6ac9b95 100644 --- a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm @@ -5,10 +5,10 @@ #import "chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" #include "chrome/test/base/testing_profile.h" +#include "components/search_engines/template_url.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm index 34c6f7f..e816d78 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm @@ -27,7 +27,6 @@ #include "chrome/browser/search/instant_service.h" #include "chrome/browser/search/instant_service_factory.h" #include "chrome/browser/search/search.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/translate/chrome_translate_client.h" @@ -62,6 +61,7 @@ #include "chrome/browser/ui/zoom/zoom_controller.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "components/search_engines/template_url.h" #include "components/translate/core/browser/language_state.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc index 2eae929..08e40e4 100644 --- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc +++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc @@ -37,7 +37,6 @@ #include "chrome/browser/prerender/prerender_manager_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search/search.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" @@ -56,8 +55,9 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "components/metrics/proto/omnibox_event.pb.h" #include "components/google/core/browser/google_url_tracker.h" +#include "components/metrics/proto/omnibox_event.pb.h" +#include "components/search_engines/template_url.h" #include "components/url_fixer/url_fixer.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" diff --git a/chrome/browser/ui/omnibox/omnibox_popup_model.cc b/chrome/browser/ui/omnibox/omnibox_popup_model.cc index cc0b7fb..e237c28 100644 --- a/chrome/browser/ui/omnibox/omnibox_popup_model.cc +++ b/chrome/browser/ui/omnibox/omnibox_popup_model.cc @@ -11,11 +11,11 @@ #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/extensions/api/omnibox/omnibox_api.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/omnibox/omnibox_popup_model_observer.h" #include "chrome/browser/ui/omnibox/omnibox_popup_view.h" +#include "components/search_engines/template_url.h" #include "third_party/icu/source/common/unicode/ubidi.h" #include "ui/gfx/image/image.h" #include "ui/gfx/rect.h" diff --git a/chrome/browser/ui/omnibox/omnibox_view.cc b/chrome/browser/ui/omnibox/omnibox_view.cc index a7467aa..0d36609 100644 --- a/chrome/browser/ui/omnibox/omnibox_view.cc +++ b/chrome/browser/ui/omnibox/omnibox_view.cc @@ -12,11 +12,11 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/search/search.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h" #include "chrome/browser/ui/toolbar/toolbar_model.h" +#include "components/search_engines/template_url.h" #include "grit/generated_resources.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc index 68348c6..e7967c7 100644 --- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc +++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc @@ -18,7 +18,6 @@ #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/browser.h" @@ -38,6 +37,7 @@ #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_utils.h" #include "components/bookmarks/test/bookmark_test_helpers.h" +#include "components/search_engines/template_url.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" #include "net/dns/mock_host_resolver.h" diff --git a/chrome/browser/ui/search_engines/edit_search_engine_controller.cc b/chrome/browser/ui/search_engines/edit_search_engine_controller.cc index 9081217..26a2d40 100644 --- a/chrome/browser/ui/search_engines/edit_search_engine_controller.cc +++ b/chrome/browser/ui/search_engines/edit_search_engine_controller.cc @@ -7,9 +7,9 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" +#include "components/search_engines/template_url.h" #include "components/url_fixer/url_fixer.h" #include "content/public/browser/user_metrics.h" #include "url/gurl.h" diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller.cc b/chrome/browser/ui/search_engines/keyword_editor_controller.cc index da40c17..36c1e4f 100644 --- a/chrome/browser/ui/search_engines/keyword_editor_controller.cc +++ b/chrome/browser/ui/search_engines/keyword_editor_controller.cc @@ -7,11 +7,11 @@ #include "base/prefs/pref_registry_simple.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/search_engines/template_url_table_model.h" #include "chrome/common/pref_names.h" +#include "components/search_engines/template_url.h" #include "content/public/browser/user_metrics.h" using base::UserMetricsAction; diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc b/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc index 15986cd..8f7c98e 100644 --- a/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc +++ b/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc @@ -6,12 +6,12 @@ #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_test_util.h" #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" #include "chrome/browser/ui/search_engines/template_url_table_model.h" #include "chrome/test/base/testing_profile.h" +#include "components/search_engines/template_url.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/models/table_model_observer.h" diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc index 916befe..4e9581a 100644 --- a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc +++ b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_fetcher.h" #include "chrome/browser/search_engines/template_url_fetcher_factory.h" #include "chrome/browser/search_engines/template_url_service.h" @@ -13,6 +12,7 @@ #include "chrome/browser/ui/search_engines/template_url_fetcher_ui_callbacks.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" +#include "components/search_engines/template_url.h" #include "content/public/browser/favicon_status.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.cc b/chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.cc index 91b976c..504d385 100644 --- a/chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.cc +++ b/chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" -#include "chrome/browser/search_engines/template_url.h" +#include "components/search_engines/template_url.h" SearchEngineTabHelperDelegate::~SearchEngineTabHelperDelegate() { } diff --git a/chrome/browser/ui/search_engines/template_url_fetcher_ui_callbacks.cc b/chrome/browser/ui/search_engines/template_url_fetcher_ui_callbacks.cc index c2dcf05..61783d1 100644 --- a/chrome/browser/ui/search_engines/template_url_fetcher_ui_callbacks.cc +++ b/chrome/browser/ui/search_engines/template_url_fetcher_ui_callbacks.cc @@ -6,9 +6,9 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h" #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" +#include "components/search_engines/template_url.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/search_engines/template_url_table_model.cc b/chrome/browser/ui/search_engines/template_url_table_model.cc index 0167f1d..4167e8e 100644 --- a/chrome/browser/ui/search_engines/template_url_table_model.cc +++ b/chrome/browser/ui/search_engines/template_url_table_model.cc @@ -13,9 +13,9 @@ #include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "components/favicon_base/favicon_types.h" +#include "components/search_engines/template_url.h" #include "grit/generated_resources.h" #include "grit/ui_resources.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/ui/tab_contents/core_tab_helper.cc b/chrome/browser/ui/tab_contents/core_tab_helper.cc index 0e78ad5..83b4397 100644 --- a/chrome/browser/ui/tab_contents/core_tab_helper.cc +++ b/chrome/browser/ui/tab_contents/core_tab_helper.cc @@ -12,7 +12,6 @@ #include "base/strings/stringprintf.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_host/web_cache_manager.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/browser.h" @@ -20,6 +19,7 @@ #include "chrome/browser/ui/browser_finder.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/render_messages.h" +#include "components/search_engines/template_url.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.cc b/chrome/browser/ui/views/edit_search_engine_dialog.cc index de03568..1dd6700 100644 --- a/chrome/browser/ui/views/edit_search_engine_dialog.cc +++ b/chrome/browser/ui/views/edit_search_engine_dialog.cc @@ -8,10 +8,10 @@ #include "base/i18n/rtl.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h" #include "chrome/browser/ui/views/constrained_window_views.h" +#include "components/search_engines/template_url.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" diff --git a/chrome/browser/ui/views/first_run_bubble_unittest.cc b/chrome/browser/ui/views/first_run_bubble_unittest.cc index 327b933..66eb471 100644 --- a/chrome/browser/ui/views/first_run_bubble_unittest.cc +++ b/chrome/browser/ui/views/first_run_bubble_unittest.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/views/first_run_bubble.h" #include "chrome/test/base/testing_profile.h" +#include "components/search_engines/template_url.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/views/test/views_test_base.h" #include "ui/views/view.h" diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index 26c959c..6869712 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -25,7 +25,6 @@ #include "chrome/browser/search/instant_service.h" #include "chrome/browser/search/instant_service_factory.h" #include "chrome/browser/search/search.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/translate/chrome_translate_client.h" @@ -64,6 +63,7 @@ #include "chrome/browser/ui/zoom/zoom_controller.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "components/search_engines/template_url.h" #include "components/translate/core/browser/language_state.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_widget_host_view.h" diff --git a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc index bb7c5cd..149b7ce 100644 --- a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc +++ b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc @@ -21,8 +21,8 @@ #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/history/url_database.h" #include "chrome/browser/search/search.h" -#include "chrome/browser/search_engines/template_url.h" #include "components/metrics/proto/omnibox_event.pb.h" +#include "components/search_engines/template_url.h" #include "content/public/browser/web_ui.h" #include "mojo/common/common_type_converters.h" diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index ba51c80..c11b84b 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -47,7 +47,6 @@ #include "chrome/browser/search/hotword_service.h" #include "chrome/browser/search/hotword_service_factory.h" #include "chrome/browser/search/search.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/signin/easy_unlock.h" @@ -70,6 +69,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chromeos/chromeos_switches.h" +#include "components/search_engines/template_url.h" #include "components/signin/core/browser/signin_manager.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_manager.h" diff --git a/chrome/browser/ui/webui/options/search_engine_manager_handler.cc b/chrome/browser/ui/webui/options/search_engine_manager_handler.cc index 207b2c7..b25e3d0 100644 --- a/chrome/browser/ui/webui/options/search_engine_manager_handler.cc +++ b/chrome/browser/ui/webui/options/search_engine_manager_handler.cc @@ -10,12 +10,12 @@ #include "base/values.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" #include "chrome/browser/ui/search_engines/template_url_table_model.h" #include "chrome/common/url_constants.h" +#include "components/search_engines/template_url.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_ui.h" #include "extensions/browser/extension_registry.h" diff --git a/chrome/browser/webdata/keyword_table.cc b/chrome/browser/webdata/keyword_table.cc index b98e59b..34ad5469 100644 --- a/chrome/browser/webdata/keyword_table.cc +++ b/chrome/browser/webdata/keyword_table.cc @@ -16,8 +16,8 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/history/history_database.h" -#include "chrome/browser/search_engines/template_url.h" #include "components/search_engines/search_terms_data.h" +#include "components/search_engines/template_url.h" #include "components/webdata/common/web_database.h" #include "sql/statement.h" #include "sql/transaction.h" diff --git a/chrome/browser/webdata/web_data_service.cc b/chrome/browser/webdata/web_data_service.cc index 2e829f1..4ed9c9b 100644 --- a/chrome/browser/webdata/web_data_service.cc +++ b/chrome/browser/webdata/web_data_service.cc @@ -7,11 +7,11 @@ #include "base/bind.h" #include "base/stl_util.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/webdata/keyword_table.h" #include "chrome/browser/webdata/logins_table.h" #include "chrome/browser/webdata/web_apps_table.h" #include "chrome/browser/webdata/web_intents_table.h" +#include "components/search_engines/template_url.h" #include "components/signin/core/browser/webdata/token_service_table.h" #include "components/webdata/common/web_database_service.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h index 1ea36a4..d63e810b 100644 --- a/chrome/browser/webdata/web_data_service.h +++ b/chrome/browser/webdata/web_data_service.h @@ -18,8 +18,8 @@ #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/sequenced_task_runner_helpers.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/webdata/keyword_table.h" +#include "components/search_engines/template_url.h" #include "components/search_engines/template_url_id.h" #include "components/webdata/common/web_data_results.h" #include "components/webdata/common/web_data_service_base.h" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 4ff6d5a..04c662e 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -1634,8 +1634,6 @@ 'browser/search_engines/search_provider_install_data.h', 'browser/search_engines/search_provider_install_state_message_filter.cc', 'browser/search_engines/search_provider_install_state_message_filter.h', - 'browser/search_engines/template_url.cc', - 'browser/search_engines/template_url.h', 'browser/search_engines/template_url_fetcher.cc', 'browser/search_engines/template_url_fetcher.h', 'browser/search_engines/template_url_fetcher_callbacks.h', diff --git a/components/search_engines.gypi b/components/search_engines.gypi index 4226f94..eda61f4 100644 --- a/components/search_engines.gypi +++ b/components/search_engines.gypi @@ -9,7 +9,12 @@ 'type': 'static_library', 'dependencies': [ '../base/base.gyp:base', + '../google_apis/google_apis.gyp:google_apis', + '../net/net.gyp:net', + '../ui/gfx/gfx.gyp:gfx_geometry', '../url/url.gyp:url_lib', + 'component_metrics_proto', + 'google_core_browser', 'search_engines/prepopulated_engines.gyp:prepopulated_engines', ], 'include_dirs': [ @@ -23,6 +28,8 @@ 'search_engines/search_engines_switches.h', 'search_engines/search_terms_data.cc', 'search_engines/search_terms_data.h', + 'search_engines/template_url.cc', + 'search_engines/template_url.h', 'search_engines/template_url_data.cc', 'search_engines/template_url_data.h', 'search_engines/template_url_id.h', diff --git a/components/search_engines/DEPS b/components/search_engines/DEPS index 6e779c9..fe61ec7 100644 --- a/components/search_engines/DEPS +++ b/components/search_engines/DEPS @@ -1,4 +1,8 @@ include_rules = [ "+components/google/core", "+components/history/core", + "+components/metrics/proto", + "+google_apis", + "+net", + "+ui/gfx/geometry", ] diff --git a/chrome/browser/search_engines/template_url.cc b/components/search_engines/template_url.cc index 14b8366..ed63f1a 100644 --- a/chrome/browser/search_engines/template_url.cc +++ b/components/search_engines/template_url.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/search_engines/template_url.h" +#include "components/search_engines/template_url.h" #include <string> #include <vector> @@ -24,15 +24,18 @@ #include "components/metrics/proto/omnibox_input_type.pb.h" #include "components/search_engines/search_engines_switches.h" #include "components/search_engines/search_terms_data.h" -#include "extensions/common/constants.h" #include "google_apis/google_api_keys.h" #include "net/base/escape.h" #include "net/base/mime_util.h" #include "net/base/net_util.h" -#include "ui/base/l10n/l10n_util.h" namespace { +// This constant is defined here as a workaround while we cannot depend on +// src/extensions. +// TODO(hashimoto): Remove this. crbug.com/388040 +const char kExtensionScheme[] = "chrome-extension"; + // The TemplateURLRef has any number of terms that need to be replaced. Each of // the terms is enclosed in braces. If the character preceeding the final // brace is a ?, it indicates the term is optional and can be replaced with @@ -1249,7 +1252,7 @@ bool TemplateURL::HasSameKeywordAs( TemplateURL::Type TemplateURL::GetType() const { if (extension_info_) return NORMAL_CONTROLLED_BY_EXTENSION; - return GURL(data_.url()).SchemeIs(extensions::kExtensionScheme) ? + return GURL(data_.url()).SchemeIs(kExtensionScheme) ? OMNIBOX_API_EXTENSION : NORMAL; } diff --git a/chrome/browser/search_engines/template_url.h b/components/search_engines/template_url.h index c32ba93..b0912b7 100644 --- a/chrome/browser/search_engines/template_url.h +++ b/components/search_engines/template_url.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_ -#define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_ +#ifndef COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_H_ +#define COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_H_ #include <string> #include <utility> @@ -16,7 +16,7 @@ #include "components/metrics/proto/omnibox_input_type.pb.h" #include "components/search_engines/template_url_data.h" #include "components/search_engines/template_url_id.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "url/gurl.h" #include "url/url_parse.h" @@ -701,4 +701,4 @@ class TemplateURL { DISALLOW_COPY_AND_ASSIGN(TemplateURL); }; -#endif // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_ +#endif // COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_H_ |