Move google_util from components/google/browser to components/google/common so that it can be called in the renderer.
Bug: 841313
Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I751bf47bf452e6dc365939131fd1e95ceee64d50
Reviewed-on: https://chromium-review.googlesource.com/1152502
Reviewed-by: Peter Kasting <[email protected]>
Commit-Queue: John Abd-El-Malek <[email protected]>
Cr-Commit-Position: refs/heads/master@{#578523}diff --git a/android_webview/DEPS b/android_webview/DEPS
index b130967e..0b24be7 100644
--- a/android_webview/DEPS
+++ b/android_webview/DEPS
@@ -8,7 +8,7 @@
"-android_webview/lib",
"+components/heap_profiling",
- "+components/google/core/browser",
+ "+components/google/core",
"+components/network_session_configurator/common",
"+components/metrics",
"+components/prefs",
diff --git a/android_webview/browser/aw_contents_statics.cc b/android_webview/browser/aw_contents_statics.cc
index 76faeb22..1bee668 100644
--- a/android_webview/browser/aw_contents_statics.cc
+++ b/android_webview/browser/aw_contents_statics.cc
@@ -11,7 +11,7 @@
#include "base/android/jni_string.h"
#include "base/android/scoped_java_ref.h"
#include "base/callback.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/security_interstitials/core/urls.h"
#include "components/version_info/version_info.h"
#include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/android/signin/signin_manager_android.cc b/chrome/browser/android/signin/signin_manager_android.cc
index faa4ae1..f40471c 100644
--- a/chrome/browser/android/signin/signin_manager_android.cc
+++ b/chrome/browser/android/signin/signin_manager_android.cc
@@ -31,7 +31,7 @@
#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/common/pref_names.h"
#include "components/bookmarks/browser/bookmark_model.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/policy/core/browser/browser_policy_connector.h"
#include "components/policy/core/common/cloud/cloud_policy_core.h"
#include "components/policy/core/common/cloud/cloud_policy_store.h"
diff --git a/chrome/browser/android/url_utilities.cc b/chrome/browser/android/url_utilities.cc
index cd0eb2d..67f64570 100644
--- a/chrome/browser/android/url_utilities.cc
+++ b/chrome/browser/android/url_utilities.cc
@@ -7,7 +7,7 @@
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
#include "base/strings/string_util.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "jni/UrlUtilities_jni.h"
#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
#include "url/gurl.h"
diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc
index 762da37..f0b04c6b 100644
--- a/chrome/browser/autocomplete/search_provider_unittest.cc
+++ b/chrome/browser/autocomplete/search_provider_unittest.cc
@@ -29,7 +29,7 @@
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
-#include "components/google/core/browser/google_switches.h"
+#include "components/google/core/common/google_switches.h"
#include "components/history/core/browser/history_service.h"
#include "components/omnibox/browser/autocomplete_controller.h"
#include "components/omnibox/browser/autocomplete_input.h"
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 6787c04a..7c4d220 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -130,7 +130,7 @@
#include "components/component_updater/crl_set_remover.h"
#include "components/device_event_log/device_event_log.h"
#include "components/flags_ui/pref_service_flags_storage.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/language/content/browser/geo_language_provider.h"
#include "components/language/core/browser/pref_names.h"
#include "components/language/core/common/language_experiments.h"
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index f9429e57..da99f4c 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -177,7 +177,7 @@
#include "components/error_page/common/error_page_switches.h"
#include "components/feature_engagement/public/feature_constants.h"
#include "components/feature_engagement/public/feature_list.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/metrics/call_stack_profile_collector.h"
#include "components/metrics/client_info.h"
#include "components/nacl/common/buildflags.h"
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
index af00b53..692d89a 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -70,7 +70,7 @@
#include "chromeos/settings/cros_settings_names.h"
#include "components/account_id/account_id.h"
#include "components/arc/arc_util.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/policy/core/common/cloud/cloud_policy_client.h"
#include "components/policy/core/common/cloud/cloud_policy_core.h"
#include "components/policy/core/common/cloud/cloud_policy_store.h"
diff --git a/chrome/browser/chromeos/login/signin/merge_session_throttling_utils.cc b/chrome/browser/chromeos/login/signin/merge_session_throttling_utils.cc
index 06126f93c..85eb1b8 100644
--- a/chrome/browser/chromeos/login/signin/merge_session_throttling_utils.cc
+++ b/chrome/browser/chromeos/login/signin/merge_session_throttling_utils.cc
@@ -15,7 +15,7 @@
#include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
#include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"
#include "chrome/common/url_constants.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/user_manager/user_manager.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/download/download_commands.cc b/chrome/browser/download/download_commands.cc
index 3287104..71e66e5f 100644
--- a/chrome/browser/download/download_commands.cc
+++ b/chrome/browser/download/download_commands.cc
@@ -26,7 +26,7 @@
#include "chrome/common/safe_browsing/file_type_policies.h"
#include "chrome/common/url_constants.h"
#include "chrome/grit/theme_resources.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/safe_browsing/proto/csd.pb.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/download_item_utils.h"
diff --git a/chrome/browser/extensions/api/web_request/web_request_apitest.cc b/chrome/browser/extensions/api/web_request/web_request_apitest.cc
index 957b2763..f0ae264 100644
--- a/chrome/browser/extensions/api/web_request/web_request_apitest.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_apitest.cc
@@ -47,7 +47,7 @@
#include "chrome/test/base/search_test_utils.h"
#include "chrome/test/base/ui_test_utils.h"
#include "chromeos/login/scoped_test_public_session_login_state.h"
-#include "components/google/core/browser/google_switches.h"
+#include "components/google/core/common/google_switches.h"
#include "components/prefs/pref_service.h"
#include "components/proxy_config/proxy_config_dictionary.h"
#include "components/proxy_config/proxy_config_pref_names.h"
diff --git a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
index f77c238..64d56a6b 100644
--- a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
@@ -49,7 +49,7 @@
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h"
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_util.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/nacl/common/buildflags.h"
#include "components/offline_pages/buildflags/buildflags.h"
#include "components/offline_pages/core/request_header/offline_page_navigation_ui_data.h"
diff --git a/chrome/browser/net/dns_probe_browsertest.cc b/chrome/browser/net/dns_probe_browsertest.cc
index 31235f30..23c3655 100644
--- a/chrome/browser/net/dns_probe_browsertest.cc
+++ b/chrome/browser/net/dns_probe_browsertest.cc
@@ -23,7 +23,7 @@
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
#include "components/error_page/common/net_error_info.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/prefs/pref_service.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/net/errorpage_browsertest.cc b/chrome/browser/net/errorpage_browsertest.cc
index 5503482..4747d485 100644
--- a/chrome/browser/net/errorpage_browsertest.cc
+++ b/chrome/browser/net/errorpage_browsertest.cc
@@ -38,7 +38,7 @@
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
#include "components/error_page/common/error_page_switches.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/policy/core/browser/browser_policy_connector.h"
#include "components/policy/core/common/mock_configuration_policy_provider.h"
#include "components/policy/core/common/policy_map.h"
diff --git a/chrome/browser/net/safe_search_util.cc b/chrome/browser/net/safe_search_util.cc
index ba59b77..7ee7bd1d 100644
--- a/chrome/browser/net/safe_search_util.cc
+++ b/chrome/browser/net/safe_search_util.cc
@@ -15,7 +15,7 @@
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "chrome/common/url_constants.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "net/cookies/cookie_util.h"
#include "net/http/http_request_headers.h"
#include "net/url_request/url_request.h"
diff --git a/chrome/browser/page_load_metrics/observers/amp_page_load_metrics_observer.cc b/chrome/browser/page_load_metrics/observers/amp_page_load_metrics_observer.cc
index 9e41297..89cc069 100644
--- a/chrome/browser/page_load_metrics/observers/amp_page_load_metrics_observer.cc
+++ b/chrome/browser/page_load_metrics/observers/amp_page_load_metrics_observer.cc
@@ -11,7 +11,7 @@
#include "base/time/time.h"
#include "chrome/browser/page_load_metrics/page_load_metrics_util.h"
#include "chrome/common/page_load_metrics/page_load_timing.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "content/public/browser/navigation_handle.h"
#include "url/gurl.h"
diff --git a/chrome/browser/plugins/plugin_infobar_delegates.cc b/chrome/browser/plugins/plugin_infobar_delegates.cc
index 86cab4ce..e564fa0 100644
--- a/chrome/browser/plugins/plugin_infobar_delegates.cc
+++ b/chrome/browser/plugins/plugin_infobar_delegates.cc
@@ -23,7 +23,7 @@
#include "chrome/common/buildflags.h"
#include "chrome/common/url_constants.h"
#include "chrome/grit/generated_resources.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/infobars/core/infobar.h"
#include "components/strings/grit/components_strings.h"
#include "content/public/browser/render_process_host.h"
diff --git a/chrome/browser/prerender/prerender_histograms.cc b/chrome/browser/prerender/prerender_histograms.cc
index 389dea9..1469fccf 100644
--- a/chrome/browser/prerender/prerender_histograms.cc
+++ b/chrome/browser/prerender/prerender_histograms.cc
@@ -14,7 +14,7 @@
#include "base/strings/stringprintf.h"
#include "chrome/browser/prerender/prerender_manager.h"
#include "chrome/common/prerender_util.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "net/http/http_cache.h"
namespace prerender {
diff --git a/chrome/browser/prerender/prerender_util.cc b/chrome/browser/prerender/prerender_util.cc
index 9ed46b8..8451c3a 100644
--- a/chrome/browser/prerender/prerender_util.cc
+++ b/chrome/browser/prerender/prerender_util.cc
@@ -5,7 +5,7 @@
#include "chrome/browser/prerender/prerender_util.h"
#include "base/metrics/histogram_macros.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "extensions/buildflags/buildflags.h"
#include "url/gurl.h"
diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc
index 34fb495..1186955 100644
--- a/chrome/browser/printing/print_dialog_cloud.cc
+++ b/chrome/browser/printing/print_dialog_cloud.cc
@@ -13,7 +13,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_window.h"
#include "components/cloud_devices/common/cloud_devices_urls.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/signin/core/browser/profile_management_switches.h"
#include "components/signin/core/browser/signin_header_helper.h"
#include "components/signin/core/browser/signin_metrics.h"
diff --git a/chrome/browser/printing/print_dialog_cloud_win.cc b/chrome/browser/printing/print_dialog_cloud_win.cc
index baecdb40..855485a 100644
--- a/chrome/browser/printing/print_dialog_cloud_win.cc
+++ b/chrome/browser/printing/print_dialog_cloud_win.cc
@@ -26,7 +26,7 @@
#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
#include "chrome/common/chrome_switches.h"
#include "components/cloud_devices/common/cloud_devices_urls.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/message_port_provider.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 90a4d37..1bc3fb0 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -79,7 +79,7 @@
#include "components/autofill/core/common/password_generation_util.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_headers.h"
#include "components/download/public/common/download_url_parameters.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/guest_view/browser/guest_view_base.h"
#include "components/language/core/browser/language_model_manager.h"
#include "components/omnibox/browser/autocomplete_classifier.h"
diff --git a/chrome/browser/rlz/chrome_rlz_tracker_delegate.cc b/chrome/browser/rlz/chrome_rlz_tracker_delegate.cc
index fd274a5..78d7336 100644
--- a/chrome/browser/rlz/chrome_rlz_tracker_delegate.cc
+++ b/chrome/browser/rlz/chrome_rlz_tracker_delegate.cc
@@ -16,7 +16,7 @@
#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/google/core/common/google_util.h"
#include "components/omnibox/browser/omnibox_log.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/prefs/pref_service.h"
diff --git a/chrome/browser/safe_browsing/chrome_password_protection_service.cc b/chrome/browser/safe_browsing/chrome_password_protection_service.cc
index 3a59ec65..6b00cabd2 100644
--- a/chrome/browser/safe_browsing/chrome_password_protection_service.cc
+++ b/chrome/browser/safe_browsing/chrome_password_protection_service.cc
@@ -29,7 +29,7 @@
#include "chrome/common/url_constants.h"
#include "components/browser_sync/profile_sync_service.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/password_manager/core/browser/hash_password_manager.h"
#include "components/password_manager/core/browser/password_store.h"
#include "components/password_manager/core/common/password_manager_pref_names.h"
diff --git a/chrome/browser/safe_browsing/download_protection/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection/download_protection_service.cc
index aba4d424..359bd70 100644
--- a/chrome/browser/safe_browsing/download_protection/download_protection_service.cc
+++ b/chrome/browser/safe_browsing/download_protection/download_protection_service.cc
@@ -21,7 +21,7 @@
#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/common/safe_browsing/binary_feature_extractor.h"
#include "chrome/common/url_constants.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/safe_browsing/common/safebrowsing_switches.h"
#include "components/signin/core/browser/signin_manager.h"
#include "content/public/browser/browser_context.h"
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
index 7fc6ac4..736d545 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
@@ -39,7 +39,7 @@
#include "chrome/common/url_constants.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/prefs/pref_service.h"
#include "components/safe_browsing/browser/threat_details.h"
#include "components/safe_browsing/common/safe_browsing.mojom.h"
diff --git a/chrome/browser/safe_browsing/safe_browsing_util.cc b/chrome/browser/safe_browsing/safe_browsing_util.cc
index 11e5868..6a5b2dd 100644
--- a/chrome/browser/safe_browsing/safe_browsing_util.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_util.cc
@@ -8,7 +8,7 @@
#include "base/strings/string_util.h"
#include "chrome/browser/safe_browsing/chunk.pb.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
namespace safe_browsing {
diff --git a/chrome/browser/search/one_google_bar/one_google_bar_loader_impl.cc b/chrome/browser/search/one_google_bar/one_google_bar_loader_impl.cc
index f631ea4..df6f5cd 100644
--- a/chrome/browser/search/one_google_bar/one_google_bar_loader_impl.cc
+++ b/chrome/browser/search/one_google_bar/one_google_bar_loader_impl.cc
@@ -15,7 +15,7 @@
#include "chrome/common/chrome_content_client.h"
#include "chrome/common/webui_url_constants.h"
#include "components/google/core/browser/google_url_tracker.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/signin/core/browser/chrome_connected_header_helper.h"
#include "components/signin/core/browser/signin_header_helper.h"
#include "components/variations/net/variations_http_headers.h"
diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
index 05ca70f..bd26831 100644
--- a/chrome/browser/search/search.cc
+++ b/chrome/browser/search/search.cc
@@ -16,7 +16,7 @@
#include "chrome/common/chrome_features.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/url_constants.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/search/search.h"
#include "components/search_engines/search_engine_type.h"
#include "components/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 a815d8e9..df23c7b 100644
--- a/chrome/browser/search_engines/template_url_service_android.cc
+++ b/chrome/browser/search_engines/template_url_service_android.cc
@@ -17,7 +17,7 @@
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/search_engines/template_url_android.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.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"
diff --git a/chrome/browser/search_engines/ui_thread_search_terms_data.cc b/chrome/browser/search_engines/ui_thread_search_terms_data.cc
index 34b5430..9847903a 100644
--- a/chrome/browser/search_engines/ui_thread_search_terms_data.cc
+++ b/chrome/browser/search_engines/ui_thread_search_terms_data.cc
@@ -14,7 +14,7 @@
#include "chrome/common/channel_info.h"
#include "chrome/common/chrome_switches.h"
#include "components/google/core/browser/google_url_tracker.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/version_info/version_info.h"
#include "content/public/browser/browser_thread.h"
#include "rlz/buildflags/buildflags.h"
diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc
index 4418135..70cf84e 100644
--- a/chrome/browser/signin/signin_promo.cc
+++ b/chrome/browser/signin/signin_promo.cc
@@ -24,7 +24,7 @@
#include "chrome/common/chrome_features.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/prefs/pref_service.h"
#include "components/signin/core/browser/account_tracker_service.h"
diff --git a/chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc b/chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc
index 2854fac..193531f 100644
--- a/chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc
+++ b/chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc
@@ -11,7 +11,7 @@
#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/browser/supervised_user/child_accounts/child_account_service.h"
#include "chrome/browser/supervised_user/child_accounts/child_account_service_factory.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/signin/core/browser/signin_manager.h"
#include "content/public/browser/navigation_handle.h"
#include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index ff9edd8..ef0f25a 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -64,7 +64,7 @@
#include "components/bookmarks/common/bookmark_pref_names.h"
#include "components/favicon/content/content_favicon_driver.h"
#include "components/feature_engagement/buildflags.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/prefs/pref_service.h"
#include "components/sessions/core/live_tab_context.h"
#include "components/sessions/core/tab_restore_service.h"
diff --git a/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc b/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc
index 0d47d4f..88e1f37 100644
--- a/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc
+++ b/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc
@@ -10,7 +10,7 @@
#include "chrome/browser/ui/chrome_pages.h"
#include "chrome/browser/ui/tab_dialogs.h"
#include "chrome/common/url_constants.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/subresource_filter/core/browser/subresource_filter_constants.h"
// The URL for when the user clicks "learn more" on the mixed scripting page
diff --git a/chrome/browser/ui/navigation_correction_tab_observer.cc b/chrome/browser/ui/navigation_correction_tab_observer.cc
index 40e4819..deb42bc 100644
--- a/chrome/browser/ui/navigation_correction_tab_observer.cc
+++ b/chrome/browser/ui/navigation_correction_tab_observer.cc
@@ -12,7 +12,7 @@
#include "chrome/common/navigation_corrector.mojom.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/render_messages.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/prefs/pref_service.h"
#include "content/public/browser/render_frame_host.h"
diff --git a/chrome/browser/ui/search/search_tab_helper.cc b/chrome/browser/ui/search/search_tab_helper.cc
index fd29d598..7361336 100644
--- a/chrome/browser/ui/search/search_tab_helper.cc
+++ b/chrome/browser/ui/search/search_tab_helper.cc
@@ -27,7 +27,7 @@
#include "chrome/common/url_constants.h"
#include "chrome/grit/generated_resources.h"
#include "components/browser_sync/profile_sync_service.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/omnibox/browser/omnibox_edit_model.h"
#include "components/omnibox/browser/omnibox_popup_model.h"
#include "components/omnibox/browser/omnibox_view.h"
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
index 66a387a..4d42c78 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -97,7 +97,7 @@
#endif // defined(OS_WIN)
#if BUILDFLAG(ENABLE_RLZ)
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/rlz/rlz_tracker.h" // nogncheck
#endif
diff --git a/chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.cc b/chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.cc
index e7571f6..894ff1f9 100644
--- a/chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.cc
+++ b/chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.cc
@@ -12,7 +12,7 @@
#include "chrome/browser/ssl/security_state_tab_helper.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/offline_pages/buildflags/buildflags.h"
#include "components/omnibox/browser/autocomplete_input.h"
#include "components/prefs/pref_service.h"
diff --git a/chrome/browser/ui/views/sync/one_click_signin_dialog_view.cc b/chrome/browser/ui/views/sync/one_click_signin_dialog_view.cc
index 44c3c2b..6069e44 100644
--- a/chrome/browser/ui/views/sync/one_click_signin_dialog_view.cc
+++ b/chrome/browser/ui/views/sync/one_click_signin_dialog_view.cc
@@ -15,7 +15,7 @@
#include "chrome/grit/chromium_strings.h"
#include "chrome/grit/generated_resources.h"
#include "components/constrained_window/constrained_window_views.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/strings/grit/components_strings.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc
index c733a9e..88213e3 100644
--- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
+++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
@@ -23,7 +23,7 @@
#include "chrome/grit/extensions_resources_map.h"
#include "chrome/grit/generated_resources.h"
#include "chrome/grit/theme_resources.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/prefs/pref_service.h"
#include "components/strings/grit/components_strings.h"
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
index 3c2af7b1..fdc5098 100644
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -32,7 +32,7 @@
#include "chrome/grit/generated_resources.h"
#include "chrome/grit/theme_resources.h"
#include "components/bookmarks/common/bookmark_pref_names.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/prefs/pref_service.h"
#include "components/strings/grit/components_strings.h"
#include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/ui/webui/settings/about_handler.cc b/chrome/browser/ui/webui/settings/about_handler.cc
index 6683c9e..fd36a556 100644
--- a/chrome/browser/ui/webui/settings/about_handler.cc
+++ b/chrome/browser/ui/webui/settings/about_handler.cc
@@ -37,7 +37,7 @@
#include "chrome/common/url_constants.h"
#include "chrome/grit/chromium_strings.h"
#include "chrome/grit/generated_resources.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/policy/core/common/policy_namespace.h"
#include "components/policy/policy_constants.h"
#include "components/strings/grit/components_chromium_strings.h"
diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
index 149634cb..8b6355b 100644
--- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
@@ -30,7 +30,7 @@
#include "components/autofill/core/browser/payments/payments_service_url.h"
#include "components/autofill/core/common/autofill_constants.h"
#include "components/content_settings/core/common/features.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/omnibox/browser/omnibox_field_trial.h"
#include "components/password_manager/core/common/password_manager_features.h"
#include "components/safe_browsing/common/safe_browsing_prefs.h"
diff --git a/chrome/browser/ui/webui/settings/protocol_handlers_handler.cc b/chrome/browser/ui/webui/settings/protocol_handlers_handler.cc
index 1f486d9..e91b7de8 100644
--- a/chrome/browser/ui/webui/settings/protocol_handlers_handler.cc
+++ b/chrome/browser/ui/webui/settings/protocol_handlers_handler.cc
@@ -17,7 +17,7 @@
#include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/url_constants.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/prefs/pref_service.h"
#include "content/public/browser/web_ui.h"
diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc
index 5aba7401..466f44c 100644
--- a/chrome/test/base/in_process_browser_test.cc
+++ b/chrome/test/base/in_process_browser_test.cc
@@ -53,7 +53,7 @@
#include "chrome/test/base/chrome_test_suite.h"
#include "chrome/test/base/test_launcher_utils.h"
#include "chrome/test/base/testing_browser_process.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/os_crypt/os_crypt_mocker.h"
#include "content/public/browser/devtools_agent_host.h"
#include "content/public/browser/notification_service.h"
diff --git a/components/arc/intent_helper/DEPS b/components/arc/intent_helper/DEPS
index 18765ba0..8deb491 100644
--- a/components/arc/intent_helper/DEPS
+++ b/components/arc/intent_helper/DEPS
@@ -5,7 +5,7 @@
"+ash/public",
"+ash/shell.h",
"+ash/shell_delegate.h",
- "+components/google/core/browser",
+ "+components/google/core",
"+components/url_formatter",
"+content/public/common/service_manager_connection.h",
"+services/service_manager/public/cpp/connector.h",
diff --git a/components/arc/intent_helper/link_handler_model.cc b/components/arc/intent_helper/link_handler_model.cc
index 748515b5..5d045f8 100644
--- a/components/arc/intent_helper/link_handler_model.cc
+++ b/components/arc/intent_helper/link_handler_model.cc
@@ -12,7 +12,7 @@
#include "components/arc/arc_bridge_service.h"
#include "components/arc/arc_service_manager.h"
#include "components/arc/intent_helper/arc_intent_helper_bridge.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "url/url_util.h"
namespace arc {
diff --git a/components/google/DEPS b/components/google/DEPS
index 21c1e50..683dd04 100644
--- a/components/google/DEPS
+++ b/components/google/DEPS
@@ -1,5 +1,4 @@
include_rules = [
- "+components/prefs",
"+components/url_formatter",
"+net",
]
diff --git a/components/google/core/browser/BUILD.gn b/components/google/core/browser/BUILD.gn
index 5585b30..c107f106 100644
--- a/components/google/core/browser/BUILD.gn
+++ b/components/google/core/browser/BUILD.gn
@@ -6,21 +6,16 @@
sources = [
"google_pref_names.cc",
"google_pref_names.h",
- "google_switches.cc",
- "google_switches.h",
- "google_tld_list.h",
"google_url_tracker.cc",
"google_url_tracker.h",
"google_url_tracker_client.cc",
"google_url_tracker_client.h",
- "google_util.cc",
- "google_util.h",
]
public_deps = [
"//base",
+ "//components/google/core/common",
"//components/keyed_service/core",
- "//net",
"//url",
]
@@ -29,7 +24,6 @@
"//components/pref_registry",
"//components/prefs",
"//components/strings",
- "//components/url_formatter",
"//services/network/public/cpp",
"//services/network/public/mojom",
]
diff --git a/components/google/core/browser/DEPS b/components/google/core/browser/DEPS
index 1b29f86..fd80fa9 100644
--- a/components/google/core/browser/DEPS
+++ b/components/google/core/browser/DEPS
@@ -1,6 +1,7 @@
include_rules = [
"+components/data_use_measurement/core",
"+components/keyed_service/core",
+ "+components/prefs",
"+components/pref_registry",
"+services/network/public",
"+services/network/test",
diff --git a/components/google/core/browser/google_tld_list.h b/components/google/core/browser/google_tld_list.h
deleted file mode 100644
index 99d618b..0000000
--- a/components/google/core/browser/google_tld_list.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2016 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_GOOGLE_CORE_BROWSER_GOOGLE_TLD_LIST_H_
-#define COMPONENTS_GOOGLE_CORE_BROWSER_GOOGLE_TLD_LIST_H_
-
-// DO NOT EDIT. This file is generated by a script. See crbug.com/674712
-// for details.
-
-#define GOOGLE_TLD_LIST "ac", "ad", "ae", "af", "ag", "al", "am", "as", "at", \
-"aw", "az", "ba", "be", "bf", "bg", "bi", "bj", "bm", "bn", "bo", "bs", "bt", \
-"by", "ca", "cat", "cc", "cd", "cf", "cg", "ch", "ci", "cl", "cm", "cn", "co", \
-"co.ao", "co.bw", "co.ck", "co.cr", "co.gy", "co.hu", "co.id", "co.il", \
-"co.im", "co.in", "co.je", "co.jp", "co.ke", "co.kr", "co.ls", "co.ma", \
-"co.mz", "co.nz", "co.rs", "co.th", "co.tz", "co.ug", "co.uk", "co.uz", \
-"co.ve", "co.vi", "co.za", "co.zm", "co.zw", "com", "com.af", "com.ag", \
-"com.ai", "com.ar", "com.au", "com.bd", "com.bh", "com.bi", "com.bn", \
-"com.bo", "com.br", "com.by", "com.bz", "com.cn", "com.co", "com.cu", \
-"com.cy", "com.do", "com.dz", "com.ec", "com.eg", "com.er", "com.et", \
-"com.fj", "com.ge", "com.gh", "com.gi", "com.gp", "com.gr", "com.gt", \
-"com.gy", "com.hk", "com.ht", "com.iq", "com.jm", "com.jo", "com.kh", \
-"com.kw", "com.kz", "com.lb", "com.lv", "com.ly", "com.mm", "com.mt", \
-"com.mx", "com.my", "com.na", "com.nc", "com.nf", "com.ng", "com.ni", \
-"com.np", "com.nr", "com.om", "com.pa", "com.pe", "com.pg", "com.ph", \
-"com.pk", "com.pl", "com.pr", "com.ps", "com.pt", "com.py", "com.qa", \
-"com.ru", "com.sa", "com.sb", "com.sg", "com.sl", "com.sv", "com.tj", \
-"com.tm", "com.tn", "com.tr", "com.tw", "com.ua", "com.uy", "com.vc", \
-"com.ve", "com.vn", "cv", "cz", "de", "dj", "dk", "dm", "do", "dz", "ec", \
-"ee", "es", "eu", "fi", "fm", "fr", "ga", "gd", "ge", "gf", "gg", "gl", "gm", \
-"gp", "gr", "gw", "gy", "hk", "hn", "hr", "ht", "hu", "ie", "im", "in", \
-"info", "io", "iq", "is", "it", "it.ao", "je", "jo", "jobs", "jp", "kg", "ki", \
-"km", "kr", "kz", "la", "li", "lk", "lt", "lu", "lv", "ma", "md", "me", "mg", \
-"mh", "mk", "ml", "mn", "mr", "ms", "mu", "mv", "mw", "mx", "ne", "ne.jp", \
-"net", "ng", "nl", "no", "nr", "nu", "off.ai", "org", "pf", "ph", "pk", "pl", \
-"pn", "ps", "pt", "qa", "re", "ro", "rs", "ru", "rw", "sc", "se", "sg", "sh", \
-"si", "sk", "sl", "sm", "sn", "so", "sr", "st", "sz", "td", "tel", "tg", "tk", \
-"tl", "tm", "tn", "to", "tt", "tw", "ua", "us", "uz", "vg", "vn", "vu", "ws", \
-"yt"
-
-#endif // COMPONENTS_GOOGLE_CORE_BROWSER_GOOGLE_TLD_LIST_H_
-
diff --git a/components/google/core/browser/google_url_tracker.cc b/components/google/core/browser/google_url_tracker.cc
index 133dbfe..8a3f41e 100644
--- a/components/google/core/browser/google_url_tracker.cc
+++ b/components/google/core/browser/google_url_tracker.cc
@@ -15,8 +15,8 @@
#include "base/threading/thread_task_runner_handle.h"
#include "components/data_use_measurement/core/data_use_user_data.h"
#include "components/google/core/browser/google_pref_names.h"
-#include "components/google/core/browser/google_switches.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_switches.h"
+#include "components/google/core/common/google_util.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/prefs/pref_service.h"
#include "net/base/load_flags.h"
diff --git a/components/google/core/browser/google_util_unittest.cc b/components/google/core/browser/google_util_unittest.cc
index 477d3ae..a6ef4c5 100644
--- a/components/google/core/browser/google_util_unittest.cc
+++ b/components/google/core/browser/google_util_unittest.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "components/google/core/common/google_util.h"
#include "base/command_line.h"
#include "base/macros.h"
#include "base/strings/stringprintf.h"
-#include "components/google/core/browser/google_switches.h"
#include "components/google/core/browser/google_url_tracker.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_switches.h"
#include "testing/gtest/include/gtest/gtest.h"
using google_util::IsGoogleDomainUrl;
diff --git a/components/google/core/common/BUILD.gn b/components/google/core/common/BUILD.gn
new file mode 100644
index 0000000..d558cb1
--- /dev/null
+++ b/components/google/core/common/BUILD.gn
@@ -0,0 +1,22 @@
+# Copyright 2018 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.
+
+static_library("common") {
+ sources = [
+ "google_switches.cc",
+ "google_switches.h",
+ "google_tld_list.h",
+ "google_util.cc",
+ "google_util.h",
+ ]
+
+ public_deps = [
+ "//base",
+ "//net",
+ ]
+
+ deps = [
+ "//components/url_formatter",
+ ]
+}
diff --git a/components/google/core/browser/google_switches.cc b/components/google/core/common/google_switches.cc
similarity index 70%
rename from components/google/core/browser/google_switches.cc
rename to components/google/core/common/google_switches.cc
index 2daf836..4fbc0dc 100644
--- a/components/google/core/browser/google_switches.cc
+++ b/components/google/core/common/google_switches.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 "components/google/core/browser/google_switches.h"
+#include "components/google/core/common/google_switches.h"
namespace switches {
// Specifies an alternate URL to use for speaking to Google. Useful for testing.
-const char kGoogleBaseURL[] = "google-base-url";
+const char kGoogleBaseURL[] = "google-base-url";
} // namespace switches
diff --git a/components/google/core/browser/google_switches.h b/components/google/core/common/google_switches.h
similarity index 68%
rename from components/google/core/browser/google_switches.h
rename to components/google/core/common/google_switches.h
index eadc91a..43e8239a 100644
--- a/components/google/core/browser/google_switches.h
+++ b/components/google/core/common/google_switches.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_GOOGLE_CORE_BROWSER_GOOGLE_SWITCHES_H_
-#define COMPONENTS_GOOGLE_CORE_BROWSER_GOOGLE_SWITCHES_H_
+#ifndef COMPONENTS_GOOGLE_CORE_COMMON_GOOGLE_SWITCHES_H_
+#define COMPONENTS_GOOGLE_CORE_COMMON_GOOGLE_SWITCHES_H_
namespace switches {
@@ -13,4 +13,4 @@
} // namespace switches
-#endif // COMPONENTS_GOOGLE_CORE_BROWSER_GOOGLE_SWITCHES_H_
+#endif // COMPONENTS_GOOGLE_CORE_COMMON_GOOGLE_SWITCHES_H_
diff --git a/components/google/core/common/google_tld_list.h b/components/google/core/common/google_tld_list.h
new file mode 100644
index 0000000..ce6277d5
--- /dev/null
+++ b/components/google/core/common/google_tld_list.h
@@ -0,0 +1,42 @@
+// Copyright 2016 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_GOOGLE_CORE_COMMON_GOOGLE_TLD_LIST_H_
+#define COMPONENTS_GOOGLE_CORE_COMMON_GOOGLE_TLD_LIST_H_
+
+// DO NOT EDIT. This file is generated by a script. See crbug.com/674712
+// for details.
+
+#define GOOGLE_TLD_LIST \
+ "ac", "ad", "ae", "af", "ag", "al", "am", "as", "at", "aw", "az", "ba", \
+ "be", "bf", "bg", "bi", "bj", "bm", "bn", "bo", "bs", "bt", "by", "ca", \
+ "cat", "cc", "cd", "cf", "cg", "ch", "ci", "cl", "cm", "cn", "co", \
+ "co.ao", "co.bw", "co.ck", "co.cr", "co.gy", "co.hu", "co.id", "co.il", \
+ "co.im", "co.in", "co.je", "co.jp", "co.ke", "co.kr", "co.ls", "co.ma", \
+ "co.mz", "co.nz", "co.rs", "co.th", "co.tz", "co.ug", "co.uk", "co.uz", \
+ "co.ve", "co.vi", "co.za", "co.zm", "co.zw", "com", "com.af", "com.ag", \
+ "com.ai", "com.ar", "com.au", "com.bd", "com.bh", "com.bi", "com.bn", \
+ "com.bo", "com.br", "com.by", "com.bz", "com.cn", "com.co", "com.cu", \
+ "com.cy", "com.do", "com.dz", "com.ec", "com.eg", "com.er", "com.et", \
+ "com.fj", "com.ge", "com.gh", "com.gi", "com.gp", "com.gr", "com.gt", \
+ "com.gy", "com.hk", "com.ht", "com.iq", "com.jm", "com.jo", "com.kh", \
+ "com.kw", "com.kz", "com.lb", "com.lv", "com.ly", "com.mm", "com.mt", \
+ "com.mx", "com.my", "com.na", "com.nc", "com.nf", "com.ng", "com.ni", \
+ "com.np", "com.nr", "com.om", "com.pa", "com.pe", "com.pg", "com.ph", \
+ "com.pk", "com.pl", "com.pr", "com.ps", "com.pt", "com.py", "com.qa", \
+ "com.ru", "com.sa", "com.sb", "com.sg", "com.sl", "com.sv", "com.tj", \
+ "com.tm", "com.tn", "com.tr", "com.tw", "com.ua", "com.uy", "com.vc", \
+ "com.ve", "com.vn", "cv", "cz", "de", "dj", "dk", "dm", "do", "dz", \
+ "ec", "ee", "es", "eu", "fi", "fm", "fr", "ga", "gd", "ge", "gf", "gg", \
+ "gl", "gm", "gp", "gr", "gw", "gy", "hk", "hn", "hr", "ht", "hu", "ie", \
+ "im", "in", "info", "io", "iq", "is", "it", "it.ao", "je", "jo", "jobs", \
+ "jp", "kg", "ki", "km", "kr", "kz", "la", "li", "lk", "lt", "lu", "lv", \
+ "ma", "md", "me", "mg", "mh", "mk", "ml", "mn", "mr", "ms", "mu", "mv", \
+ "mw", "mx", "ne", "ne.jp", "net", "ng", "nl", "no", "nr", "nu", \
+ "off.ai", "org", "pf", "ph", "pk", "pl", "pn", "ps", "pt", "qa", "re", \
+ "ro", "rs", "ru", "rw", "sc", "se", "sg", "sh", "si", "sk", "sl", "sm", \
+ "sn", "so", "sr", "st", "sz", "td", "tel", "tg", "tk", "tl", "tm", "tn", \
+ "to", "tt", "tw", "ua", "us", "uz", "vg", "vn", "vu", "ws", "yt"
+
+#endif // COMPONENTS_GOOGLE_CORE_COMMON_GOOGLE_TLD_LIST_H_
diff --git a/components/google/core/browser/google_util.cc b/components/google/core/common/google_util.cc
similarity index 95%
rename from components/google/core/browser/google_util.cc
rename to components/google/core/common/google_util.cc
index 5d712f7..c01ba58 100644
--- a/components/google/core/browser/google_util.cc
+++ b/components/google/core/common/google_util.cc
@@ -2,23 +2,24 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include <stddef.h>
+#include <set>
#include <string>
#include <vector>
#include "base/command_line.h"
#include "base/macros.h"
+#include "base/stl_util.h"
#include "base/strings/string16.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
-#include "components/google/core/browser/google_switches.h"
-#include "components/google/core/browser/google_tld_list.h"
-#include "components/google/core/browser/google_url_tracker.h"
+#include "components/google/core/common/google_switches.h"
+#include "components/google/core/common/google_tld_list.h"
#include "components/url_formatter/url_fixer.h"
#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
#include "net/base/url_util.h"
@@ -166,8 +167,8 @@
GURL AppendGoogleLocaleParam(const GURL& url,
const std::string& application_locale) {
- return net::AppendQueryParameter(
- url, "hl", GetGoogleLocale(application_locale));
+ return net::AppendQueryParameter(url, "hl",
+ GetGoogleLocale(application_locale));
}
std::string GetGoogleCountryCode(const GURL& google_homepage_url) {
@@ -271,15 +272,15 @@
// Check for query parameter in URL parameter and hash fragment, depending on
// the path type.
return HasGoogleSearchQueryParam(url.ref_piece()) ||
- (!is_home_page_base && HasGoogleSearchQueryParam(url.query_piece()));
+ (!is_home_page_base && HasGoogleSearchQueryParam(url.query_piece()));
}
bool IsYoutubeDomainUrl(const GURL& url,
SubdomainPermission subdomain_permission,
PortPermission port_permission) {
return IsValidURL(url, port_permission) &&
- IsValidHostName(url.host_piece(), "youtube", subdomain_permission,
- nullptr);
+ IsValidHostName(url.host_piece(), "youtube", subdomain_permission,
+ nullptr);
}
const std::vector<std::string>& GetGoogleRegistrableDomains() {
diff --git a/components/google/core/browser/google_util.h b/components/google/core/common/google_util.h
similarity index 96%
rename from components/google/core/browser/google_util.h
rename to components/google/core/common/google_util.h
index 77ded28..cf768d66 100644
--- a/components/google/core/browser/google_util.h
+++ b/components/google/core/common/google_util.h
@@ -4,8 +4,8 @@
//
// Some Google related utility functions.
-#ifndef COMPONENTS_GOOGLE_CORE_BROWSER_GOOGLE_UTIL_H_
-#define COMPONENTS_GOOGLE_CORE_BROWSER_GOOGLE_UTIL_H_
+#ifndef COMPONENTS_GOOGLE_CORE_COMMON_GOOGLE_UTIL_H_
+#define COMPONENTS_GOOGLE_CORE_COMMON_GOOGLE_UTIL_H_
#include <string>
#include <vector>
@@ -116,4 +116,4 @@
} // namespace google_util
-#endif // COMPONENTS_GOOGLE_CORE_BROWSER_GOOGLE_UTIL_H_
+#endif // COMPONENTS_GOOGLE_CORE_COMMON_GOOGLE_UTIL_H_
diff --git a/components/history/core/browser/BUILD.gn b/components/history/core/browser/BUILD.gn
index b0d5360..7f6bbb3 100644
--- a/components/history/core/browser/BUILD.gn
+++ b/components/history/core/browser/BUILD.gn
@@ -105,7 +105,7 @@
"//base:i18n",
"//components/data_use_measurement/core",
"//components/favicon_base",
- "//components/google/core/browser",
+ "//components/google/core/common",
"//components/history/core/common",
"//components/keyed_service/core",
"//components/prefs",
diff --git a/components/history/core/browser/DEPS b/components/history/core/browser/DEPS
index 26e3a1cc..1553d3ec 100644
--- a/components/history/core/browser/DEPS
+++ b/components/history/core/browser/DEPS
@@ -1,6 +1,6 @@
include_rules = [
"+components/data_use_measurement/core",
- "+components/google/core/browser/google_util.h",
+ "+components/google/core/common/google_util.h",
"+components/variations",
"+services/identity/public",
]
diff --git a/components/history/core/browser/visit_database.cc b/components/history/core/browser/visit_database.cc
index 785f197..cf76ed7 100644
--- a/components/history/core/browser/visit_database.cc
+++ b/components/history/core/browser/visit_database.cc
@@ -17,7 +17,7 @@
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "base/time/time.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/history/core/browser/history_backend.h"
#include "components/history/core/browser/url_database.h"
#include "sql/statement.h"
diff --git a/components/ntp_tiles/DEPS b/components/ntp_tiles/DEPS
index 5339a09..bdfe17c 100644
--- a/components/ntp_tiles/DEPS
+++ b/components/ntp_tiles/DEPS
@@ -2,7 +2,7 @@
"+components/data_use_measurement/core",
"+components/favicon",
"+components/favicon_base",
- "+components/google/core/browser",
+ "+components/google/core",
"+components/grit",
"+components/image_fetcher",
"+components/history/core/browser",
diff --git a/components/ntp_tiles/popular_sites_impl.cc b/components/ntp_tiles/popular_sites_impl.cc
index 6f4f99f..75f9baf 100644
--- a/components/ntp_tiles/popular_sites_impl.cc
+++ b/components/ntp_tiles/popular_sites_impl.cc
@@ -20,7 +20,7 @@
#include "base/values.h"
#include "build/build_config.h"
#include "components/data_use_measurement/core/data_use_user_data.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/ntp_tiles/constants.h"
#include "components/ntp_tiles/pref_names.h"
#include "components/ntp_tiles/switches.h"
diff --git a/components/policy/core/browser/DEPS b/components/policy/core/browser/DEPS
index 9f5ba78b..c2ed8c6 100644
--- a/components/policy/core/browser/DEPS
+++ b/components/policy/core/browser/DEPS
@@ -1,6 +1,6 @@
include_rules = [
"+components/bookmarks",
- "+components/google/core/browser",
+ "+components/google/core",
"+components/pref_registry",
"+components/proxy_config",
"+components/strings/grit/components_strings.h",
diff --git a/components/policy/core/browser/url_util.cc b/components/policy/core/browser/url_util.cc
index ddc4d92..994ff03 100644
--- a/components/policy/core/browser/url_util.cc
+++ b/components/policy/core/browser/url_util.cc
@@ -9,7 +9,7 @@
#include "base/logging.h"
#include "base/macros.h"
#include "base/no_destructor.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/url_formatter/url_fixer.h"
#include "net/base/escape.h"
#include "net/base/url_util.h"
diff --git a/components/safe_search_api/BUILD.gn b/components/safe_search_api/BUILD.gn
index 086b2ea..6a65818a 100644
--- a/components/safe_search_api/BUILD.gn
+++ b/components/safe_search_api/BUILD.gn
@@ -10,7 +10,7 @@
deps = [
"//base",
- "//components/google/core/browser",
+ "//components/google/core/common",
"//google_apis",
"//net",
"//services/network/public/cpp",
diff --git a/components/safe_search_api/DEPS b/components/safe_search_api/DEPS
index 83e61e1..0dded31 100644
--- a/components/safe_search_api/DEPS
+++ b/components/safe_search_api/DEPS
@@ -1,5 +1,5 @@
include_rules = [
- "+components/google/core/browser",
+ "+components/google/core/common",
"+google_apis",
"+net",
"+services/network",
diff --git a/components/safe_search_api/url_checker.cc b/components/safe_search_api/url_checker.cc
index 6a68d13..c36b3221 100644
--- a/components/safe_search_api/url_checker.cc
+++ b/components/safe_search_api/url_checker.cc
@@ -17,7 +17,7 @@
#include "base/strings/stringprintf.h"
#include "base/time/time.h"
#include "base/values.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "google_apis/google_api_keys.h"
#include "net/base/escape.h"
#include "net/base/load_flags.h"
diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc
index 1c945fe..f1cf611 100644
--- a/components/search_engines/template_url.cc
+++ b/components/search_engines/template_url.cc
@@ -24,7 +24,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/trace_event/memory_usage_estimator.h"
#include "build/build_config.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/search_engines/search_engines_switches.h"
#include "components/search_engines/search_terms_data.h"
#include "components/search_engines/template_url_prepopulate_data.h"
diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
index 0c686f6e..81e9948 100644
--- a/components/search_engines/template_url_prepopulate_data.cc
+++ b/components/search_engines/template_url_prepopulate_data.cc
@@ -15,7 +15,7 @@
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/prefs/pref_service.h"
#include "components/search_engines/prepopulated_engines.h"
diff --git a/components/search_engines/template_url_prepopulate_data_unittest.cc b/components/search_engines/template_url_prepopulate_data_unittest.cc
index 27de40b7..0f50cf1 100644
--- a/components/search_engines/template_url_prepopulate_data_unittest.cc
+++ b/components/search_engines/template_url_prepopulate_data_unittest.cc
@@ -14,7 +14,7 @@
#include "base/macros.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
-#include "components/google/core/browser/google_switches.h"
+#include "components/google/core/common/google_switches.h"
#include "components/search_engines/prepopulated_engines.h"
#include "components/search_engines/search_engines_pref_names.h"
#include "components/search_engines/search_terms_data.h"
diff --git a/components/search_engines/template_url_unittest.cc b/components/search_engines/template_url_unittest.cc
index cf40cb3..c2ff342 100644
--- a/components/search_engines/template_url_unittest.cc
+++ b/components/search_engines/template_url_unittest.cc
@@ -11,7 +11,7 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/search_engines/search_engines_switches.h"
#include "components/search_engines/search_terms_data.h"
#include "components/search_engines/template_url.h"
diff --git a/components/security_interstitials/DEPS b/components/security_interstitials/DEPS
index 76345d4..4958397 100644
--- a/components/security_interstitials/DEPS
+++ b/components/security_interstitials/DEPS
@@ -1,5 +1,5 @@
include_rules = [
- "+components/google/core/browser",
+ "+components/google/core",
"+components/history/core/browser",
"+components/metrics",
"+components/prefs",
diff --git a/components/security_interstitials/core/controller_client.cc b/components/security_interstitials/core/controller_client.cc
index e416177..020103c9 100644
--- a/components/security_interstitials/core/controller_client.cc
+++ b/components/security_interstitials/core/controller_client.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/prefs/pref_service.h"
#include "components/security_interstitials/core/metrics_helper.h"
#include "components/security_interstitials/core/urls.h"
diff --git a/components/security_interstitials/core/safe_browsing_loud_error_ui.cc b/components/security_interstitials/core/safe_browsing_loud_error_ui.cc
index 06f0b5c..2003d5d 100644
--- a/components/security_interstitials/core/safe_browsing_loud_error_ui.cc
+++ b/components/security_interstitials/core/safe_browsing_loud_error_ui.cc
@@ -8,7 +8,7 @@
#include "base/metrics/histogram_macros.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/grit/components_resources.h"
#include "components/security_interstitials/core/common_string_util.h"
#include "components/security_interstitials/core/metrics_helper.h"
diff --git a/components/security_interstitials/core/safe_browsing_quiet_error_ui.cc b/components/security_interstitials/core/safe_browsing_quiet_error_ui.cc
index 65ad7085..e63635e 100644
--- a/components/security_interstitials/core/safe_browsing_quiet_error_ui.cc
+++ b/components/security_interstitials/core/safe_browsing_quiet_error_ui.cc
@@ -8,7 +8,7 @@
#include "base/metrics/histogram_macros.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/grit/components_resources.h"
#include "components/security_interstitials/core/common_string_util.h"
#include "components/security_interstitials/core/metrics_helper.h"
diff --git a/components/signin/core/browser/chrome_connected_header_helper.cc b/components/signin/core/browser/chrome_connected_header_helper.cc
index 3a39e08..d31cd38 100644
--- a/components/signin/core/browser/chrome_connected_header_helper.cc
+++ b/components/signin/core/browser/chrome_connected_header_helper.cc
@@ -10,7 +10,7 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/signin/core/browser/cookie_settings_util.h"
#include "google_apis/gaia/gaia_auth_util.h"
#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
diff --git a/components/signin/core/browser/signin_header_helper.cc b/components/signin/core/browser/signin_header_helper.cc
index 4a0cc964..741ffbb 100644
--- a/components/signin/core/browser/signin_header_helper.cc
+++ b/components/signin/core/browser/signin_header_helper.cc
@@ -10,7 +10,7 @@
#include "base/macros.h"
#include "base/metrics/histogram_functions.h"
#include "base/strings/string_split.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/signin/core/browser/chrome_connected_header_helper.h"
#include "google_apis/gaia/gaia_auth_util.h"
#include "net/base/escape.h"
diff --git a/components/signin/ios/browser/account_consistency_service.mm b/components/signin/ios/browser/account_consistency_service.mm
index 6d45d9f..5fbcaceb 100644
--- a/components/signin/ios/browser/account_consistency_service.mm
+++ b/components/signin/ios/browser/account_consistency_service.mm
@@ -10,7 +10,7 @@
#import "base/mac/foundation_util.h"
#include "base/macros.h"
#include "base/strings/sys_string_conversions.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/prefs/scoped_user_pref_update.h"
#include "components/signin/core/browser/account_reconcilor.h"
diff --git a/components/suggestions/DEPS b/components/suggestions/DEPS
index b2bceb17..8089d35 100644
--- a/components/suggestions/DEPS
+++ b/components/suggestions/DEPS
@@ -1,6 +1,6 @@
include_rules = [
"+components/data_use_measurement/core",
- "+components/google/core/browser",
+ "+components/google/core",
"+components/image_fetcher",
"+components/keyed_service/core",
"+components/leveldb_proto",
diff --git a/components/suggestions/suggestions_service_impl.cc b/components/suggestions/suggestions_service_impl.cc
index 579b95d..78ef389 100644
--- a/components/suggestions/suggestions_service_impl.cc
+++ b/components/suggestions/suggestions_service_impl.cc
@@ -18,7 +18,7 @@
#include "base/strings/stringprintf.h"
#include "build/build_config.h"
#include "components/data_use_measurement/core/data_use_user_data.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/suggestions/blacklist_store.h"
#include "components/suggestions/features.h"
diff --git a/components/variations/net/variations_http_headers.cc b/components/variations/net/variations_http_headers.cc
index a2d0782..790856b 100644
--- a/components/variations/net/variations_http_headers.cc
+++ b/components/variations/net/variations_http_headers.cc
@@ -11,7 +11,7 @@
#include "base/macros.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/string_util.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/variations/variations_http_header_provider.h"
#include "net/http/http_request_headers.h"
#include "net/traffic_annotation/network_traffic_annotation.h"
diff --git a/components/web_resource/web_resource_service.cc b/components/web_resource/web_resource_service.cc
index 05d6ceb..0767fdb 100644
--- a/components/web_resource/web_resource_service.cc
+++ b/components/web_resource/web_resource_service.cc
@@ -16,7 +16,7 @@
#include "base/time/time.h"
#include "base/values.h"
#include "components/data_use_measurement/core/data_use_user_data.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/prefs/pref_service.h"
#include "net/base/load_flags.h"
#include "services/network/public/cpp/resource_request.h"
diff --git a/ios/chrome/browser/DEPS b/ios/chrome/browser/DEPS
index a5b89bc..6c856b1 100644
--- a/ios/chrome/browser/DEPS
+++ b/ios/chrome/browser/DEPS
@@ -22,7 +22,7 @@
"+components/feature_engagement",
"+components/flags_ui",
"+components/gcm_driver",
- "+components/google/core/browser",
+ "+components/google/core",
"+components/handoff",
"+components/history/core/browser",
"+components/history/ios/browser",
diff --git a/ios/chrome/browser/geolocation/omnibox_geolocation_controller.mm b/ios/chrome/browser/geolocation/omnibox_geolocation_controller.mm
index 44497be..a173d16e 100644
--- a/ios/chrome/browser/geolocation/omnibox_geolocation_controller.mm
+++ b/ios/chrome/browser/geolocation/omnibox_geolocation_controller.mm
@@ -12,7 +12,7 @@
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/version.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/version_info/version_info.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
#import "ios/chrome/browser/geolocation/CLLocation+OmniboxGeolocation.h"
diff --git a/ios/chrome/browser/metrics/new_tab_page_uma.mm b/ios/chrome/browser/metrics/new_tab_page_uma.mm
index 77b54e8..ff0121ba 100644
--- a/ios/chrome/browser/metrics/new_tab_page_uma.mm
+++ b/ios/chrome/browser/metrics/new_tab_page_uma.mm
@@ -5,7 +5,7 @@
#import "ios/chrome/browser/metrics/new_tab_page_uma.h"
#include "base/metrics/histogram_macros.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
#include "ios/chrome/browser/chrome_url_constants.h"
#import "ios/chrome/browser/tabs/tab.h"
diff --git a/ios/chrome/browser/reading_list/reading_list_distiller_page.mm b/ios/chrome/browser/reading_list/reading_list_distiller_page.mm
index b29225f5..6c9fa81 100644
--- a/ios/chrome/browser/reading_list/reading_list_distiller_page.mm
+++ b/ios/chrome/browser/reading_list/reading_list_distiller_page.mm
@@ -10,7 +10,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/threading/thread_task_runner_handle.h"
#include "components/favicon/ios/web_favicon_driver.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "ios/chrome/browser/reading_list/favicon_web_state_dispatcher_impl.h"
#import "ios/web/public/navigation_item.h"
#import "ios/web/public/navigation_manager.h"
diff --git a/ios/chrome/browser/search_engines/ui_thread_search_terms_data.cc b/ios/chrome/browser/search_engines/ui_thread_search_terms_data.cc
index 714ef84..b4433f8 100644
--- a/ios/chrome/browser/search_engines/ui_thread_search_terms_data.cc
+++ b/ios/chrome/browser/search_engines/ui_thread_search_terms_data.cc
@@ -7,7 +7,7 @@
#include "base/logging.h"
#include "base/strings/string16.h"
#include "components/google/core/browser/google_url_tracker.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/omnibox/browser/omnibox_field_trial.h"
#include "components/version_info/version_info.h"
#include "ios/chrome/browser/application_context.h"
diff --git a/ios/chrome/browser/tabs/tab.mm b/ios/chrome/browser/tabs/tab.mm
index 936e9729..ff7113c 100644
--- a/ios/chrome/browser/tabs/tab.mm
+++ b/ios/chrome/browser/tabs/tab.mm
@@ -25,7 +25,7 @@
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/history/core/browser/history_context.h"
#include "components/history/core/browser/history_service.h"
#include "components/history/core/browser/top_sites.h"
diff --git a/ios/chrome/browser/u2f/u2f_controller.mm b/ios/chrome/browser/u2f/u2f_controller.mm
index 148c5ade7..e55fe043 100644
--- a/ios/chrome/browser/u2f/u2f_controller.mm
+++ b/ios/chrome/browser/u2f/u2f_controller.mm
@@ -9,7 +9,7 @@
#include "base/strings/stringprintf.h"
#import "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "crypto/random.h"
#import "ios/chrome/browser/chrome_url_util.h"
#include "ios/chrome/common/x_callback_url.h"
diff --git a/ios/chrome/browser/ui/authentication/signin_confirmation_view_controller.mm b/ios/chrome/browser/ui/authentication/signin_confirmation_view_controller.mm
index d5734ac3..276bfd5 100644
--- a/ios/chrome/browser/ui/authentication/signin_confirmation_view_controller.mm
+++ b/ios/chrome/browser/ui/authentication/signin_confirmation_view_controller.mm
@@ -7,7 +7,7 @@
#import "base/mac/foundation_util.h"
#include "base/metrics/user_metrics.h"
#import "base/strings/sys_string_conversions.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "ios/chrome/browser/application_context.h"
#include "ios/chrome/browser/signin/chrome_identity_service_observer_bridge.h"
#import "ios/chrome/browser/ui/authentication/account_control_item.h"
diff --git a/ios/chrome/browser/ui/authentication/unified_consent/unified_consent_view_controller.mm b/ios/chrome/browser/ui/authentication/unified_consent/unified_consent_view_controller.mm
index cf0c232..2639b90a 100644
--- a/ios/chrome/browser/ui/authentication/unified_consent/unified_consent_view_controller.mm
+++ b/ios/chrome/browser/ui/authentication/unified_consent/unified_consent_view_controller.mm
@@ -5,7 +5,7 @@
#import "ios/chrome/browser/ui/authentication/unified_consent/unified_consent_view_controller.h"
#include "base/logging.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "ios/chrome/browser/application_context.h"
#import "ios/chrome/browser/ui/authentication/unified_consent/identity_picker_view.h"
#import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h"
diff --git a/ios/chrome/browser/ui/contextual_search/contextual_search_controller.mm b/ios/chrome/browser/ui/contextual_search/contextual_search_controller.mm
index 72e2e23..fa66e1f 100644
--- a/ios/chrome/browser/ui/contextual_search/contextual_search_controller.mm
+++ b/ios/chrome/browser/ui/contextual_search/contextual_search_controller.mm
@@ -16,7 +16,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
#include "base/values.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/search_engines/template_url_service.h"
#include "ios/chrome/browser/application_context.h"
#import "ios/chrome/browser/procedural_block_types.h"
diff --git a/ios/chrome/browser/ui/contextual_search/contextual_search_delegate.cc b/ios/chrome/browser/ui/contextual_search/contextual_search_delegate.cc
index 3712330..5b7bff9 100644
--- a/ios/chrome/browser/ui/contextual_search/contextual_search_delegate.cc
+++ b/ios/chrome/browser/ui/contextual_search/contextual_search_delegate.cc
@@ -13,7 +13,7 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/search_engines/template_url_service.h"
#include "components/search_engines/util.h"
#include "components/variations/net/variations_http_headers.h"
diff --git a/ios/chrome/browser/ui/location_bar/location_bar_coordinator.mm b/ios/chrome/browser/ui/location_bar/location_bar_coordinator.mm
index 91076db..81f95c24 100644
--- a/ios/chrome/browser/ui/location_bar/location_bar_coordinator.mm
+++ b/ios/chrome/browser/ui/location_bar/location_bar_coordinator.mm
@@ -9,7 +9,7 @@
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/sys_string_conversions.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/omnibox/browser/omnibox_edit_model.h"
#include "components/search_engines/util.h"
#include "components/strings/grit/components_strings.h"
diff --git a/ios/chrome/browser/ui/location_bar/location_bar_legacy_coordinator.mm b/ios/chrome/browser/ui/location_bar/location_bar_legacy_coordinator.mm
index 06abc9a..e0d9f8f 100644
--- a/ios/chrome/browser/ui/location_bar/location_bar_legacy_coordinator.mm
+++ b/ios/chrome/browser/ui/location_bar/location_bar_legacy_coordinator.mm
@@ -9,7 +9,7 @@
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/sys_string_conversions.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/omnibox/browser/omnibox_edit_model.h"
#include "components/search_engines/util.h"
#include "components/strings/grit/components_strings.h"
diff --git a/ios/chrome/browser/ui/ntp/incognito_view.mm b/ios/chrome/browser/ui/ntp/incognito_view.mm
index ba1ec1d..ff07130 100644
--- a/ios/chrome/browser/ui/ntp/incognito_view.mm
+++ b/ios/chrome/browser/ui/ntp/incognito_view.mm
@@ -4,7 +4,7 @@
#import "ios/chrome/browser/ui/ntp/incognito_view.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/strings/grit/components_strings.h"
#include "ios/chrome/browser/application_context.h"
#include "ios/chrome/browser/ui/rtl_geometry.h"
diff --git a/ios/chrome/browser/ui/settings/clear_browsing_data_manager.mm b/ios/chrome/browser/ui/settings/clear_browsing_data_manager.mm
index e9897b4..9c17adc 100644
--- a/ios/chrome/browser/ui/settings/clear_browsing_data_manager.mm
+++ b/ios/chrome/browser/ui/settings/clear_browsing_data_manager.mm
@@ -13,7 +13,7 @@
#include "components/browsing_data/core/pref_names.h"
#include "components/feature_engagement/public/event_constants.h"
#include "components/feature_engagement/public/tracker.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/history/core/browser/web_history_service.h"
#include "components/prefs/pref_service.h"
#include "components/signin/core/browser/signin_manager.h"
diff --git a/ios/chrome/browser/ui/settings/do_not_track_collection_view_controller.mm b/ios/chrome/browser/ui/settings/do_not_track_collection_view_controller.mm
index 82abd2e..f8c69a0d 100644
--- a/ios/chrome/browser/ui/settings/do_not_track_collection_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/do_not_track_collection_view_controller.mm
@@ -5,7 +5,7 @@
#import "ios/chrome/browser/ui/settings/do_not_track_collection_view_controller.h"
#include "base/mac/foundation_util.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/prefs/pref_member.h"
#include "ios/chrome/browser/application_context.h"
#include "ios/chrome/browser/chrome_url_constants.h"
diff --git a/ios/chrome/browser/ui/settings/privacy_collection_view_controller.mm b/ios/chrome/browser/ui/settings/privacy_collection_view_controller.mm
index 8f9a6d6..3cf5bd3 100644
--- a/ios/chrome/browser/ui/settings/privacy_collection_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/privacy_collection_view_controller.mm
@@ -8,7 +8,7 @@
#import "base/mac/foundation_util.h"
#include "base/metrics/user_metrics.h"
#include "base/metrics/user_metrics_action.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/handoff/pref_names_ios.h"
#include "components/metrics/metrics_pref_names.h"
#include "components/payments/core/payment_prefs.h"
diff --git a/ios/chrome/browser/ui/settings/save_passwords_collection_view_controller.mm b/ios/chrome/browser/ui/settings/save_passwords_collection_view_controller.mm
index 8430ce8..8cfb367 100644
--- a/ios/chrome/browser/ui/settings/save_passwords_collection_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/save_passwords_collection_view_controller.mm
@@ -14,7 +14,7 @@
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "components/autofill/core/common/password_form.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/keyed_service/core/service_access_type.h"
#include "components/password_manager/core/browser/password_list_sorter.h"
#include "components/password_manager/core/browser/password_manager_constants.h"
diff --git a/ios/chrome/browser/ui/settings/sync_encryption_collection_view_controller.mm b/ios/chrome/browser/ui/settings/sync_encryption_collection_view_controller.mm
index c4adfd7..8607e5b 100644
--- a/ios/chrome/browser/ui/settings/sync_encryption_collection_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/sync_encryption_collection_view_controller.mm
@@ -8,7 +8,7 @@
#include "base/strings/sys_string_conversions.h"
#include "components/browser_sync/profile_sync_service.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/strings/grit/components_strings.h"
#include "components/sync/base/sync_prefs.h"
#include "ios/chrome/browser/application_context.h"
diff --git a/ios/chrome/browser/ui/settings/sync_encryption_passphrase_collection_view_controller.mm b/ios/chrome/browser/ui/settings/sync_encryption_passphrase_collection_view_controller.mm
index 54d9c98..f212577 100644
--- a/ios/chrome/browser/ui/settings/sync_encryption_passphrase_collection_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/sync_encryption_passphrase_collection_view_controller.mm
@@ -11,7 +11,7 @@
#include "base/strings/sys_string_conversions.h"
#include "components/browser_sync/profile_sync_service.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/signin/core/browser/profile_oauth2_token_service.h"
#import "components/signin/ios/browser/oauth2_token_service_observer_bridge.h"
#include "components/strings/grit/components_strings.h"
diff --git a/ios/chrome/browser/ui/settings/sync_settings_collection_view_controller.mm b/ios/chrome/browser/ui/settings/sync_settings_collection_view_controller.mm
index 4a3a866..d07f164 100644
--- a/ios/chrome/browser/ui/settings/sync_settings_collection_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/sync_settings_collection_view_controller.mm
@@ -10,7 +10,7 @@
#include "base/mac/foundation_util.h"
#include "components/autofill/core/common/autofill_pref_names.h"
#include "components/browser_sync/profile_sync_service.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/prefs/pref_service.h"
#include "components/signin/core/browser/account_tracker_service.h"
#include "components/signin/core/browser/profile_oauth2_token_service.h"
diff --git a/ios/chrome/browser/ui/settings/sync_settings_collection_view_controller_unittest.mm b/ios/chrome/browser/ui/settings/sync_settings_collection_view_controller_unittest.mm
index 550459c..440d1c03 100644
--- a/ios/chrome/browser/ui/settings/sync_settings_collection_view_controller_unittest.mm
+++ b/ios/chrome/browser/ui/settings/sync_settings_collection_view_controller_unittest.mm
@@ -10,7 +10,7 @@
#include "base/strings/sys_string_conversions.h"
#include "components/autofill/core/common/autofill_pref_names.h"
#include "components/browser_sync/profile_sync_service_mock.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/sync_preferences/pref_service_mock_factory.h"
#include "components/sync_preferences/pref_service_syncable.h"
#include "ios/chrome/browser/application_context.h"
diff --git a/ios/chrome/browser/ui/settings/translate_collection_view_controller.mm b/ios/chrome/browser/ui/settings/translate_collection_view_controller.mm
index 1b12ae2f..54dec21 100644
--- a/ios/chrome/browser/ui/settings/translate_collection_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/translate_collection_view_controller.mm
@@ -8,7 +8,7 @@
#include <memory>
#include "base/mac/foundation_util.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/prefs/pref_member.h"
#include "components/prefs/pref_service.h"
#include "components/translate/core/browser/translate_pref_names.h"
diff --git a/ios/chrome/browser/voice/voice_search_url_rewriter.mm b/ios/chrome/browser/voice/voice_search_url_rewriter.mm
index 0ff3565..6bcbef5 100644
--- a/ios/chrome/browser/voice/voice_search_url_rewriter.mm
+++ b/ios/chrome/browser/voice/voice_search_url_rewriter.mm
@@ -7,7 +7,7 @@
#import <Foundation/Foundation.h>
#import "base/strings/sys_string_conversions.h"
-#include "components/google/core/browser/google_util.h"
+#include "components/google/core/common/google_util.h"
#include "components/prefs/pref_service.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
#include "ios/chrome/browser/voice/speech_input_locale_config.h"
