diff options
135 files changed, 205 insertions, 205 deletions
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java b/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java index 0576c2a..efca1cf 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java @@ -18,7 +18,7 @@ import java.util.List; * Only usable from the UI thread as it's primary purpose is for supporting the Android * preferences UI. * - * See components/search_engines/template_url_service.h for more details. + * See chrome/browser/search_engines/template_url_service.h for more details. */ public class TemplateUrlService { diff --git a/chrome/browser/android/logo_service.cc b/chrome/browser/android/logo_service.cc index fec67fd..681fbde 100644 --- a/chrome/browser/android/logo_service.cc +++ b/chrome/browser/android/logo_service.cc @@ -8,11 +8,11 @@ #include "chrome/browser/google/google_profile_helper.h" #include "chrome/browser/image_decoder.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "components/google/core/browser/google_url_tracker.h" #include "components/google/core/browser/google_util.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" -#include "components/search_engines/template_url_service.h" #include "components/search_provider_logos/google_logo_api.h" #include "content/public/browser/browser_thread.h" #include "net/url_request/url_request_context_getter.h" diff --git a/chrome/browser/android/omnibox/autocomplete_controller_android.cc b/chrome/browser/android/omnibox/autocomplete_controller_android.cc index 728ef53..8bb2fc6 100644 --- a/chrome/browser/android/omnibox/autocomplete_controller_android.cc +++ b/chrome/browser/android/omnibox/autocomplete_controller_android.cc @@ -26,6 +26,7 @@ #include "chrome/browser/profiles/profile_android.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/search/search.h" +#include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/sessions/session_id.h" #include "chrome/browser/ui/search/instant_search_prerenderer.h" @@ -37,7 +38,6 @@ #include "components/autocomplete/autocomplete_input.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/search_engines/template_url_service.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/android/provider/chrome_browser_provider.cc b/chrome/browser/android/provider/chrome_browser_provider.cc index c72fec5..2e77c8e 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_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 "components/search_engines/template_url_service.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 ff4921d..062b9c1 100644 --- a/chrome/browser/autocomplete/autocomplete_controller.cc +++ b/chrome/browser/autocomplete/autocomplete_controller.cc @@ -24,8 +24,8 @@ #include "chrome/browser/autocomplete/zero_suggest_provider.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/omnibox/omnibox_field_trial.h" +#include "chrome/browser/search_engines/template_url_service.h" #include "components/search_engines/template_url.h" -#include "components/search_engines/template_url_service.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 c20cf94..9a3d13c 100644 --- a/chrome/browser/autocomplete/autocomplete_match.cc +++ b/chrome/browser/autocomplete/autocomplete_match.cc @@ -12,8 +12,8 @@ #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_service.h" #include "components/search_engines/template_url.h" -#include "components/search_engines/template_url_service.h" #include "grit/theme_resources.h" namespace { diff --git a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc index 35daf6d..14a03db 100644 --- a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc +++ b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc @@ -19,6 +19,7 @@ #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_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" @@ -26,7 +27,6 @@ #include "components/metrics/proto/omnibox_event.pb.h" #include "components/search_engines/search_engines_switches.h" #include "components/search_engines/template_url.h" -#include "components/search_engines/template_url_service.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/autocomplete_result_unittest.cc b/chrome/browser/autocomplete/autocomplete_result_unittest.cc index 01dd9c8..312a890 100644 --- a/chrome/browser/autocomplete/autocomplete_result_unittest.cc +++ b/chrome/browser/autocomplete/autocomplete_result_unittest.cc @@ -15,13 +15,13 @@ #include "chrome/browser/autocomplete/autocomplete_provider.h" #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" #include "chrome/browser/omnibox/omnibox_field_trial.h" +#include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_test_util.h" #include "chrome/common/autocomplete_match_type.h" #include "chrome/test/base/testing_profile.h" #include "components/autocomplete/autocomplete_input.h" #include "components/metrics/proto/omnibox_event.pb.h" #include "components/search_engines/template_url_prepopulate_data.h" -#include "components/search_engines/template_url_service.h" #include "components/variations/entropy_provider.h" #include "components/variations/variations_associated_data.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/autocomplete/base_search_provider.cc b/chrome/browser/autocomplete/base_search_provider.cc index 5990229..22eb27f 100644 --- a/chrome/browser/autocomplete/base_search_provider.cc +++ b/chrome/browser/autocomplete/base_search_provider.cc @@ -23,6 +23,7 @@ #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_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/sync/profile_sync_service.h" @@ -33,7 +34,6 @@ #include "components/metrics/proto/omnibox_input_type.pb.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_prepopulate_data.h" -#include "components/search_engines/template_url_service.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 97721a6..336a9c4 100644 --- a/chrome/browser/autocomplete/history_quick_provider.cc +++ b/chrome/browser/autocomplete/history_quick_provider.cc @@ -28,6 +28,7 @@ #include "chrome/browser/history/scored_history_match.h" #include "chrome/browser/omnibox/omnibox_field_trial.h" #include "chrome/browser/profiles/profile.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" #include "chrome/common/chrome_switches.h" @@ -35,7 +36,6 @@ #include "chrome/common/url_constants.h" #include "components/metrics/proto/omnibox_input_type.pb.h" #include "components/search_engines/template_url.h" -#include "components/search_engines/template_url_service.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 9f78f2a..748afdd 100644 --- a/chrome/browser/autocomplete/history_quick_provider_unittest.cc +++ b/chrome/browser/autocomplete/history_quick_provider_unittest.cc @@ -30,6 +30,7 @@ #include "chrome/browser/history/in_memory_url_index.h" #include "chrome/browser/history/url_index_private_data.h" #include "chrome/browser/search_engines/chrome_template_url_service_client.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_browser_process.h" @@ -39,7 +40,6 @@ #include "components/metrics/proto/omnibox_event.pb.h" #include "components/search_engines/search_terms_data.h" #include "components/search_engines/template_url.h" -#include "components/search_engines/template_url_service.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.cc b/chrome/browser/autocomplete/history_url_provider.cc index 971d115..23439b4 100644 --- a/chrome/browser/autocomplete/history_url_provider.cc +++ b/chrome/browser/autocomplete/history_url_provider.cc @@ -28,6 +28,7 @@ #include "chrome/browser/history/scored_history_match.h" #include "chrome/browser/omnibox/omnibox_field_trial.h" #include "chrome/browser/profiles/profile.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/common/chrome_switches.h" @@ -36,7 +37,6 @@ #include "components/autocomplete/url_prefix.h" #include "components/bookmarks/browser/bookmark_utils.h" #include "components/metrics/proto/omnibox_input_type.pb.h" -#include "components/search_engines/template_url_service.h" #include "components/url_fixer/url_fixer.h" #include "content/public/browser/browser_thread.h" #include "net/base/net_util.h" diff --git a/chrome/browser/autocomplete/history_url_provider_unittest.cc b/chrome/browser/autocomplete/history_url_provider_unittest.cc index 33f4bf3..ceeb182 100644 --- a/chrome/browser/autocomplete/history_url_provider_unittest.cc +++ b/chrome/browser/autocomplete/history_url_provider_unittest.cc @@ -21,6 +21,7 @@ #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/search_engines/chrome_template_url_service_client.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_browser_process.h" @@ -30,7 +31,6 @@ #include "components/metrics/proto/omnibox_input_type.pb.h" #include "components/search_engines/search_terms_data.h" #include "components/search_engines/template_url.h" -#include "components/search_engines/template_url_service.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 32237c0..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_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 "components/search_engines/template_url_service.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 fb3bc41..65bf040 100644 --- a/chrome/browser/autocomplete/keyword_provider_unittest.cc +++ b/chrome/browser/autocomplete/keyword_provider_unittest.cc @@ -8,11 +8,11 @@ #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" #include "chrome/browser/autocomplete/keyword_provider.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 "components/search_engines/template_url_service.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc index ed7f2f0..df2b04a 100644 --- a/chrome/browser/autocomplete/search_provider.cc +++ b/chrome/browser/autocomplete/search_provider.cc @@ -31,6 +31,7 @@ #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_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/search/instant_controller.h" #include "chrome/common/chrome_switches.h" @@ -41,7 +42,6 @@ #include "components/history/core/browser/keyword_search_term.h" #include "components/metrics/proto/omnibox_input_type.pb.h" #include "components/search_engines/template_url_prepopulate_data.h" -#include "components/search_engines/template_url_service.h" #include "content/public/browser/user_metrics.h" #include "grit/generated_resources.h" #include "net/base/escape.h" diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc index ac4e190..e68286b 100644 --- a/chrome/browser/autocomplete/search_provider_unittest.cc +++ b/chrome/browser/autocomplete/search_provider_unittest.cc @@ -26,6 +26,7 @@ #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_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/sync/profile_sync_service.h" @@ -40,7 +41,6 @@ #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/search_engines/template_url_service.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/shortcuts_backend_unittest.cc b/chrome/browser/autocomplete/shortcuts_backend_unittest.cc index 8d7a939..a35e75b 100644 --- a/chrome/browser/autocomplete/shortcuts_backend_unittest.cc +++ b/chrome/browser/autocomplete/shortcuts_backend_unittest.cc @@ -11,10 +11,10 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/autocomplete/shortcuts_backend_factory.h" #include "chrome/browser/history/shortcuts_database.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_profile.h" #include "chrome/test/base/ui_test_utils.h" -#include "components/search_engines/template_url_service.h" #include "content/public/test/test_browser_thread.h" #include "sql/statement.h" diff --git a/chrome/browser/autocomplete/zero_suggest_provider.cc b/chrome/browser/autocomplete/zero_suggest_provider.cc index e8d08c3..fafc004 100644 --- a/chrome/browser/autocomplete/zero_suggest_provider.cc +++ b/chrome/browser/autocomplete/zero_suggest_provider.cc @@ -25,13 +25,13 @@ #include "chrome/browser/metrics/variations/variations_http_header_provider.h" #include "chrome/browser/omnibox/omnibox_field_trial.h" #include "chrome/browser/profiles/profile.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/common/url_constants.h" #include "components/autocomplete/autocomplete_input.h" #include "components/metrics/proto/omnibox_input_type.pb.h" #include "components/pref_registry/pref_registry_syncable.h" -#include "components/search_engines/template_url_service.h" #include "content/public/browser/user_metrics.h" #include "net/base/escape.h" #include "net/base/load_flags.h" diff --git a/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc b/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc index 081a732..0cc1abc 100644 --- a/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc +++ b/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc @@ -12,12 +12,12 @@ #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" #include "chrome/browser/omnibox/omnibox_field_trial.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/search_engines/template_url_service.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/browsing_data/browsing_data_remover.cc b/chrome/browser/browsing_data/browsing_data_remover.cc index d9f4802..007cb92 100644 --- a/chrome/browser/browsing_data/browsing_data_remover.cc +++ b/chrome/browser/browsing_data/browsing_data_remover.cc @@ -37,6 +37,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_host/web_cache_manager.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" +#include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sessions/session_service_factory.h" @@ -45,13 +46,12 @@ #include "chrome/browser/webdata/web_data_service_factory.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "components/domain_reliability/service.h" +#include "components/password_manager/core/browser/password_store.h" #include "components/autofill/core/browser/personal_data_manager.h" #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" -#include "components/domain_reliability/service.h" #include "components/nacl/browser/nacl_browser.h" #include "components/nacl/browser/pnacl_host.h" -#include "components/password_manager/core/browser/password_store.h" -#include "components/search_engines/template_url_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/dom_storage_context.h" #include "content/public/browser/download_manager.h" diff --git a/chrome/browser/browsing_data/browsing_data_remover.h b/chrome/browser/browsing_data/browsing_data_remover.h index 01b46f2..66de0011 100644 --- a/chrome/browser/browsing_data/browsing_data_remover.h +++ b/chrome/browser/browsing_data/browsing_data_remover.h @@ -16,7 +16,7 @@ #include "base/task/cancelable_task_tracker.h" #include "base/time/time.h" #include "chrome/browser/pepper_flash_settings_manager.h" -#include "components/search_engines/template_url_service.h" +#include "chrome/browser/search_engines/template_url_service.h" #if defined(OS_CHROMEOS) #include "chromeos/dbus/dbus_method_call_status.h" #endif diff --git a/chrome/browser/chrome_content_browser_client_unittest.cc b/chrome/browser/chrome_content_browser_client_unittest.cc index ccd7f05..8a0268f 100644 --- a/chrome/browser/chrome_content_browser_client_unittest.cc +++ b/chrome/browser/chrome_content_browser_client_unittest.cc @@ -6,12 +6,12 @@ #include "base/command_line.h" #include "base/metrics/field_trial.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" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "components/search_engines/template_url_service.h" #include "components/variations/entropy_provider.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chrome/browser/extensions/api/omnibox/omnibox_api.cc index 4f573d5..e2e39db 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_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 "components/search_engines/template_url_service.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/omnibox/omnibox_api.h b/chrome/browser/extensions/api/omnibox/omnibox_api.h index 674dd46..15d4926 100644 --- a/chrome/browser/extensions/api/omnibox/omnibox_api.h +++ b/chrome/browser/extensions/api/omnibox/omnibox_api.h @@ -14,8 +14,8 @@ #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/extensions/chrome_extension_function.h" #include "chrome/browser/extensions/extension_icon_manager.h" +#include "chrome/browser/search_engines/template_url_service.h" #include "chrome/common/extensions/api/omnibox.h" -#include "components/search_engines/template_url_service.h" #include "extensions/browser/browser_context_keyed_api_factory.h" #include "extensions/browser/extension_registry_observer.h" #include "ui/base/window_open_disposition.h" diff --git a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h index e85da68..ccb05eee 100644 --- a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h +++ b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h @@ -9,7 +9,7 @@ #include <string> #include "base/scoped_observer.h" -#include "components/search_engines/template_url_service.h" +#include "chrome/browser/search_engines/template_url_service.h" #include "extensions/browser/browser_context_keyed_api_factory.h" #include "extensions/browser/extension_registry_observer.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 d1ffe87..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_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" -#include "components/search_engines/template_url_service.h" namespace { diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc index 8554177..eee0b03 100644 --- a/chrome/browser/first_run/first_run.cc +++ b/chrome/browser/first_run/first_run.cc @@ -33,6 +33,7 @@ #include "chrome/browser/prefs/chrome_pref_service_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profiles_state.h" +#include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/shell_integration.h" #include "chrome/browser/signin/signin_manager_factory.h" @@ -53,7 +54,6 @@ #include "chrome/installer/util/master_preferences_constants.h" #include "chrome/installer/util/util_constants.h" #include "components/pref_registry/pref_registry_syncable.h" -#include "components/search_engines/template_url_service.h" #include "components/signin/core/browser/signin_manager.h" #include "components/signin/core/browser/signin_tracker.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/importer/external_process_importer_host.cc b/chrome/browser/importer/external_process_importer_host.cc index 5c9fac2..73ceef3 100644 --- a/chrome/browser/importer/external_process_importer_host.cc +++ b/chrome/browser/importer/external_process_importer_host.cc @@ -12,9 +12,9 @@ #include "chrome/browser/importer/importer_lock_dialog.h" #include "chrome/browser/importer/importer_progress_observer.h" #include "chrome/browser/importer/in_process_importer_bridge.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/search_engines/template_url_service.h" #include "content/public/browser/browser_thread.h" using content::BrowserThread; diff --git a/chrome/browser/importer/external_process_importer_host.h b/chrome/browser/importer/external_process_importer_host.h index ff91b2d..6776ff45 100644 --- a/chrome/browser/importer/external_process_importer_host.h +++ b/chrome/browser/importer/external_process_importer_host.h @@ -12,9 +12,9 @@ #include "base/memory/weak_ptr.h" #include "chrome/browser/importer/importer_progress_observer.h" #include "chrome/browser/importer/profile_writer.h" +#include "chrome/browser/search_engines/template_url_service.h" #include "chrome/common/importer/importer_data_types.h" #include "components/bookmarks/browser/base_bookmark_model_observer.h" -#include "components/search_engines/template_url_service.h" #include "ui/gfx/native_widget_types.h" class ExternalProcessImporterClient; diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc index eb02768..90f7e0f 100644 --- a/chrome/browser/importer/profile_writer.cc +++ b/chrome/browser/importer/profile_writer.cc @@ -21,6 +21,7 @@ #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_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/importer/imported_bookmark_entry.h" @@ -29,7 +30,6 @@ #include "components/bookmarks/browser/bookmark_model.h" #include "components/password_manager/core/browser/password_store.h" #include "components/search_engines/template_url.h" -#include "components/search_engines/template_url_service.h" namespace { diff --git a/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc b/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc index 71fd7fd..0a890c4 100644 --- a/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc +++ b/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc @@ -19,6 +19,7 @@ #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/search_engines/template_url_service_factory.h" +#include "chrome/browser/search_engines/util.h" #include "chrome/browser/ui/ash/ash_init.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" @@ -27,7 +28,6 @@ #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/env_vars.h" -#include "components/search_engines/util.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/gpu_data_manager.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index 60f081b..ab24a08 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -53,6 +53,7 @@ #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_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/translate/chrome_translate_client.h" #include "chrome/browser/translate/cld_data_harness.h" @@ -87,7 +88,6 @@ #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/search_engines/template_url_service.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/profile_resetter/automatic_profile_resetter.cc b/chrome/browser/profile_resetter/automatic_profile_resetter.cc index c92d346..a6d7cb0 100644 --- a/chrome/browser/profile_resetter/automatic_profile_resetter.cc +++ b/chrome/browser/profile_resetter/automatic_profile_resetter.cc @@ -24,8 +24,8 @@ #include "chrome/browser/profile_resetter/automatic_profile_resetter_delegate.h" #include "chrome/browser/profile_resetter/jtl_interpreter.h" #include "chrome/browser/profiles/profile.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_service.h" #include "components/variations/variations_associated_data.h" #include "content/public/browser/browser_thread.h" #include "grit/browser_resources.h" diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter_delegate.cc b/chrome/browser/profile_resetter/automatic_profile_resetter_delegate.cc index 49e7b6a..9a19ad9 100644 --- a/chrome/browser/profile_resetter/automatic_profile_resetter_delegate.cc +++ b/chrome/browser/profile_resetter/automatic_profile_resetter_delegate.cc @@ -23,13 +23,13 @@ #include "chrome/browser/profile_resetter/profile_resetter.h" #include "chrome/browser/profile_resetter/resettable_settings_snapshot.h" #include "chrome/browser/profiles/profile.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" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/global_error/global_error_service.h" #include "chrome/browser/ui/global_error/global_error_service_factory.h" #include "components/search_engines/template_url_prepopulate_data.h" -#include "components/search_engines/template_url_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter_delegate.h b/chrome/browser/profile_resetter/automatic_profile_resetter_delegate.h index 015c466..74bdb2c 100644 --- a/chrome/browser/profile_resetter/automatic_profile_resetter_delegate.h +++ b/chrome/browser/profile_resetter/automatic_profile_resetter_delegate.h @@ -24,7 +24,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/profile_resetter/profile_resetter.h" -#include "components/search_engines/template_url_service_observer.h" +#include "chrome/browser/search_engines/template_url_service_observer.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "extensions/common/one_shot_event.h" diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc b/chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc index b9ea0fb..12258f8 100644 --- a/chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc +++ b/chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc @@ -25,6 +25,7 @@ #include "chrome/browser/google/google_brand.h" #include "chrome/browser/profile_resetter/brandcoded_default_settings.h" #include "chrome/browser/profile_resetter/profile_reset_global_error.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/template_url_service_test_util.h" #include "chrome/browser/ui/global_error/global_error.h" @@ -35,7 +36,6 @@ #include "chrome/test/base/testing_profile.h" #include "components/search_engines/default_search_manager.h" #include "components/search_engines/template_url_prepopulate_data.h" -#include "components/search_engines/template_url_service.h" #include "content/public/browser/notification_service.h" #include "net/http/http_response_headers.h" #include "net/url_request/test_url_fetcher_factory.h" diff --git a/chrome/browser/profile_resetter/profile_resetter.cc b/chrome/browser/profile_resetter/profile_resetter.cc index 0bc7cdc..7df9f7c 100644 --- a/chrome/browser/profile_resetter/profile_resetter.cc +++ b/chrome/browser/profile_resetter/profile_resetter.cc @@ -16,6 +16,7 @@ #include "chrome/browser/google/google_url_tracker_factory.h" #include "chrome/browser/profile_resetter/brandcoded_default_settings.h" #include "chrome/browser/profiles/profile.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" #include "chrome/browser/ui/browser_iterator.h" @@ -26,7 +27,6 @@ #include "components/google/core/browser/google_url_tracker.h" #include "components/search_engines/search_engines_pref_names.h" #include "components/search_engines/template_url_prepopulate_data.h" -#include "components/search_engines/template_url_service.h" #include "content/public/browser/browser_thread.h" #include "extensions/browser/extension_system.h" #include "extensions/browser/management_policy.h" diff --git a/chrome/browser/profile_resetter/profile_resetter.h b/chrome/browser/profile_resetter/profile_resetter.h index 595aa5e..354c1b3 100644 --- a/chrome/browser/profile_resetter/profile_resetter.h +++ b/chrome/browser/profile_resetter/profile_resetter.h @@ -18,7 +18,7 @@ #include "base/threading/non_thread_safe.h" #include "chrome/browser/browsing_data/browsing_data_remover.h" #include "chrome/browser/profile_resetter/brandcoded_default_settings.h" -#include "components/search_engines/template_url_service.h" +#include "chrome/browser/search_engines/template_url_service.h" class Profile; diff --git a/chrome/browser/profile_resetter/profile_resetter_unittest.cc b/chrome/browser/profile_resetter/profile_resetter_unittest.cc index 8b48394..5d3720f 100644 --- a/chrome/browser/profile_resetter/profile_resetter_unittest.cc +++ b/chrome/browser/profile_resetter/profile_resetter_unittest.cc @@ -18,6 +18,8 @@ #include "chrome/browser/profile_resetter/brandcode_config_fetcher.h" #include "chrome/browser/profile_resetter/profile_resetter_test_base.h" #include "chrome/browser/profile_resetter/resettable_settings_snapshot.h" +#include "chrome/browser/search_engines/template_url_service.h" +#include "chrome/browser/search_engines/template_url_service_client.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/themes/theme_service.h" @@ -27,8 +29,6 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "components/google/core/browser/google_pref_names.h" -#include "components/search_engines/template_url_service.h" -#include "components/search_engines/template_url_service_client.h" #include "content/public/browser/web_contents.h" #include "content/public/test/test_browser_thread.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/profile_resetter/resettable_settings_snapshot.cc b/chrome/browser/profile_resetter/resettable_settings_snapshot.cc index 3fc66aa..6cc6034 100644 --- a/chrome/browser/profile_resetter/resettable_settings_snapshot.cc +++ b/chrome/browser/profile_resetter/resettable_settings_snapshot.cc @@ -11,13 +11,13 @@ #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/common/chrome_content_client.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" #include "components/feedback/feedback_data.h" #include "components/feedback/feedback_util.h" -#include "components/search_engines/template_url_service.h" #include "content/public/browser/browser_thread.h" #include "extensions/browser/extension_registry.h" #include "grit/generated_resources.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 ef3db1a..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,6 +42,7 @@ #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_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/spellchecker/spellcheck_host_metrics.h" #include "chrome/browser/spellchecker/spellcheck_service.h" @@ -65,7 +66,6 @@ #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/search_engines/template_url_service.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 d6fac06..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_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 "components/search_engines/template_url_service.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_service.cc b/chrome/browser/search/instant_service.cc index 0477189..f8f3c1d 100644 --- a/chrome/browser/search/instant_service.cc +++ b/chrome/browser/search/instant_service.cc @@ -14,6 +14,7 @@ #include "chrome/browser/search/most_visited_iframe_source.h" #include "chrome/browser/search/search.h" #include "chrome/browser/search/suggestions/suggestions_source.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/themes/theme_properties.h" @@ -25,7 +26,6 @@ #include "chrome/browser/ui/webui/ntp/thumbnail_source.h" #include "chrome/browser/ui/webui/theme_source.h" #include "chrome/common/render_messages.h" -#include "components/search_engines/template_url_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" diff --git a/chrome/browser/search/instant_service.h b/chrome/browser/search/instant_service.h index b4d97c9..02dc7c7 100644 --- a/chrome/browser/search/instant_service.h +++ b/chrome/browser/search/instant_service.h @@ -12,8 +12,8 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "chrome/browser/history/history_types.h" +#include "chrome/browser/search_engines/template_url_service_observer.h" #include "components/keyed_service/core/keyed_service.h" -#include "components/search_engines/template_url_service_observer.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "url/gurl.h" diff --git a/chrome/browser/search/instant_unittest_base.cc b/chrome/browser/search/instant_unittest_base.cc index 00c0fed..d6c8a42 100644 --- a/chrome/browser/search/instant_unittest_base.cc +++ b/chrome/browser/search/instant_unittest_base.cc @@ -12,6 +12,7 @@ #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_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/common/pref_names.h" @@ -21,7 +22,6 @@ #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/search_engines/template_url_service.h" #include "components/variations/entropy_provider.h" InstantUnitTestBase::InstantUnitTestBase() { diff --git a/chrome/browser/search/instant_unittest_base.h b/chrome/browser/search/instant_unittest_base.h index 6dd420b..87b8e33 100644 --- a/chrome/browser/search/instant_unittest_base.h +++ b/chrome/browser/search/instant_unittest_base.h @@ -9,8 +9,8 @@ #include "base/metrics/field_trial.h" #include "chrome/browser/search/instant_service.h" +#include "chrome/browser/search_engines/template_url_service.h" #include "chrome/test/base/browser_with_test_window_test.h" -#include "components/search_engines/template_url_service.h" class InstantServiceObserver; diff --git a/chrome/browser/search/local_ntp_source.cc b/chrome/browser/search/local_ntp_source.cc index bcda9f4..7775716 100644 --- a/chrome/browser/search/local_ntp_source.cc +++ b/chrome/browser/search/local_ntp_source.cc @@ -13,10 +13,10 @@ #include "base/values.h" #include "chrome/browser/search/instant_io_context.h" #include "chrome/browser/search/search.h" +#include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/common/url_constants.h" #include "components/search_engines/template_url_prepopulate_data.h" -#include "components/search_engines/template_url_service.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc index d473454..bb42cd9 100644 --- a/chrome/browser/search/search.cc +++ b/chrome/browser/search/search.cc @@ -16,6 +16,7 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/search/instant_service.h" #include "chrome/browser/search/instant_service_factory.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/ui/browser.h" @@ -28,7 +29,6 @@ #include "chrome/common/url_constants.h" #include "components/google/core/browser/google_util.h" #include "components/pref_registry/pref_registry_syncable.h" -#include "components/search_engines/template_url_service.h" #include "components/sessions/serialized_navigation_entry.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/render_process_host.h" diff --git a/chrome/browser/search/search_terms_tracker.cc b/chrome/browser/search/search_terms_tracker.cc index a99f915..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_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "components/search_engines/template_url.h" -#include "components/search_engines/template_url_service.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/search_unittest.cc b/chrome/browser/search/search_unittest.cc index 19c4ca2..80ee842 100644 --- a/chrome/browser/search/search_unittest.cc +++ b/chrome/browser/search/search_unittest.cc @@ -12,6 +12,7 @@ #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_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/supervised_user/supervised_user_service.h" @@ -25,7 +26,6 @@ #include "chrome/test/base/ui_test_utils.h" #include "components/google/core/browser/google_switches.h" #include "components/search_engines/search_engines_switches.h" -#include "components/search_engines/template_url_service.h" #include "components/variations/entropy_provider.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" diff --git a/chrome/browser/search_engines/DEPS b/chrome/browser/search_engines/DEPS index 4048008..d9a3ea8 100644 --- a/chrome/browser/search_engines/DEPS +++ b/chrome/browser/search_engines/DEPS @@ -3,12 +3,20 @@ include_rules = [ ] specific_include_rules = { - "search_host_to_urls_map_unittest\.": [ + "search_host_to_urls_map(_unittest)?\.": [ "-chrome", "-content", + "+chrome/browser/search_engines/search_host_to_urls_map.h", + "+chrome/browser/search_engines/template_url_service.h", ], "template_url_unittest\.": [ "-chrome", "-content", ], + "util\.": [ + "-chrome", + "-content", + "+chrome/browser/search_engines/template_url_service.h", + "+chrome/browser/search_engines/util.h", + ], }
\ No newline at end of file diff --git a/chrome/browser/search_engines/chrome_template_url_service_client.cc b/chrome/browser/search_engines/chrome_template_url_service_client.cc index 0187a6a..0183636 100644 --- a/chrome/browser/search_engines/chrome_template_url_service_client.cc +++ b/chrome/browser/search_engines/chrome_template_url_service_client.cc @@ -8,7 +8,7 @@ #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/profiles/profile.h" -#include "components/search_engines/template_url_service.h" +#include "chrome/browser/search_engines/template_url_service.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/search_engines/chrome_template_url_service_client.h b/chrome/browser/search_engines/chrome_template_url_service_client.h index 5b32ec5..0e58d56 100644 --- a/chrome/browser/search_engines/chrome_template_url_service_client.h +++ b/chrome/browser/search_engines/chrome_template_url_service_client.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SEARCH_ENGINES_CHROME_TEMPLATE_URL_SERVICE_CLIENT_H_ #define CHROME_BROWSER_SEARCH_ENGINES_CHROME_TEMPLATE_URL_SERVICE_CLIENT_H_ -#include "components/search_engines/template_url_service_client.h" +#include "chrome/browser/search_engines/template_url_service_client.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/search_engines/default_search_pref_migration.cc b/chrome/browser/search_engines/default_search_pref_migration.cc index 224f2fc..d3726e6 100644 --- a/chrome/browser/search_engines/default_search_pref_migration.cc +++ b/chrome/browser/search_engines/default_search_pref_migration.cc @@ -10,10 +10,10 @@ #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" +#include "chrome/browser/search_engines/template_url_service.h" #include "components/search_engines/default_search_manager.h" #include "components/search_engines/search_engines_pref_names.h" #include "components/search_engines/template_url_data.h" -#include "components/search_engines/template_url_service.h" namespace { 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 71060b5e..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_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 "components/search_engines/template_url_service.h" #include "testing/gtest/include/gtest/gtest.h" class DefaultSearchPrefMigrationTest : public testing::Test { diff --git a/components/search_engines/search_host_to_urls_map.cc b/chrome/browser/search_engines/search_host_to_urls_map.cc index 89e8d87..4abea66 100644 --- a/components/search_engines/search_host_to_urls_map.cc +++ b/chrome/browser/search_engines/search_host_to_urls_map.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 "components/search_engines/search_host_to_urls_map.h" +#include "chrome/browser/search_engines/search_host_to_urls_map.h" #include "base/memory/scoped_ptr.h" #include "components/search_engines/template_url.h" diff --git a/components/search_engines/search_host_to_urls_map.h b/chrome/browser/search_engines/search_host_to_urls_map.h index 8e4ce59..cfd3394 100644 --- a/components/search_engines/search_host_to_urls_map.h +++ b/chrome/browser/search_engines/search_host_to_urls_map.h @@ -1,16 +1,16 @@ -// 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 COMPONENTS_SEARCH_ENGINES_SEARCH_HOST_TO_URLS_MAP_H_ -#define COMPONENTS_SEARCH_ENGINES_SEARCH_HOST_TO_URLS_MAP_H_ +#ifndef CHROME_BROWSER_SEARCH_ENGINES_SEARCH_HOST_TO_URLS_MAP_H_ +#define CHROME_BROWSER_SEARCH_ENGINES_SEARCH_HOST_TO_URLS_MAP_H_ #include <map> #include <set> #include <string> #include "base/basictypes.h" -#include "components/search_engines/template_url_service.h" +#include "chrome/browser/search_engines/template_url_service.h" // Holds the host to template url mappings for the search providers. WARNING: // This class does not own any TemplateURLs passed to it and it is up to the @@ -63,4 +63,4 @@ class SearchHostToURLsMap { DISALLOW_COPY_AND_ASSIGN(SearchHostToURLsMap); }; -#endif // COMPONENTS_SEARCH_ENGINES_SEARCH_HOST_TO_URLS_MAP_H_ +#endif // CHROME_BROWSER_SEARCH_ENGINES_SEARCH_HOST_TO_URLS_MAP_H_ 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 967166a..4104653 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 @@ -4,7 +4,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "components/search_engines/search_host_to_urls_map.h" +#include "chrome/browser/search_engines/search_host_to_urls_map.h" #include "components/search_engines/search_terms_data.h" #include "components/search_engines/template_url.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/search_engines/search_provider_install_data.cc b/chrome/browser/search_engines/search_provider_install_data.cc index 4c0c91c..737909a 100644 --- a/chrome/browser/search_engines/search_provider_install_data.cc +++ b/chrome/browser/search_engines/search_provider_install_data.cc @@ -15,13 +15,13 @@ #include "base/memory/ref_counted.h" #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_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/search_host_to_urls_map.h" #include "components/search_engines/template_url.h" -#include "components/search_engines/template_url_service.h" -#include "components/search_engines/util.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 8e309be..ac0b4e9 100644 --- a/chrome/browser/search_engines/search_provider_install_data_unittest.cc +++ b/chrome/browser/search_engines/search_provider_install_data_unittest.cc @@ -12,12 +12,12 @@ #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_service.h" #include "chrome/browser/search_engines/template_url_service_test_util.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 "components/search_engines/template_url_prepopulate_data.h" -#include "components/search_engines/template_url_service.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 a891ae0..10a0540 100644 --- a/chrome/browser/search_engines/template_url_fetcher.cc +++ b/chrome/browser/search_engines/template_url_fetcher.cc @@ -11,10 +11,10 @@ #include "chrome/browser/profiles/profile.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 "components/search_engines/template_url_service.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 70da4ce..0387139 100644 --- a/chrome/browser/search_engines/template_url_fetcher_unittest.cc +++ b/chrome/browser/search_engines/template_url_fetcher_unittest.cc @@ -10,11 +10,11 @@ #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" +#include "chrome/browser/search_engines/template_url_service.h" #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 "components/search_engines/template_url_service.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_prepopulate_data_unittest.cc b/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc index 29be928..0fc7c17 100644 --- a/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc +++ b/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc @@ -6,6 +6,7 @@ #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_service.h" #include "components/google/core/browser/google_switches.h" #include "components/pref_registry/testing_pref_service_syncable.h" #include "components/search_engines/prepopulated_engines.h" @@ -13,7 +14,6 @@ #include "components/search_engines/search_terms_data.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_prepopulate_data.h" -#include "components/search_engines/template_url_service.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_scraper_unittest.cc b/chrome/browser/search_engines/template_url_scraper_unittest.cc index 719a296..a5b9a78 100644 --- a/chrome/browser/search_engines/template_url_scraper_unittest.cc +++ b/chrome/browser/search_engines/template_url_scraper_unittest.cc @@ -3,12 +3,12 @@ // found in the LICENSE file. #include "chrome/browser/profiles/profile.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" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "components/search_engines/template_url_prepopulate_data.h" -#include "components/search_engines/template_url_service.h" #include "net/base/net_util.h" #include "net/dns/mock_host_resolver.h" diff --git a/components/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc index b98dbcea..0b8e2cc 100644 --- a/components/search_engines/template_url_service.cc +++ b/chrome/browser/search_engines/template_url_service.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 "components/search_engines/template_url_service.h" +#include "chrome/browser/search_engines/template_url_service.h" #include <algorithm> #include <utility> @@ -21,15 +21,15 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" +#include "chrome/browser/search_engines/search_host_to_urls_map.h" +#include "chrome/browser/search_engines/template_url_service_client.h" +#include "chrome/browser/search_engines/template_url_service_observer.h" +#include "chrome/browser/search_engines/util.h" #include "components/rappor/rappor_service.h" #include "components/search_engines/search_engines_pref_names.h" -#include "components/search_engines/search_host_to_urls_map.h" #include "components/search_engines/search_terms_data.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_prepopulate_data.h" -#include "components/search_engines/template_url_service_client.h" -#include "components/search_engines/template_url_service_observer.h" -#include "components/search_engines/util.h" #include "components/url_fixer/url_fixer.h" #include "net/base/net_util.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" diff --git a/components/search_engines/template_url_service.h b/chrome/browser/search_engines/template_url_service.h index ef80a50..0230a5c 100644 --- a/components/search_engines/template_url_service.h +++ b/chrome/browser/search_engines/template_url_service.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 COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_ -#define COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_ +#ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_ +#define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_ #include <list> #include <map> @@ -16,10 +16,10 @@ #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "base/prefs/pref_change_registrar.h" +#include "chrome/browser/webdata/keyword_web_data_service.h" #include "components/google/core/browser/google_url_tracker.h" #include "components/keyed_service/core/keyed_service.h" #include "components/search_engines/default_search_manager.h" -#include "components/search_engines/keyword_web_data_service.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_id.h" #include "components/webdata/common/web_data_service_consumer.h" @@ -759,4 +759,4 @@ class TemplateURLService : public WebDataServiceConsumer, DISALLOW_COPY_AND_ASSIGN(TemplateURLService); }; -#endif // COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_ +#endif // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_ diff --git a/chrome/browser/search_engines/template_url_service_android.cc b/chrome/browser/search_engines/template_url_service_android.cc index 5c0ad38..6bf5095 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_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 "components/search_engines/template_url_prepopulate_data.h" -#include "components/search_engines/template_url_service.h" -#include "components/search_engines/util.h" #include "jni/TemplateUrlService_jni.h" #include "net/base/url_util.h" diff --git a/chrome/browser/search_engines/template_url_service_android.h b/chrome/browser/search_engines/template_url_service_android.h index 0bbb8fe..40fa993 100644 --- a/chrome/browser/search_engines/template_url_service_android.h +++ b/chrome/browser/search_engines/template_url_service_android.h @@ -8,7 +8,7 @@ #include "base/android/jni_weak_ref.h" #include "base/android/scoped_java_ref.h" #include "base/memory/scoped_ptr.h" -#include "components/search_engines/template_url_service.h" +#include "chrome/browser/search_engines/template_url_service.h" class TemplateURL; diff --git a/components/search_engines/template_url_service_client.h b/chrome/browser/search_engines/template_url_service_client.h index 9ab8068..1a1d3b5 100644 --- a/components/search_engines/template_url_service_client.h +++ b/chrome/browser/search_engines/template_url_service_client.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 COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_CLIENT_H_ -#define COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_CLIENT_H_ +#ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_CLIENT_H_ +#define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_CLIENT_H_ #include "base/strings/string16.h" #include "components/search_engines/template_url_id.h" @@ -33,4 +33,4 @@ class TemplateURLServiceClient { virtual void AddKeywordGeneratedVisit(const GURL& url) = 0; }; -#endif // COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_CLIENT_H_ +#endif // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_CLIENT_H_ diff --git a/chrome/browser/search_engines/template_url_service_factory.cc b/chrome/browser/search_engines/template_url_service_factory.cc index e626369..80b55b5 100644 --- a/chrome/browser/search_engines/template_url_service_factory.cc +++ b/chrome/browser/search_engines/template_url_service_factory.cc @@ -14,13 +14,13 @@ #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/rlz/rlz.h" #include "chrome/browser/search_engines/chrome_template_url_service_client.h" +#include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" #include "chrome/browser/webdata/web_data_service_factory.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/search_engines/default_search_manager.h" #include "components/search_engines/search_engines_pref_names.h" -#include "components/search_engines/template_url_service.h" // static TemplateURLService* TemplateURLServiceFactory::GetForProfile(Profile* profile) { diff --git a/components/search_engines/template_url_service_observer.h b/chrome/browser/search_engines/template_url_service_observer.h index 203de88..2e7276e 100644 --- a/components/search_engines/template_url_service_observer.h +++ b/chrome/browser/search_engines/template_url_service_observer.h @@ -1,9 +1,9 @@ -// Copyright (c) 2011 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 COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_OBSERVER_H_ -#define COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_OBSERVER_H_ +#ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_OBSERVER_H_ +#define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_OBSERVER_H_ // TemplateURLServiceObserver is notified whenever the set of TemplateURLs // are modified. @@ -16,4 +16,4 @@ class TemplateURLServiceObserver { virtual ~TemplateURLServiceObserver() {} }; -#endif // COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_OBSERVER_H_ +#endif // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_OBSERVER_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 61b0502..ce2832d 100644 --- a/chrome/browser/search_engines/template_url_service_sync_unittest.cc +++ b/chrome/browser/search_engines/template_url_service_sync_unittest.cc @@ -8,6 +8,8 @@ #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_service.h" +#include "chrome/browser/search_engines/template_url_service_client.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/search_engines/template_url_service_test_util.h" #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" @@ -16,8 +18,6 @@ #include "components/search_engines/search_engines_pref_names.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_prepopulate_data.h" -#include "components/search_engines/template_url_service.h" -#include "components/search_engines/template_url_service_client.h" #include "net/base/net_util.h" #include "sync/api/sync_change_processor_wrapper_for_test.h" #include "sync/api/sync_error_factory.h" diff --git a/chrome/browser/search_engines/template_url_service_test_util.cc b/chrome/browser/search_engines/template_url_service_test_util.cc index 011e0eb..68cff15 100644 --- a/chrome/browser/search_engines/template_url_service_test_util.cc +++ b/chrome/browser/search_engines/template_url_service_test_util.cc @@ -9,6 +9,7 @@ #include "base/strings/string_split.h" #include "base/threading/thread.h" #include "chrome/browser/search_engines/chrome_template_url_service_client.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/webdata/web_data_service_factory.h" @@ -16,7 +17,6 @@ #include "chrome/test/base/testing_profile.h" #include "components/google/core/browser/google_url_tracker.h" #include "components/search_engines/default_search_manager.h" -#include "components/search_engines/template_url_service.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/search_engines/template_url_service_test_util.h b/chrome/browser/search_engines/template_url_service_test_util.h index 83f4fad..7ec62be 100644 --- a/chrome/browser/search_engines/template_url_service_test_util.h +++ b/chrome/browser/search_engines/template_url_service_test_util.h @@ -13,7 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/strings/string16.h" -#include "components/search_engines/template_url_service_observer.h" +#include "chrome/browser/search_engines/template_url_service_observer.h" #include "content/public/test/test_browser_thread_bundle.h" class GURL; diff --git a/chrome/browser/search_engines/template_url_service_unittest.cc b/chrome/browser/search_engines/template_url_service_unittest.cc index 2db6b69..b2fd80e 100644 --- a/chrome/browser/search_engines/template_url_service_unittest.cc +++ b/chrome/browser/search_engines/template_url_service_unittest.cc @@ -17,15 +17,15 @@ #include "base/time/time.h" #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_service.h" #include "chrome/browser/search_engines/template_url_service_test_util.h" +#include "chrome/browser/webdata/keyword_web_data_service.h" #include "chrome/browser/webdata/web_data_service_factory.h" #include "chrome/test/base/testing_profile.h" -#include "components/search_engines/keyword_web_data_service.h" -#include "components/search_engines/search_host_to_urls_map.h" #include "components/search_engines/search_terms_data.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_prepopulate_data.h" -#include "components/search_engines/template_url_service.h" #include "components/webdata/common/web_database.h" #include "testing/gtest/include/gtest/gtest.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 98b39bc..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_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 "components/search_engines/template_url_service.h" -#include "components/search_engines/util.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/components/search_engines/util.cc b/chrome/browser/search_engines/util.cc index 478f2a4..7cb976c 100644 --- a/components/search_engines/util.cc +++ b/chrome/browser/search_engines/util.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 "components/search_engines/util.h" +#include "chrome/browser/search_engines/util.h" #include <map> #include <set> @@ -13,9 +13,9 @@ #include "base/memory/scoped_vector.h" #include "base/prefs/pref_service.h" #include "base/time/time.h" +#include "chrome/browser/search_engines/template_url_service.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_prepopulate_data.h" -#include "components/search_engines/template_url_service.h" base::string16 GetDefaultSearchEngineName(TemplateURLService* service) { DCHECK(service); diff --git a/components/search_engines/util.h b/chrome/browser/search_engines/util.h index 4d0b643..18fa9cb 100644 --- a/components/search_engines/util.h +++ b/chrome/browser/search_engines/util.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 COMPONENTS_SEARCH_ENGINES_UTIL_H_ -#define COMPONENTS_SEARCH_ENGINES_UTIL_H_ +#ifndef CHROME_BROWSER_SEARCH_ENGINES_UTIL_H_ +#define CHROME_BROWSER_SEARCH_ENGINES_UTIL_H_ // This file contains utility functions for search engine functionality. #include <set> @@ -12,7 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" -#include "components/search_engines/template_url_service.h" +#include "chrome/browser/search_engines/template_url_service.h" class KeywordWebDataService; class PrefService; @@ -133,4 +133,4 @@ void RemoveDuplicatePrepopulateIDs( const SearchTermsData& search_terms_data, std::set<std::string>* removed_keyword_guids); -#endif // COMPONENTS_SEARCH_ENGINES_UTIL_H_ +#endif // CHROME_BROWSER_SEARCH_ENGINES_UTIL_H_ diff --git a/chrome/browser/sync/glue/search_engine_data_type_controller.h b/chrome/browser/sync/glue/search_engine_data_type_controller.h index 7710936..e89f4fbd 100644 --- a/chrome/browser/sync/glue/search_engine_data_type_controller.h +++ b/chrome/browser/sync/glue/search_engine_data_type_controller.h @@ -9,7 +9,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "components/search_engines/template_url_service.h" +#include "chrome/browser/search_engines/template_url_service.h" #include "components/sync_driver/generic_change_processor.h" #include "components/sync_driver/ui_data_type_controller.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc index 1b927ae..0e2035b 100644 --- a/chrome/browser/sync/profile_sync_components_factory_impl.cc +++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc @@ -16,6 +16,7 @@ #include "chrome/browser/prefs/pref_model_associator.h" #include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/browser/profiles/profile.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" #include "chrome/browser/sync/glue/autofill_data_type_controller.h" @@ -51,7 +52,6 @@ #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" #include "components/dom_distiller/core/dom_distiller_service.h" #include "components/password_manager/core/browser/password_store.h" -#include "components/search_engines/template_url_service.h" #include "components/signin/core/browser/signin_manager.h" #include "components/sync_driver/data_type_manager_impl.h" #include "components/sync_driver/data_type_manager_observer.h" diff --git a/chrome/browser/sync/test/integration/search_engines_helper.cc b/chrome/browser/sync/test/integration/search_engines_helper.cc index 083cb5b..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_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" -#include "components/search_engines/template_url_service.h" using sync_datatype_helper::test; diff --git a/chrome/browser/sync/test/integration/single_client_search_engines_sync_test.cc b/chrome/browser/sync/test/integration/single_client_search_engines_sync_test.cc index e7be9b6..485f924 100644 --- a/chrome/browser/sync/test/integration/single_client_search_engines_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_search_engines_sync_test.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_service.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/test/integration/search_engines_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_service.h" using sync_integration_test_util::AwaitCommitActivityCompletion; diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc index 4ca6915..44cdec4 100644 --- a/chrome/browser/sync/test/integration/sync_test.cc +++ b/chrome/browser/sync/test/integration/sync_test.cc @@ -26,6 +26,7 @@ #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" +#include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/signin/profile_identity_provider.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" @@ -56,7 +57,6 @@ #include "components/invalidation/profile_invalidation_provider.h" #include "components/keyed_service/core/keyed_service.h" #include "components/os_crypt/os_crypt.h" -#include "components/search_engines/template_url_service.h" #include "components/signin/core/browser/signin_manager.h" #include "content/public/browser/web_contents.h" #include "content/public/test/test_browser_thread.h" 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 124f182..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,6 +3,7 @@ // found in the LICENSE file. #include "base/strings/utf_string_conversions.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/search_engines_helper.h" @@ -10,7 +11,6 @@ #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" -#include "components/search_engines/template_url_service.h" using base::ASCIIToUTF16; using sync_integration_test_util::AwaitCommitActivityCompletion; diff --git a/chrome/browser/ui/bookmarks/bookmark_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_unittest.cc index 3e40038..2249b7c 100644 --- a/chrome/browser/ui/bookmarks/bookmark_unittest.cc +++ b/chrome/browser/ui/bookmarks/bookmark_unittest.cc @@ -2,13 +2,13 @@ // 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_service.h" +#include "chrome/browser/search_engines/template_url_service_client.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "components/search_engines/search_terms_data.h" -#include "components/search_engines/template_url_service.h" -#include "components/search_engines/template_url_service_client.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/cocoa/first_run_bubble_controller.mm b/chrome/browser/ui/cocoa/first_run_bubble_controller.mm index 03e6de8..152e752 100644 --- a/chrome/browser/ui/cocoa/first_run_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/first_run_bubble_controller.mm @@ -8,10 +8,10 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/search_engines/template_url_service_factory.h" +#include "chrome/browser/search_engines/util.h" #include "chrome/browser/ui/chrome_pages.h" #import "chrome/browser/ui/cocoa/info_bubble_view.h" #import "chrome/browser/ui/cocoa/l10n_util.h" -#include "components/search_engines/util.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/cocoa/first_run_dialog.mm b/chrome/browser/ui/cocoa/first_run_dialog.mm index f762862..b838ae6 100644 --- a/chrome/browser/ui/cocoa/first_run_dialog.mm +++ b/chrome/browser/ui/cocoa/first_run_dialog.mm @@ -14,11 +14,11 @@ #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/first_run/first_run_dialog.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/shell_integration.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/url_constants.h" -#include "components/search_engines/template_url_service.h" #include "grit/locale_settings.h" #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm index f074c274..edfbff2 100644 --- a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm @@ -9,6 +9,7 @@ #include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" +#include "chrome/browser/search_engines/util.h" #import "chrome/browser/ui/browser.h" #import "chrome/browser/ui/browser_window.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" @@ -20,7 +21,6 @@ #include "chrome/browser/ui/global_error/global_error_bubble_view_base.h" #include "chrome/browser/ui/global_error/global_error_service.h" #include "chrome/browser/ui/global_error/global_error_service_factory.h" -#include "components/search_engines/util.h" #include "grit/generated_resources.h" #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/l10n/l10n_util.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 9fa4b56..01db01e 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,6 +27,7 @@ #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_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/translate/chrome_translate_client.h" #include "chrome/browser/translate/translate_service.h" @@ -60,7 +61,6 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "components/search_engines/template_url.h" -#include "components/search_engines/template_url_service.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/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm index 9609f77..f89d75e 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm @@ -21,6 +21,7 @@ #include "chrome/browser/command_updater.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search/search.h" +#include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" @@ -49,7 +50,6 @@ #include "chrome/browser/upgrade_detector.h" #include "chrome/common/pref_names.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/search_engines/template_url_service.h" #include "components/url_fixer/url_fixer.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.cc b/chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.cc index 9918043..345a9e8 100644 --- a/chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.cc +++ b/chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.cc @@ -11,12 +11,12 @@ #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search/search.h" +#include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/sessions/session_tab_helper.h" #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h" #include "chrome/browser/ui/search/instant_search_prerenderer.h" #include "chrome/browser/ui/search/search_tab_helper.h" -#include "components/search_engines/template_url_service.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/web_contents.h" #include "ui/base/window_open_disposition.h" diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc index fa853b2..9cc2394 100644 --- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc +++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc @@ -38,6 +38,7 @@ #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_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/sessions/session_tab_helper.h" @@ -58,7 +59,6 @@ #include "components/metrics/proto/omnibox_event.pb.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_prepopulate_data.h" -#include "components/search_engines/template_url_service.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 b9006a6..ad3294f 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_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 "components/search_engines/template_url_service.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 8071b44..c1aa1f2 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_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 "components/search_engines/template_url_service.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 9d76375..f9d415a 100644 --- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc +++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc @@ -17,6 +17,7 @@ #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_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" @@ -37,7 +38,6 @@ #include "components/bookmarks/browser/bookmark_utils.h" #include "components/bookmarks/test/bookmark_test_helpers.h" #include "components/search_engines/template_url.h" -#include "components/search_engines/template_url_service.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/instant_controller.cc b/chrome/browser/ui/search/instant_controller.cc index 1a2ccd5..17a82f6 100644 --- a/chrome/browser/ui/search/instant_controller.cc +++ b/chrome/browser/ui/search/instant_controller.cc @@ -14,6 +14,7 @@ #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_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/browser_instant_controller.h" #include "chrome/browser/ui/search/instant_tab.h" @@ -23,7 +24,6 @@ #include "chrome/common/pref_names.h" #include "chrome/common/search_urls.h" #include "chrome/common/url_constants.h" -#include "components/search_engines/template_url_service.h" #include "components/sessions/serialized_navigation_entry.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc index fb0fcf0..d587af0 100644 --- a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc +++ b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc @@ -34,6 +34,7 @@ #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_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/task_manager/task_manager.h" #include "chrome/browser/task_manager/task_manager_browsertest_util.h" @@ -58,7 +59,6 @@ #include "components/bookmarks/test/bookmark_test_helpers.h" #include "components/google/core/browser/google_url_tracker.h" #include "components/history/core/common/thumbnail_score.h" -#include "components/search_engines/template_url_service.h" #include "components/sessions/serialized_navigation_entry.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" diff --git a/chrome/browser/ui/search/instant_test_utils.cc b/chrome/browser/ui/search/instant_test_utils.cc index 09e9d0f..d261d55 100644 --- a/chrome/browser/ui/search/instant_test_utils.cc +++ b/chrome/browser/ui/search/instant_test_utils.cc @@ -9,6 +9,7 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/profile.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_view.h" #include "chrome/browser/ui/search/search_tab_helper.h" @@ -17,7 +18,6 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/ui_test_utils.h" -#include "components/search_engines/template_url_service.h" #include "components/variations/entropy_provider.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" diff --git a/chrome/browser/ui/search/search_ipc_router_unittest.cc b/chrome/browser/ui/search/search_ipc_router_unittest.cc index bccacd2..44aaaaa 100644 --- a/chrome/browser/ui/search/search_ipc_router_unittest.cc +++ b/chrome/browser/ui/search/search_ipc_router_unittest.cc @@ -14,6 +14,7 @@ #include "base/tuple.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search/search.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/search_ipc_router_policy_impl.h" #include "chrome/browser/ui/search/search_tab_helper.h" @@ -26,7 +27,6 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "components/search_engines/template_url_service.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/search/search_tab_helper_unittest.cc b/chrome/browser/ui/search/search_tab_helper_unittest.cc index 733c70d..ed2068c 100644 --- a/chrome/browser/ui/search/search_tab_helper_unittest.cc +++ b/chrome/browser/ui/search/search_tab_helper_unittest.cc @@ -12,6 +12,7 @@ #include "chrome/browser/prerender/prerender_manager_factory.h" #include "chrome/browser/search/instant_unittest_base.h" #include "chrome/browser/search/search.h" +#include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/signin/fake_signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" @@ -29,7 +30,6 @@ #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/ui_test_utils.h" -#include "components/search_engines/template_url_service.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.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 29b4574..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_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "components/search_engines/template_url.h" -#include "components/search_engines/template_url_service.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 1dcb8bb..da580ea 100644 --- a/chrome/browser/ui/search_engines/keyword_editor_controller.cc +++ b/chrome/browser/ui/search_engines/keyword_editor_controller.cc @@ -6,11 +6,11 @@ #include "base/prefs/pref_registry_simple.h" #include "chrome/browser/favicon/favicon_service_factory.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 "components/search_engines/template_url_service.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 b84a081..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_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 "components/search_engines/template_url_service.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 490d2b7..4e9581a 100644 --- a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc +++ b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc @@ -7,12 +7,12 @@ #include "chrome/browser/profiles/profile.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" #include "chrome/browser/search_engines/template_url_service_factory.h" #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 "components/search_engines/template_url_service.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/template_url_table_model.cc b/chrome/browser/ui/search_engines/template_url_table_model.cc index 67ff51d..60ba1cc 100644 --- a/chrome/browser/ui/search_engines/template_url_table_model.cc +++ b/chrome/browser/ui/search_engines/template_url_table_model.cc @@ -8,9 +8,9 @@ #include "base/i18n/rtl.h" #include "base/task/cancelable_task_tracker.h" #include "chrome/browser/favicon/favicon_service.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 "components/search_engines/template_url_service.h" #include "grit/generated_resources.h" #include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/search_engines/template_url_table_model.h b/chrome/browser/ui/search_engines/template_url_table_model.h index fffcc28..e2a38481 100644 --- a/chrome/browser/ui/search_engines/template_url_table_model.h +++ b/chrome/browser/ui/search_engines/template_url_table_model.h @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" -#include "components/search_engines/template_url_service_observer.h" +#include "chrome/browser/search_engines/template_url_service_observer.h" #include "ui/base/models/table_model.h" class FaviconService; diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc index cc9a84b..8cd065c 100644 --- a/chrome/browser/ui/startup/startup_browser_creator.cc +++ b/chrome/browser/ui/startup/startup_browser_creator.cc @@ -42,6 +42,7 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/profiles/profiles_state.h" #include "chrome/browser/search_engines/template_url_service_factory.h" +#include "chrome/browser/search_engines/util.h" #include "chrome/browser/ui/app_list/app_list_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_dialogs.h" @@ -57,7 +58,6 @@ #include "chrome/common/url_constants.h" #include "chrome/installer/util/browser_distribution.h" #include "components/google/core/browser/google_util.h" -#include "components/search_engines/util.h" #include "components/signin/core/common/profile_management_switches.h" #include "components/url_fixer/url_fixer.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/ui/tab_contents/core_tab_helper.cc b/chrome/browser/ui/tab_contents/core_tab_helper.cc index 4756c2d..83b4397 100644 --- a/chrome/browser/ui/tab_contents/core_tab_helper.cc +++ b/chrome/browser/ui/tab_contents/core_tab_helper.cc @@ -12,6 +12,7 @@ #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_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_command_controller.h" @@ -19,7 +20,6 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/render_messages.h" #include "components/search_engines/template_url.h" -#include "components/search_engines/template_url_service.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/uma_browsing_activity_observer.cc b/chrome/browser/ui/uma_browsing_activity_observer.cc index e5f7927..25cab82 100644 --- a/chrome/browser/ui/uma_browsing_activity_observer.cc +++ b/chrome/browser/ui/uma_browsing_activity_observer.cc @@ -6,13 +6,13 @@ #include "base/metrics/histogram.h" #include "chrome/browser/chrome_notification_types.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" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_iterator.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "components/search_engines/template_url_service.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc index be0f28c..a43c1cc 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc @@ -8,6 +8,8 @@ #include "base/values.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search_engines/template_url_service.h" +#include "chrome/browser/search_engines/template_url_service_client.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/app_list/app_list_util.h" #include "chrome/common/pref_names.h" @@ -18,8 +20,6 @@ #include "chrome/test/base/testing_pref_service_syncable.h" #include "components/bookmarks/test/bookmark_test_helpers.h" #include "components/search_engines/search_terms_data.h" -#include "components/search_engines/template_url_service.h" -#include "components/search_engines/template_url_service_client.h" #include "ui/views/controls/button/label_button.h" class BookmarkBarViewInstantExtendedTest : public BrowserWithTestWindowTest { diff --git a/chrome/browser/ui/views/first_run_bubble.cc b/chrome/browser/ui/views/first_run_bubble.cc index 01b4e2b..c51e8e8 100644 --- a/chrome/browser/ui/views/first_run_bubble.cc +++ b/chrome/browser/ui/views/first_run_bubble.cc @@ -6,9 +6,9 @@ #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/search_engines/template_url_service_factory.h" +#include "chrome/browser/search_engines/util.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/chrome_pages.h" -#include "components/search_engines/util.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/views/first_run_bubble_unittest.cc b/chrome/browser/ui/views/first_run_bubble_unittest.cc index c50e58d..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_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 "components/search_engines/template_url_service.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/frame/test_with_browser_view.cc b/chrome/browser/ui/views/frame/test_with_browser_view.cc index cea603f..6e3e78e 100644 --- a/chrome/browser/ui/views/frame/test_with_browser_view.cc +++ b/chrome/browser/ui/views/frame/test_with_browser_view.cc @@ -9,6 +9,7 @@ #include "chrome/browser/autocomplete/autocomplete_controller.h" #include "chrome/browser/predictors/predictor_database.h" #include "chrome/browser/search_engines/chrome_template_url_service_client.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/ui/tabs/tab_strip_model.h" @@ -20,7 +21,6 @@ #include "chrome/test/base/testing_io_thread_state.h" #include "components/autocomplete/test_scheme_classifier.h" #include "components/search_engines/search_terms_data.h" -#include "components/search_engines/template_url_service.h" #include "content/public/test/test_utils.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/ui/views/location_bar/keyword_hint_view.cc b/chrome/browser/ui/views/location_bar/keyword_hint_view.cc index 7f87678..e3f2061 100644 --- a/chrome/browser/ui/views/location_bar/keyword_hint_view.cc +++ b/chrome/browser/ui/views/location_bar/keyword_hint_view.cc @@ -10,9 +10,9 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/profiles/profile.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/location_bar/location_bar_view.h" -#include "components/search_engines/template_url_service.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.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 3402c3e..04a32bc 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -25,6 +25,7 @@ #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_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/translate/chrome_translate_client.h" #include "chrome/browser/translate/translate_service.h" @@ -62,7 +63,6 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "components/search_engines/template_url.h" -#include "components/search_engines/template_url_service.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/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h index 17ca424..6af4325 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.h +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h @@ -12,6 +12,7 @@ #include "base/memory/weak_ptr.h" #include "base/prefs/pref_member.h" #include "chrome/browser/extensions/extension_context_menu_model.h" +#include "chrome/browser/search_engines/template_url_service_observer.h" #include "chrome/browser/ui/location_bar/location_bar.h" #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h" #include "chrome/browser/ui/search/search_model_observer.h" @@ -20,7 +21,6 @@ #include "chrome/browser/ui/views/dropdown_bar_host_delegate.h" #include "chrome/browser/ui/views/extensions/extension_popup.h" #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" -#include "components/search_engines/template_url_service_observer.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "ui/gfx/animation/animation_delegate.h" diff --git a/chrome/browser/ui/views/location_bar/selected_keyword_view.cc b/chrome/browser/ui/views/location_bar/selected_keyword_view.cc index 668433c..e7baefd 100644 --- a/chrome/browser/ui/views/location_bar/selected_keyword_view.cc +++ b/chrome/browser/ui/views/location_bar/selected_keyword_view.cc @@ -7,10 +7,10 @@ #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/location_bar/location_bar_util.h" #include "chrome/browser/ui/views/location_bar/keyword_hint_view.h" -#include "components/search_engines/template_url_service.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index 451509b..4b5913d 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -47,6 +47,7 @@ #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_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/signin/easy_unlock.h" #include "chrome/browser/signin/signin_manager_factory.h" @@ -69,7 +70,6 @@ #include "chrome/common/url_constants.h" #include "chromeos/chromeos_switches.h" #include "components/search_engines/template_url.h" -#include "components/search_engines/template_url_service.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/browser_options_handler.h b/chrome/browser/ui/webui/options/browser_options_handler.h index 81ffe06..cbcac58 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.h +++ b/chrome/browser/ui/webui/options/browser_options_handler.h @@ -16,11 +16,11 @@ #include "base/prefs/pref_member.h" #include "base/scoped_observer.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search_engines/template_url_service_observer.h" #include "chrome/browser/shell_integration.h" #include "chrome/browser/sync/profile_sync_service_observer.h" #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/webui/options/options_ui.h" -#include "components/search_engines/template_url_service_observer.h" #include "components/signin/core/browser/signin_manager_base.h" #include "content/public/browser/notification_observer.h" #include "extensions/browser/extension_registry_observer.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 91fff4d..6eb7946 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_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 "components/search_engines/template_url_service.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/DEPS b/chrome/browser/webdata/DEPS index aa65f37..6c5ef5e 100644 --- a/chrome/browser/webdata/DEPS +++ b/chrome/browser/webdata/DEPS @@ -36,8 +36,8 @@ specific_include_rules = { # write these rules so they don't add bad dependencies. r"^[a-z_]+_table(_unittest|_win)?\.(cc|h)": [ "!chrome/browser/history/history_database.h", - "!components/search_engines/template_url.h", - "!components/search_engines/template_url_service.h", + "!chrome/browser/search_engines/template_url.h", + "!chrome/browser/search_engines/template_url_service.h", ], # TODO(caitkp): Extract unit tests from //chrome, at lower priority diff --git a/chrome/browser/webdata/OWNERS b/chrome/browser/webdata/OWNERS index f280eb6..78e6cc8 100644 --- a/chrome/browser/webdata/OWNERS +++ b/chrome/browser/webdata/OWNERS @@ -7,3 +7,7 @@ per-file web_data*=pkasting@chromium.org # Autofill per-file autocomplete*=isherman@chromium.org per-file autofill*=isherman@chromium.org + +# Keywords +per-file keyword_table*=pkasting@chromium.org +per-file keyword_web_data_service*=pkasting@chromium.org
\ No newline at end of file diff --git a/components/search_engines/keyword_table.cc b/chrome/browser/webdata/keyword_table.cc index af49c272..22835dd 100644 --- a/components/search_engines/keyword_table.cc +++ b/chrome/browser/webdata/keyword_table.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 "components/search_engines/keyword_table.h" +#include "chrome/browser/webdata/keyword_table.h" #include <set> @@ -15,7 +15,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "components/history/core/browser/url_database.h" +#include "chrome/browser/history/history_database.h" #include "components/search_engines/search_terms_data.h" #include "components/search_engines/template_url.h" #include "components/webdata/common/web_database.h" @@ -106,12 +106,12 @@ void BindURLToStatement(const TemplateURLData& data, s->BindString16(starting_column, data.short_name); s->BindString16(starting_column + 1, data.keyword()); s->BindString(starting_column + 2, data.favicon_url.is_valid() ? - history::URLDatabase::GURLToDatabaseURL(data.favicon_url) : + history::HistoryDatabase::GURLToDatabaseURL(data.favicon_url) : std::string()); s->BindString(starting_column + 3, data.url()); s->BindBool(starting_column + 4, data.safe_for_autoreplace); s->BindString(starting_column + 5, data.originating_url.is_valid() ? - history::URLDatabase::GURLToDatabaseURL(data.originating_url) : + history::HistoryDatabase::GURLToDatabaseURL(data.originating_url) : std::string()); s->BindInt64(starting_column + 6, data.date_created.ToTimeT()); s->BindInt(starting_column + 7, data.usage_count); diff --git a/components/search_engines/keyword_table.h b/chrome/browser/webdata/keyword_table.h index 258ba46..9dd67fa 100644 --- a/components/search_engines/keyword_table.h +++ b/chrome/browser/webdata/keyword_table.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 COMPONENTS_SEARCH_ENGINES_KEYWORD_TABLE_H_ -#define COMPONENTS_SEARCH_ENGINES_KEYWORD_TABLE_H_ +#ifndef CHROME_BROWSER_WEBDATA_KEYWORD_TABLE_H_ +#define CHROME_BROWSER_WEBDATA_KEYWORD_TABLE_H_ #include <string> #include <vector> @@ -182,4 +182,4 @@ class KeywordTable : public WebDatabaseTable { DISALLOW_COPY_AND_ASSIGN(KeywordTable); }; -#endif // COMPONENTS_SEARCH_ENGINES_KEYWORD_TABLE_H_ +#endif // CHROME_BROWSER_WEBDATA_KEYWORD_TABLE_H_ diff --git a/chrome/browser/webdata/keyword_table_unittest.cc b/chrome/browser/webdata/keyword_table_unittest.cc index 738edd9..c5b91d0 100644 --- a/chrome/browser/webdata/keyword_table_unittest.cc +++ b/chrome/browser/webdata/keyword_table_unittest.cc @@ -11,7 +11,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" -#include "components/search_engines/keyword_table.h" +#include "chrome/browser/webdata/keyword_table.h" #include "components/search_engines/template_url_data.h" #include "components/webdata/common/web_database.h" #include "sql/statement.h" diff --git a/components/search_engines/keyword_web_data_service.cc b/chrome/browser/webdata/keyword_web_data_service.cc index 29981e4..44aaa1b 100644 --- a/components/search_engines/keyword_web_data_service.cc +++ b/chrome/browser/webdata/keyword_web_data_service.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/search_engines/keyword_web_data_service.h" +#include "chrome/browser/webdata/keyword_web_data_service.h" #include "base/bind.h" -#include "components/search_engines/keyword_table.h" +#include "chrome/browser/webdata/keyword_table.h" #include "components/search_engines/template_url_data.h" #include "components/webdata/common/web_data_results.h" #include "components/webdata/common/web_database_service.h" diff --git a/components/search_engines/keyword_web_data_service.h b/chrome/browser/webdata/keyword_web_data_service.h index da553a5..3659b09 100644 --- a/components/search_engines/keyword_web_data_service.h +++ b/chrome/browser/webdata/keyword_web_data_service.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_SEARCH_ENGINES_KEYWORD_WEB_DATA_SERVICE_H__ -#define COMPONENTS_SEARCH_ENGINES_KEYWORD_WEB_DATA_SERVICE_H__ +#ifndef CHROME_BROWSER_WEBDATA_KEYWORD_WEB_DATA_SERVICE_H__ +#define CHROME_BROWSER_WEBDATA_KEYWORD_WEB_DATA_SERVICE_H__ #include "base/memory/ref_counted.h" -#include "components/search_engines/keyword_table.h" +#include "chrome/browser/webdata/keyword_table.h" #include "components/search_engines/template_url_id.h" #include "components/webdata/common/web_data_service_base.h" #include "components/webdata/common/web_database.h" @@ -107,4 +107,4 @@ class KeywordWebDataService : public WebDataServiceBase { DISALLOW_COPY_AND_ASSIGN(KeywordWebDataService); }; -#endif // COMPONENTS_SEARCH_ENGINES_KEYWORD_WEB_DATA_SERVICE_H__ +#endif // CHROME_BROWSER_WEBDATA_KEYWORD_WEB_DATA_SERVICE_H__ diff --git a/chrome/browser/webdata/web_data_service_factory.cc b/chrome/browser/webdata/web_data_service_factory.cc index c23f5d6..b5d5dc3 100644 --- a/chrome/browser/webdata/web_data_service_factory.cc +++ b/chrome/browser/webdata/web_data_service_factory.cc @@ -11,6 +11,8 @@ #include "chrome/browser/sync/glue/sync_start_util.h" #include "chrome/browser/ui/profile_error_dialog.h" #include "chrome/browser/webdata/autocomplete_syncable_service.h" +#include "chrome/browser/webdata/keyword_table.h" +#include "chrome/browser/webdata/keyword_web_data_service.h" #include "chrome/browser/webdata/logins_table.h" #include "chrome/browser/webdata/web_apps_table.h" #include "chrome/browser/webdata/web_data_service.h" @@ -20,8 +22,6 @@ #include "components/autofill/core/browser/webdata/autofill_table.h" #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" -#include "components/search_engines/keyword_table.h" -#include "components/search_engines/keyword_web_data_service.h" #include "components/signin/core/browser/webdata/token_service_table.h" #include "components/signin/core/browser/webdata/token_web_data.h" #include "components/webdata/common/webdata_constants.h" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 4a5147a..2d28625 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -1160,6 +1160,8 @@ 'browser/search_engines/chrome_template_url_service_client.h', 'browser/search_engines/default_search_pref_migration.cc', 'browser/search_engines/default_search_pref_migration.h', + 'browser/search_engines/search_host_to_urls_map.cc', + 'browser/search_engines/search_host_to_urls_map.h', 'browser/search_engines/search_provider_install_data.cc', 'browser/search_engines/search_provider_install_data.h', 'browser/search_engines/search_provider_install_state_message_filter.cc', @@ -1171,14 +1173,20 @@ 'browser/search_engines/template_url_fetcher_factory.h', 'browser/search_engines/template_url_parser.cc', 'browser/search_engines/template_url_parser.h', + 'browser/search_engines/template_url_service.cc', + 'browser/search_engines/template_url_service.h', 'browser/search_engines/template_url_service_android.cc', 'browser/search_engines/template_url_service_android.h', + 'browser/search_engines/template_url_service_client.h', 'browser/search_engines/template_url_service_factory.cc', 'browser/search_engines/template_url_service_factory.h', + 'browser/search_engines/template_url_service_observer.h', 'browser/search_engines/ui_thread_search_terms_data.cc', 'browser/search_engines/ui_thread_search_terms_data.h', 'browser/search_engines/ui_thread_search_terms_data_android.cc', 'browser/search_engines/ui_thread_search_terms_data_android.h', + 'browser/search_engines/util.cc', + 'browser/search_engines/util.h', 'browser/services/gcm/gcm_account_tracker.cc', 'browser/services/gcm/gcm_account_tracker.h', 'browser/services/gcm/gcm_profile_service.cc', @@ -1598,6 +1606,10 @@ 'browser/web_resource/web_resource_service.h', 'browser/webdata/autocomplete_syncable_service.cc', 'browser/webdata/autocomplete_syncable_service.h', + 'browser/webdata/keyword_table.cc', + 'browser/webdata/keyword_table.h', + 'browser/webdata/keyword_web_data_service.cc', + 'browser/webdata/keyword_web_data_service.h', 'browser/webdata/logins_table.cc', 'browser/webdata/logins_table.h', 'browser/webdata/logins_table_win.cc', diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc index ff06e5d..96465f0 100644 --- a/chrome/test/base/ui_test_utils.cc +++ b/chrome/test/base/ui_test_utils.cc @@ -32,6 +32,7 @@ #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/profiles/profile.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/app_modal_dialogs/app_modal_dialog.h" #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" @@ -52,7 +53,6 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/find_in_page_observer.h" #include "components/bookmarks/browser/bookmark_model.h" -#include "components/search_engines/template_url_service.h" #include "content/public/browser/dom_operation_notification_details.h" #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" diff --git a/components/search_engines.gypi b/components/search_engines.gypi index d0afdd5..21cf22f 100644 --- a/components/search_engines.gypi +++ b/components/search_engines.gypi @@ -11,20 +11,14 @@ '../base/base.gyp:base', '../google_apis/google_apis.gyp:google_apis', '../net/net.gyp:net', - '../sql/sql.gyp:sql', - '../sync/sync.gyp:sync', '../ui/gfx/gfx.gyp:gfx_geometry', '../url/url.gyp:url_lib', 'component_metrics_proto', 'components_strings.gyp:components_strings', 'google_core_browser', - 'keyed_service_core', 'policy', 'pref_registry', - 'rappor', 'search_engines/prepopulated_engines.gyp:prepopulated_engines', - 'url_fixer', - 'webdata_common', ], 'include_dirs': [ '..', @@ -34,17 +28,11 @@ 'search_engines/default_search_manager.h', 'search_engines/default_search_policy_handler.cc', 'search_engines/default_search_policy_handler.h', - 'search_engines/keyword_table.cc', - 'search_engines/keyword_table.h', - 'search_engines/keyword_web_data_service.cc', - 'search_engines/keyword_web_data_service.h', 'search_engines/search_engine_type.h', 'search_engines/search_engines_pref_names.cc', 'search_engines/search_engines_pref_names.h', 'search_engines/search_engines_switches.cc', 'search_engines/search_engines_switches.h', - 'search_engines/search_host_to_urls_map.cc', - 'search_engines/search_host_to_urls_map.h', 'search_engines/search_terms_data.cc', 'search_engines/search_terms_data.h', 'search_engines/template_url.cc', @@ -54,12 +42,6 @@ 'search_engines/template_url_id.h', 'search_engines/template_url_prepopulate_data.cc', 'search_engines/template_url_prepopulate_data.h', - 'search_engines/template_url_service.cc', - 'search_engines/template_url_service.h', - 'search_engines/template_url_service_client.h', - 'search_engines/template_url_service_observer.h', - 'search_engines/util.cc', - 'search_engines/util.h', ], }, ], diff --git a/components/search_engines/DEPS b/components/search_engines/DEPS index 492c393..c0bc5f0 100644 --- a/components/search_engines/DEPS +++ b/components/search_engines/DEPS @@ -1,18 +1,12 @@ include_rules = [ "+components/google/core", "+components/history/core", - "+components/keyed_service/core", "+components/metrics/proto", "+components/policy/core", "+components/pref_registry", - "+components/rappor", - "+components/url_fixer", - "+components/webdata", "+google_apis", "+grit/components_strings.h", "+net", "+policy", - "+sql", - "+sync", "+ui/gfx/geometry", ] diff --git a/components/webdata/DEPS b/components/webdata/DEPS index fd8d17b..7ca0452 100644 --- a/components/webdata/DEPS +++ b/components/webdata/DEPS @@ -7,6 +7,7 @@ specific_include_rules = { # TODO(caitkp): Extract unit tests from //chrome, at lower priority # than production code. r'(.*_unittest|.*_test_util)\.(cc|h)': [ + "+chrome/browser/webdata/keyword_table.h", "+chrome/browser/webdata/logins_table.h", "+chrome/browser/webdata/token_service_table.h", "+chrome/browser/webdata/token_web_data.h", @@ -15,7 +16,6 @@ specific_include_rules = { "+chrome/browser/webdata/web_data_service_factory.h", "+chrome/browser/webdata/web_intents_table.h", "+components/autofill/core", - "+components/search_engines/keyword_table.h", "+components/signin/core/browser/webdata", "+content/public/test", ], diff --git a/components/webdata/common/web_database_migration_unittest.cc b/components/webdata/common/web_database_migration_unittest.cc index 99a28f1..6f5dad1 100644 --- a/components/webdata/common/web_database_migration_unittest.cc +++ b/components/webdata/common/web_database_migration_unittest.cc @@ -16,6 +16,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "base/values.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" @@ -26,7 +27,6 @@ #include "components/autofill/core/browser/webdata/autofill_change.h" #include "components/autofill/core/browser/webdata/autofill_entry.h" #include "components/autofill/core/browser/webdata/autofill_table.h" -#include "components/search_engines/keyword_table.h" #include "components/signin/core/browser/webdata/token_service_table.h" #include "components/webdata/common/web_database.h" #include "sql/statement.h" |