diff options
76 files changed, 154 insertions, 148 deletions
diff --git a/base/BUILD.gn b/base/BUILD.gn index cf0d5a1..60821ee 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -1465,20 +1465,6 @@ if (is_ios || is_android || is_win || (is_linux && !is_chromeos)) { } } -# TODO(brettw) remove these forwarding targets when all references to prefs are -# updated to point to components. -group("prefs") { - public_deps = [ - "//components/prefs", - ] -} -group("prefs_test_support") { - testonly = true - public_deps = [ - "//components/prefs:test_support", - ] -} - source_set("message_loop_tests") { testonly = true sources = [ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index bb99933..47f1ce0 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -1130,7 +1130,6 @@ source_set("test_support") { "//chrome/browser/ui:test_support", ] deps = [ - "//base:prefs_test_support", "//chrome/app/theme:theme_resources", "//chrome/browser", "//chrome/common", @@ -1139,6 +1138,7 @@ source_set("test_support") { "//components/invalidation/impl", "//components/invalidation/impl:test_support", "//components/password_manager/core/browser:test_support", + "//components/prefs:test_support", "//components/search_engines:test_support", "//components/syncable_prefs:test_support", "//components/user_prefs/tracked:user_prefs_tracked_test_support", diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn index fb57a95..b9b4548 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn @@ -62,7 +62,6 @@ static_library("common") { "//base:base", "//base:base_static", "//base:i18n", - "//base:prefs", "//chrome:resources", "//chrome:strings", "//chrome/app/theme:theme_resources", @@ -88,6 +87,7 @@ static_library("common") { "//components/offline_pages:switches", "//components/omnibox/common", "//components/policy:policy_component_common", + "//components/prefs", "//components/strings", "//components/translate/core/common", "//components/url_formatter", diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index 7ff1c1c..ea7f8c9 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -84,7 +84,6 @@ source_set("test_support") { # New deps should go in the non-iOS section below. public_deps = [ - "//base:prefs_test_support", "//base/test:test_support", "//chrome:resources", "//chrome:strings", @@ -102,6 +101,7 @@ source_set("test_support") { "//components/omnibox/browser:test_support", "//components/password_manager/core/browser:test_support", "//components/pref_registry:test_support", + "//components/prefs:test_support", "//components/rappor:test_support", "//components/search_engines:test_support", "//components/signin/core/browser:test_support", diff --git a/chromecast/browser/BUILD.gn b/chromecast/browser/BUILD.gn index afae1de..f187fe3 100644 --- a/chromecast/browser/BUILD.gn +++ b/chromecast/browser/BUILD.gn @@ -76,7 +76,6 @@ source_set("browser") { deps = [ "//base", "//base:i18n", - "//base:prefs", "//cc", "//chromecast/app:cast_crash_client", "//chromecast/app:chromecast_settings", @@ -100,6 +99,7 @@ source_set("browser") { # isn't needed. crbug.com/541577 "//components/metrics:ui", "//components/network_hints/browser", + "//components/prefs", "//content", "//content/public/browser", "//content/public/common", diff --git a/chromecast/browser/metrics/BUILD.gn b/chromecast/browser/metrics/BUILD.gn index fad608a..ef66b24 100644 --- a/chromecast/browser/metrics/BUILD.gn +++ b/chromecast/browser/metrics/BUILD.gn @@ -15,13 +15,13 @@ source_set("metrics") { deps = [ "//base", "//base:i18n", - "//base:prefs", "//chromecast/base", "//chromecast/common", "//components/metrics", "//components/metrics:gpu", "//components/metrics:net", "//components/metrics:profiler", + "//components/prefs", "//content/public/browser", "//content/public/common", ] diff --git a/chromeos/BUILD.gn b/chromeos/BUILD.gn index 3cecead..8ab2c15 100644 --- a/chromeos/BUILD.gn +++ b/chromeos/BUILD.gn @@ -28,11 +28,11 @@ component("chromeos") { ":power_manager_proto", "//base", "//base:i18n", - "//base:prefs", "//base/third_party/dynamic_annotations", "//components/device_event_log", "//components/onc", "//components/policy/proto", + "//components/prefs", "//components/proxy_config", "//components/signin/core/account_id", "//crypto", @@ -144,10 +144,10 @@ test("chromeos_unittests") { ":cryptohome_proto", ":power_manager_proto", ":test_support", - "//base:prefs_test_support", "//base/test:run_all_unittests", "//base/test:test_support", "//components/onc", + "//components/prefs:test_support", "//components/proxy_config", "//crypto", "//crypto:test_support", diff --git a/components/BUILD.gn b/components/BUILD.gn index 0a6c5bf..9841da3 100644 --- a/components/BUILD.gn +++ b/components/BUILD.gn @@ -419,9 +419,9 @@ test("components_browsertests") { # a MANUAL component_browsertest. sources += [ "dom_distiller/standalone/content_extractor_browsertest.cc" ] deps += [ - "//base:prefs_test_support", "//components/leveldb_proto", "//components/pref_registry:test_support", + "//components/prefs:test_support", ] } diff --git a/components/arc/BUILD.gn b/components/arc/BUILD.gn index eb8320b..3b09082 100644 --- a/components/arc/BUILD.gn +++ b/components/arc/BUILD.gn @@ -35,10 +35,10 @@ static_library("arc") { deps = [ "//base", - "//base:prefs", "//chromeos", "//chromeos:power_manager_proto", "//components/onc", + "//components/prefs", "//components/signin/core/account_id", "//google_apis", "//ipc:ipc", diff --git a/components/autofill/content/browser/BUILD.gn b/components/autofill/content/browser/BUILD.gn index d67c309..baa997d 100644 --- a/components/autofill/content/browser/BUILD.gn +++ b/components/autofill/content/browser/BUILD.gn @@ -32,10 +32,10 @@ static_library("browser") { deps = [ "//base", "//base:i18n", - "//base:prefs", "//components/autofill/content/common", "//components/autofill/core/browser", "//components/autofill/core/common", + "//components/prefs", "//components/os_crypt", "//components/resources", "//components/strings", diff --git a/components/autofill/core/browser/BUILD.gn b/components/autofill/core/browser/BUILD.gn index 95a0cbf..b0008d4 100644 --- a/components/autofill/core/browser/BUILD.gn +++ b/components/autofill/core/browser/BUILD.gn @@ -167,7 +167,6 @@ source_set("browser") { deps = [ "//base", "//base:i18n", - "//base:prefs", "//components/autofill/core/browser/proto", "//components/autofill/core/common", "//components/data_use_measurement/core", @@ -175,6 +174,7 @@ source_set("browser") { "//components/keyed_service/core", "//components/os_crypt", "//components/pref_registry", + "//components/prefs", "//components/rappor", "//components/resources", "//components/signin/core/browser", @@ -233,14 +233,13 @@ source_set("test_support") { deps = [ "//base", - "//base:prefs", - "//base:prefs_test_support", "//base/test:test_support", "//components/autofill/core/browser", "//components/autofill/core/browser/proto", "//components/autofill/core/common", "//components/os_crypt", "//components/pref_registry", + "//components/prefs:test_support", "//components/rappor", "//components/rappor:test_support", "//components/signin/core/browser", @@ -298,11 +297,10 @@ source_set("unit_tests") { ":browser", ":test_support", "//base", - "//base:prefs", - "//base:prefs_test_support", "//base/test:test_support", "//components/autofill/core/common", "//components/os_crypt", + "//components/prefs:test_support", "//components/rappor:test_support", "//components/resources", "//components/signin/core/browser", diff --git a/components/bookmarks/browser/BUILD.gn b/components/bookmarks/browser/BUILD.gn index c0ec3b2..24e1721 100644 --- a/components/bookmarks/browser/BUILD.gn +++ b/components/bookmarks/browser/BUILD.gn @@ -44,11 +44,11 @@ source_set("browser") { deps = [ "//base", "//base:i18n", - "//base:prefs", "//components/bookmarks/common", "//components/favicon_base", "//components/keyed_service/core", "//components/pref_registry", + "//components/prefs", "//components/query_parser", "//components/strings", "//components/url_formatter", @@ -83,12 +83,12 @@ source_set("unit_tests") { deps = [ ":browser", - "//base:prefs", - "//base:prefs_test_support", "//components/bookmarks/common", "//components/bookmarks/test", "//components/favicon_base", "//components/pref_registry", + "//components/prefs", + "//components/prefs:test_support", "//testing/gtest", "//ui/base", "//url", diff --git a/components/bookmarks/managed/BUILD.gn b/components/bookmarks/managed/BUILD.gn index ed8d2a6..f2f2765 100644 --- a/components/bookmarks/managed/BUILD.gn +++ b/components/bookmarks/managed/BUILD.gn @@ -14,10 +14,10 @@ source_set("managed") { deps = [ "//base", - "//base:prefs", "//components/bookmarks/browser", "//components/bookmarks/common", "//components/keyed_service/core", + "//components/prefs", "//components/strings", "//ui/base", "//url", @@ -35,11 +35,10 @@ source_set("unit_tests") { deps = [ ":managed", "//base", - "//base:prefs", - "//base:prefs_test_support", "//components/bookmarks/browser", "//components/bookmarks/common", "//components/bookmarks/test", + "//components/prefs:test_support", "//components/strings", "//testing/gmock", "//testing/gtest", diff --git a/components/browser_sync/browser/BUILD.gn b/components/browser_sync/browser/BUILD.gn index c7592a6..a80bb84 100644 --- a/components/browser_sync/browser/BUILD.gn +++ b/components/browser_sync/browser/BUILD.gn @@ -16,7 +16,6 @@ source_set("browser") { deps = [ "//base", - "//base:prefs", "//components/autofill/core/browser", "//components/autofill/core/common", "//components/browser_sync/common", @@ -28,6 +27,7 @@ source_set("browser") { "//components/password_manager/core/browser", "//components/password_manager/sync/browser", "//components/pref_registry", + "//components/prefs", "//components/signin/core/browser", "//components/strings", "//components/sync_bookmarks", diff --git a/components/content_settings/core/browser/BUILD.gn b/components/content_settings/core/browser/BUILD.gn index 6cf81ef..013fe88 100644 --- a/components/content_settings/core/browser/BUILD.gn +++ b/components/content_settings/core/browser/BUILD.gn @@ -55,10 +55,10 @@ source_set("browser") { deps = [ "//base", - "//base:prefs", "//components/content_settings/core/common", "//components/keyed_service/core", "//components/pref_registry:pref_registry", + "//components/prefs", "//components/url_formatter", "//net", "//url", @@ -86,11 +86,11 @@ source_set("unit_tests") { deps = [ ":browser", "//base", - "//base:prefs", "//base/test:test_support", "//components/content_settings/core/common", "//components/content_settings/core/test:test_support", "//components/pref_registry:test_support", + "//components/prefs", "//testing/gtest", "//url", ] diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn index ed917a7..b6102e4 100644 --- a/components/cronet/android/BUILD.gn +++ b/components/cronet/android/BUILD.gn @@ -107,9 +107,9 @@ template("cronet_static_tmpl") { ":features", "//base", "//base:i18n", - "//base:prefs", "//base/third_party/dynamic_annotations", "//components/metrics", + "//components/prefs", ] sources = [ "//components/cronet/android/chromium_url_request.cc", diff --git a/components/data_reduction_proxy/core/browser/BUILD.gn b/components/data_reduction_proxy/core/browser/BUILD.gn index 69f3344..77ef2a4 100644 --- a/components/data_reduction_proxy/core/browser/BUILD.gn +++ b/components/data_reduction_proxy/core/browser/BUILD.gn @@ -57,10 +57,10 @@ if (is_android) { deps = [ "//base", - "//base:prefs", "//components/data_reduction_proxy/core/common:common_small", "//components/data_reduction_proxy/proto:data_reduction_proxy_proto", "//components/pref_registry", + "//components/prefs", "//components/variations", "//crypto", "//google_apis:google_apis_small", @@ -79,10 +79,10 @@ source_set("browser") { deps = [ "//base", - "//base:prefs", "//components/data_reduction_proxy/core/common", "//components/data_reduction_proxy/proto:data_reduction_proxy_proto", "//components/pref_registry", + "//components/prefs", "//components/variations", "//crypto", "//google_apis", @@ -117,9 +117,9 @@ source_set("test_support") { ] deps = [ "//base", - "//base:prefs_test_support", "//components/data_reduction_proxy/core/common", "//components/data_reduction_proxy/core/common:test_support", + "//components/prefs:test_support", "//net", "//net:test_support", "//testing/gmock", @@ -156,10 +156,10 @@ source_set("unit_tests") { ":browser", ":test_support", "//base", - "//base:prefs_test_support", "//base/test:test_support", "//components/data_reduction_proxy/core/common:test_support", "//components/data_reduction_proxy/proto:data_reduction_proxy_proto", + "//components/prefs:test_support", "//components/variations", "//net:test_support", "//testing/gmock", diff --git a/components/dom_distiller/core/BUILD.gn b/components/dom_distiller/core/BUILD.gn index b3e6486..7c6dbb6 100644 --- a/components/dom_distiller/core/BUILD.gn +++ b/components/dom_distiller/core/BUILD.gn @@ -64,9 +64,9 @@ source_set("core") { ] deps = [ "//base", - "//base:prefs", "//components/leveldb_proto", "//components/pref_registry", + "//components/prefs", "//components/resources", "//components/strings", "//components/variations", diff --git a/components/drive/BUILD.gn b/components/drive/BUILD.gn index 273027f..806e402 100644 --- a/components/drive/BUILD.gn +++ b/components/drive/BUILD.gn @@ -50,9 +50,9 @@ source_set("drive") { deps = [ "//base", "//base:i18n", - "//base:prefs", "//components/invalidation/public", "//components/keyed_service/core", + "//components/prefs", # TODO(lukasza): Remove this dependency (see DEPS file for more info). "//content/public/browser", @@ -129,7 +129,7 @@ source_set("drive_chromeos") { ":drive", "//base", "//base:i18n", - "//base:prefs", + "//components/prefs", "//google_apis:google_apis", "//net:net", ] @@ -158,7 +158,7 @@ source_set("test_support") { ":drive", ":proto", "//base", - "//base:prefs_test_support", + "//components/prefs:test_support", "//content/test:test_support", "//google_apis:test_support", "//net:net", @@ -182,7 +182,7 @@ source_set("test_support_chromeos") { ":drive_chromeos", ":proto", "//base", - "//base:prefs_test_support", + "//components/prefs:test_support", "//content/test:test_support", "//google_apis:test_support", ] diff --git a/components/feedback/BUILD.gn b/components/feedback/BUILD.gn index ec4e9f19..0a017a0 100644 --- a/components/feedback/BUILD.gn +++ b/components/feedback/BUILD.gn @@ -54,10 +54,10 @@ source_set("unit_tests") { deps = [ ":feedback", "//base", - "//base:prefs_test_support", "//components/feedback/proto", "//components/keyed_service/core", "//components/pref_registry:test_support", + "//components/prefs:test_support", "//components/user_prefs", "//components/variations/net", "//content/test:test_support", diff --git a/components/filesystem/public/cpp/prefs/BUILD.gn b/components/filesystem/public/cpp/prefs/BUILD.gn index 22131db..2300ab6 100644 --- a/components/filesystem/public/cpp/prefs/BUILD.gn +++ b/components/filesystem/public/cpp/prefs/BUILD.gn @@ -12,8 +12,8 @@ source_set("prefs") { deps = [ "//base", - "//base:prefs", "//components/filesystem/public/interfaces", + "//components/prefs", "//mojo/common", "//mojo/shell/public/cpp", ] diff --git a/components/flags_ui/BUILD.gn b/components/flags_ui/BUILD.gn index 8669902..81f0f5c 100644 --- a/components/flags_ui/BUILD.gn +++ b/components/flags_ui/BUILD.gn @@ -21,8 +21,8 @@ source_set("flags_ui") { deps = [ ":switches", "//base", - "//base:prefs", "//components/pref_registry", + "//components/prefs", "//components/strings", "//ui/base", ] @@ -47,8 +47,7 @@ source_set("unit_tests") { ":flags_ui", ":switches", "//base", - "//base:prefs", - "//base:prefs_test_support", + "//components/prefs:test_support", "//components/strings", "//testing/gtest", ] diff --git a/components/gcm_driver/BUILD.gn b/components/gcm_driver/BUILD.gn index d02948b..d83be21 100644 --- a/components/gcm_driver/BUILD.gn +++ b/components/gcm_driver/BUILD.gn @@ -61,12 +61,12 @@ static_library("gcm_driver") { deps = [ "//base", - "//base:prefs", "//components/gcm_driver/common", "//components/gcm_driver/crypto", "//components/keyed_service/core", "//components/os_crypt", "//components/pref_registry", + "//components/prefs", "//components/signin/core/browser", "//components/sync_driver", "//components/version_info", @@ -159,8 +159,8 @@ source_set("unit_tests") { ":gcm_driver", ":test_support", "//base", - "//base:prefs_test_support", "//base/test:test_support", + "//components/prefs:test_support", "//google_apis:test_support", "//google_apis/gcm:test_support", "//net:test_support", diff --git a/components/google/core/browser/BUILD.gn b/components/google/core/browser/BUILD.gn index d98d61b..ad60061 100644 --- a/components/google/core/browser/BUILD.gn +++ b/components/google/core/browser/BUILD.gn @@ -18,10 +18,10 @@ static_library("browser") { deps = [ "//base", - "//base:prefs", "//components/data_use_measurement/core", "//components/keyed_service/core", "//components/pref_registry", + "//components/prefs", "//components/strings", "//components/url_formatter", "//net", @@ -40,8 +40,7 @@ source_set("unit_tests") { deps = [ ":browser", "//base", - "//base:prefs", - "//base:prefs_test_support", + "//components/prefs:test_support", "//net:test_support", "//testing/gtest", ] diff --git a/components/history/core/browser/BUILD.gn b/components/history/core/browser/BUILD.gn index 0d88839..3d038fd 100644 --- a/components/history/core/browser/BUILD.gn +++ b/components/history/core/browser/BUILD.gn @@ -93,10 +93,10 @@ static_library("browser") { deps = [ "//base", "//base:i18n", - "//base:prefs", "//components/favicon_base", "//components/history/core/common", "//components/keyed_service/core", + "//components/prefs", "//components/query_parser", "//components/signin/core/browser", "//components/sync_driver", @@ -160,11 +160,11 @@ source_set("unit_tests") { deps = [ ":browser", "//base", - "//base:prefs_test_support", "//base/test:test_support", "//components/favicon_base", "//components/history/core/common", "//components/history/core/test", + "//components/prefs:test_support", "//components/sync_driver:test_support", "//sql", "//sql:test_support", diff --git a/components/invalidation/impl/BUILD.gn b/components/invalidation/impl/BUILD.gn index a363dcb..bbbd4f2 100644 --- a/components/invalidation/impl/BUILD.gn +++ b/components/invalidation/impl/BUILD.gn @@ -39,11 +39,11 @@ source_set("impl") { deps = [ "//base", "//base:i18n", - "//base:prefs", "//components/data_use_measurement/core", "//components/gcm_driver", "//components/keyed_service/core", "//components/pref_registry", + "//components/prefs", "//components/signin/core/browser", "//google_apis", "//jingle:notifier", @@ -107,7 +107,7 @@ source_set("unit_tests") { ":impl", ":test_support", "//base", - "//base:prefs", + "//components/prefs", "//testing/gmock", "//testing/gtest", ] diff --git a/components/keyed_service/core/BUILD.gn b/components/keyed_service/core/BUILD.gn index 3ba7a45..79a0ed3 100644 --- a/components/keyed_service/core/BUILD.gn +++ b/components/keyed_service/core/BUILD.gn @@ -31,8 +31,8 @@ component("core") { deps = [ "//base", - "//base:prefs", "//components/pref_registry", + "//components/prefs", "//components/user_prefs", ] } diff --git a/components/metrics/BUILD.gn b/components/metrics/BUILD.gn index f75a3f9..13701ba 100644 --- a/components/metrics/BUILD.gn +++ b/components/metrics/BUILD.gn @@ -66,7 +66,7 @@ source_set("metrics") { deps = [ "//base", "//base:i18n", - "//base:prefs", + "//components/prefs", "//components/variations", "//third_party/zlib:compression_utils", ] @@ -322,8 +322,8 @@ source_set("unit_tests") { ":profiler", ":test_support", ":ui", - "//base:prefs_test_support", "//base/test:test_support", + "//components/prefs:test_support", "//components/variations", "//net:test_support", "//testing/gtest", diff --git a/components/network_time/BUILD.gn b/components/network_time/BUILD.gn index be9b44c..14057f9 100644 --- a/components/network_time/BUILD.gn +++ b/components/network_time/BUILD.gn @@ -13,7 +13,7 @@ static_library("network_time") { deps = [ "//base", "//base:i18n", - "//base:prefs", + "//components/prefs", ] } @@ -26,7 +26,7 @@ source_set("unit_tests") { deps = [ ":network_time", "//base", - "//base:prefs_test_support", + "//components/prefs:test_support", "//testing/gtest", ] } diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn index 703e5aa..329a1af 100644 --- a/components/omnibox/browser/BUILD.gn +++ b/components/omnibox/browser/BUILD.gn @@ -110,7 +110,6 @@ source_set("browser") { ":in_memory_url_index_cache_proto", "//base", "//base:i18n", - "//base:prefs", "//components/bookmarks/browser", "//components/data_use_measurement/core", "//components/keyed_service/core", @@ -118,6 +117,7 @@ source_set("browser") { "//components/omnibox/common", "//components/open_from_clipboard", "//components/pref_registry", + "//components/prefs", "//components/query_parser", "//components/resources", "//components/search", @@ -205,13 +205,12 @@ source_set("unit_tests") { ":browser", ":test_support", "//base", - "//base:prefs", - "//base:prefs_test_support", "//base/test:test_support", "//components/bookmarks/browser", "//components/bookmarks/test", "//components/history/core/test", "//components/open_from_clipboard:test_support", + "//components/prefs:test_support", "//components/search", "//components/search_engines", "//components/url_formatter", diff --git a/components/password_manager/content/browser/BUILD.gn b/components/password_manager/content/browser/BUILD.gn index c759643..85f89dc 100644 --- a/components/password_manager/content/browser/BUILD.gn +++ b/components/password_manager/content/browser/BUILD.gn @@ -18,7 +18,6 @@ source_set("browser") { public_deps = [ "//base", - "//base:prefs", "//components/autofill/content/browser", "//components/autofill/content/common", "//components/autofill/core/common", @@ -26,6 +25,7 @@ source_set("browser") { "//components/password_manager/content/common", "//components/password_manager/core/browser", "//components/password_manager/core/common", + "//components/prefs", "//content/public/browser", "//content/public/common", "//ipc", @@ -41,9 +41,9 @@ source_set("unit_tests") { ] deps = [ ":browser", - "//base:prefs_test_support", "//components/autofill/core/browser:test_support", "//components/password_manager/core/browser:test_support", + "//components/prefs:test_support", "//content/test:test_support", "//testing/gmock", "//testing/gtest", diff --git a/components/password_manager/core/browser/BUILD.gn b/components/password_manager/core/browser/BUILD.gn index 0fc0340..fea92bc 100644 --- a/components/password_manager/core/browser/BUILD.gn +++ b/components/password_manager/core/browser/BUILD.gn @@ -115,13 +115,13 @@ source_set("browser") { ":proto", "//base", "//base:i18n", - "//base:prefs", "//components/autofill/core/browser", "//components/autofill/core/common", "//components/keyed_service/core", "//components/os_crypt", "//components/password_manager/core/common", "//components/pref_registry", + "//components/prefs", "//components/strings", "//components/sync_driver", "//components/url_formatter", @@ -224,13 +224,13 @@ source_set("unit_tests") { ] deps = [ ":test_support", - "//base:prefs_test_support", "//base/test:test_support", "//components/autofill/core/browser:test_support", "//components/autofill/core/common", "//components/os_crypt", "//components/password_manager/core/browser:proto", "//components/password_manager/core/common", + "//components/prefs:test_support", "//components/strings", "//components/sync_driver:test_support", "//components/variations", diff --git a/components/password_manager/sync/browser/BUILD.gn b/components/password_manager/sync/browser/BUILD.gn index cfbd5b1..6aacc17 100644 --- a/components/password_manager/sync/browser/BUILD.gn +++ b/components/password_manager/sync/browser/BUILD.gn @@ -18,11 +18,11 @@ source_set("browser") { deps = [ "//base", - "//base:prefs", "//components/autofill/core/common", "//components/keyed_service/core", "//components/password_manager/core/browser", "//components/password_manager/core/common", + "//components/prefs", "//components/signin/core/browser", "//components/sync_driver", "//components/syncable_prefs", @@ -44,12 +44,12 @@ source_set("unit_tests") { deps = [ ":browser", "//base", - "//base:prefs", "//base/test:test_support", "//components/autofill/core/common", "//components/password_manager/core/browser:test_support", "//components/password_manager/core/common", "//components/pref_registry:test_support", + "//components/prefs", "//components/signin/core/browser:test_support", "//components/signin/core/common", "//components/sync_driver:test_support", diff --git a/components/policy/core/browser/BUILD.gn b/components/policy/core/browser/BUILD.gn index 05c61a5..ff65ce4 100644 --- a/components/policy/core/browser/BUILD.gn +++ b/components/policy/core/browser/BUILD.gn @@ -19,12 +19,12 @@ source_set("browser") { deps = [ "//base", - "//base:prefs", "//base/third_party/dynamic_annotations", "//components/bookmarks/managed", "//components/keyed_service/core", "//components/policy/core/common", "//components/pref_registry", + "//components/prefs", "//components/strings", "//components/url_matcher", "//ui/base", @@ -96,10 +96,10 @@ if (enable_configuration_policy) { ] deps = [ "//base", - "//base:prefs_test_support", "//components/autofill/core/common", "//components/policy", "//components/policy:policy_component_test_support", + "//components/prefs:test_support", "//components/proxy_config", "//components/url_formatter", "//google_apis", diff --git a/components/policy/core/common/BUILD.gn b/components/policy/core/common/BUILD.gn index 8bd89b1..f432468 100644 --- a/components/policy/core/common/BUILD.gn +++ b/components/policy/core/common/BUILD.gn @@ -136,11 +136,11 @@ source_set("common") { ] deps = [ "//base:i18n", - "//base:prefs", "//base/third_party/dynamic_annotations", "//components/data_use_measurement/core", "//components/json_schema", "//components/policy", + "//components/prefs", "//google_apis", "//net", "//third_party/re2", @@ -283,10 +283,11 @@ if (enable_configuration_policy) { deps = [ "//base", - "//base:prefs_test_support", "//base/test:test_support", "//components/policy", "//components/policy:policy_component_test_support", + "//components/prefs:test_support", + "//components/prefs:test_support", "//google_apis", "//net:test_support", "//testing/gmock", diff --git a/components/precache/content/BUILD.gn b/components/precache/content/BUILD.gn index ba87b18..297ec27 100644 --- a/components/precache/content/BUILD.gn +++ b/components/precache/content/BUILD.gn @@ -12,10 +12,10 @@ source_set("content") { deps = [ "//base", - "//base:prefs", "//components/history/core/browser", "//components/keyed_service/core", "//components/precache/core", + "//components/prefs", "//components/sync_driver", "//components/variations", "//content/public/browser", diff --git a/components/precache/core/BUILD.gn b/components/precache/core/BUILD.gn index 5badf1d..16f6ce8 100644 --- a/components/precache/core/BUILD.gn +++ b/components/precache/core/BUILD.gn @@ -38,8 +38,8 @@ source_set("core") { deps = [ ":proto", "//base", - "//base:prefs", "//components/history/core/browser", + "//components/prefs", "//net", "//sql", "//url", diff --git a/components/pref_registry/BUILD.gn b/components/pref_registry/BUILD.gn index c3ce504..8a3ef8b 100644 --- a/components/pref_registry/BUILD.gn +++ b/components/pref_registry/BUILD.gn @@ -10,8 +10,8 @@ source_set("pref_registry") { deps = [ "//base", - "//base:prefs", "//base/third_party/dynamic_annotations", + "//components/prefs", ] } @@ -28,7 +28,6 @@ source_set("test_support") { deps = [ "//base", - "//base:prefs", - "//base:prefs_test_support", + "//components/prefs:test_support", ] } diff --git a/components/prefs/BUILD.gn b/components/prefs/BUILD.gn index 9b89e32..0919fe3 100644 --- a/components/prefs/BUILD.gn +++ b/components/prefs/BUILD.gn @@ -4,6 +4,30 @@ component("prefs") { sources = [ + # Reference the forwarding headers so "gn check" can check them properly + # while we're transitioning from base to here. + "//base/prefs/base_prefs_export.h", + "//base/prefs/default_pref_store.h", + "//base/prefs/json_pref_store.h", + "//base/prefs/overlay_user_pref_store.h", + "//base/prefs/persistent_pref_store.h", + "//base/prefs/pref_change_registrar.h", + "//base/prefs/pref_filter.h", + "//base/prefs/pref_member.h", + "//base/prefs/pref_notifier.h", + "//base/prefs/pref_notifier_impl.h", + "//base/prefs/pref_observer.h", + "//base/prefs/pref_registry.h", + "//base/prefs/pref_registry_simple.h", + "//base/prefs/pref_service_factory.h", + "//base/prefs/pref_service.h", + "//base/prefs/pref_store.h", + "//base/prefs/pref_value_map.h", + "//base/prefs/pref_value_store.h", + "//base/prefs/scoped_user_pref_update.h", + "//base/prefs/value_map_pref_store.h", + "//base/prefs/writeable_pref_store.h", + "default_pref_store.cc", "default_pref_store.h", "json_pref_store.cc", @@ -61,6 +85,13 @@ component("prefs") { source_set("test_support") { testonly = true sources = [ + # Reference the forwarding headers so "gn check" can check them properly + # while we're transitioning from base to here. + "//base/prefs/mock_pref_change_callback.h", + "//base/prefs/pref_store_observer_mock.h", + "//base/prefs/testing_pref_service.h", + "//base/prefs/testing_pref_store.h", + "mock_pref_change_callback.cc", "mock_pref_change_callback.h", "pref_store_observer_mock.cc", diff --git a/components/proximity_auth/BUILD.gn b/components/proximity_auth/BUILD.gn index 565e1d2..a19418d 100644 --- a/components/proximity_auth/BUILD.gn +++ b/components/proximity_auth/BUILD.gn @@ -71,7 +71,7 @@ source_set("proximity_auth") { deps = [ "//base", - "//base:prefs", + "//components/prefs", "//components/proximity_auth/ble", "//components/proximity_auth/cryptauth", "//components/proximity_auth/logging", @@ -149,8 +149,8 @@ source_set("unit_tests") { ":proximity_auth", ":test_support", "//base", - "//base:prefs_test_support", "//base/test:test_support", + "//components/prefs:test_support", "//components/proximity_auth/ble:unit_tests", "//components/proximity_auth/cryptauth:test_support", "//components/proximity_auth/cryptauth:unit_tests", diff --git a/components/proximity_auth/ble/BUILD.gn b/components/proximity_auth/ble/BUILD.gn index 1be48bd..29ae3ba 100644 --- a/components/proximity_auth/ble/BUILD.gn +++ b/components/proximity_auth/ble/BUILD.gn @@ -23,7 +23,7 @@ source_set("ble") { deps = [ "//base", - "//base:prefs", + "//components/prefs", "//components/proximity_auth/logging", # TODO(https://crbug.com/562683): This component has a circular dependency @@ -52,8 +52,8 @@ source_set("unit_tests") { deps = [ ":ble", - "//base:prefs_test_support", "//base/test:test_support", + "//components/prefs:test_support", "//components/proximity_auth:test_support", "//device/bluetooth:mocks", "//testing/gmock", diff --git a/components/proximity_auth/cryptauth/BUILD.gn b/components/proximity_auth/cryptauth/BUILD.gn index aa3bf55..fc7d40e 100644 --- a/components/proximity_auth/cryptauth/BUILD.gn +++ b/components/proximity_auth/cryptauth/BUILD.gn @@ -39,9 +39,9 @@ source_set("cryptauth") { deps = [ "//base", - "//base:prefs", "//components/gcm_driver", "//components/gcm_driver/common", + "//components/prefs", "//components/proximity_auth/logging", "//crypto", "//google_apis", @@ -95,9 +95,9 @@ source_set("unit_tests") { deps = [ ":cryptauth", ":test_support", - "//base:prefs_test_support", "//base/test:test_support", "//components/gcm_driver:test_support", + "//components/prefs:test_support", "//components/proximity_auth", "//google_apis:test_support", "//net:test_support", diff --git a/components/proximity_auth/webui/BUILD.gn b/components/proximity_auth/webui/BUILD.gn index db5e634..e3cb0b6 100644 --- a/components/proximity_auth/webui/BUILD.gn +++ b/components/proximity_auth/webui/BUILD.gn @@ -18,7 +18,7 @@ static_library("webui") { deps = [ "//base", "//base:i18n", - "//base:prefs", + "//components/prefs", "//components/proximity_auth", "//components/proximity_auth/ble", "//components/proximity_auth/cryptauth", diff --git a/components/proxy_config/BUILD.gn b/components/proxy_config/BUILD.gn index 6430d94..3243526f 100644 --- a/components/proxy_config/BUILD.gn +++ b/components/proxy_config/BUILD.gn @@ -24,7 +24,7 @@ component("proxy_config") { deps = [ "//base", - "//base:prefs", + "//components/prefs", "//net", "//url", ] @@ -50,8 +50,8 @@ source_set("unit_tests") { deps = [ ":proxy_config", "//base", - "//base:prefs_test_support", "//base/test:test_support", + "//components/prefs:test_support", "//net", "//testing/gmock", "//testing/gtest", diff --git a/components/rappor/BUILD.gn b/components/rappor/BUILD.gn index badab65..ba09d37 100644 --- a/components/rappor/BUILD.gn +++ b/components/rappor/BUILD.gn @@ -38,9 +38,9 @@ source_set("rappor") { deps = [ "//base", - "//base:prefs", "//components/data_use_measurement/core", "//components/metrics", + "//components/prefs", "//components/variations", "//crypto", "//net", @@ -63,7 +63,7 @@ static_library("test_support") { ] deps = [ "//base", - "//base:prefs_test_support", + "//components/prefs:test_support", ] } @@ -84,9 +84,9 @@ source_set("unit_tests") { ":rappor", ":test_support", "//base", - "//base:prefs_test_support", "//base/test:test_support", "//components/metrics", + "//components/prefs:test_support", "//net:test_support", "//testing/gtest", "//url", diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUILD.gn index 3229f4b..08b8178 100644 --- a/components/search_engines/BUILD.gn +++ b/components/search_engines/BUILD.gn @@ -55,7 +55,6 @@ static_library("search_engines") { ":prepopulated_engines", "//base", "//base:i18n", - "//base:prefs", "//components/google/core/browser", "//components/history/core/browser", "//components/keyed_service/core", @@ -67,6 +66,7 @@ static_library("search_engines") { # dependency added: #"//components/omnibox/browser", "//components/pref_registry", + "//components/prefs", "//components/rappor", "//components/strings", "//components/sync_driver", diff --git a/components/security_interstitials/core/BUILD.gn b/components/security_interstitials/core/BUILD.gn index 6dc2e7b..6595ce9 100644 --- a/components/security_interstitials/core/BUILD.gn +++ b/components/security_interstitials/core/BUILD.gn @@ -20,10 +20,10 @@ static_library("core") { deps = [ "//base", "//base:i18n", - "//base:prefs", "//components/google/core/browser", "//components/history/core/browser", "//components/metrics", + "//components/prefs", "//components/rappor", "//components/ssl_errors", "//components/strings", diff --git a/components/signin/core/browser/BUILD.gn b/components/signin/core/browser/BUILD.gn index 1e9766b..32c6353 100644 --- a/components/signin/core/browser/BUILD.gn +++ b/components/signin/core/browser/BUILD.gn @@ -75,7 +75,6 @@ source_set("browser") { deps = [ "//base", "//base:i18n", - "//base:prefs", "//components/content_settings/core/browser", "//components/content_settings/core/common", "//components/google/core/browser", @@ -84,6 +83,7 @@ source_set("browser") { "//components/metrics", "//components/os_crypt", "//components/pref_registry", + "//components/prefs", "//components/signin/core/account_id", "//components/signin/core/common", "//components/webdata/common", @@ -129,7 +129,7 @@ source_set("test_support") { public_deps = [ ":browser", "//base", - "//base:prefs_test_support", + "//components/prefs:test_support", "//components/webdata/common", "//google_apis:test_support", "//net:test_support", diff --git a/components/signin/ios/browser/BUILD.gn b/components/signin/ios/browser/BUILD.gn index 6c4e5e1..d11349b 100644 --- a/components/signin/ios/browser/BUILD.gn +++ b/components/signin/ios/browser/BUILD.gn @@ -18,11 +18,11 @@ source_set("browser") { deps = [ "//base", - "//base:prefs", "//components/content_settings/core/browser", "//components/google/core/browser", "//components/keyed_service/core", "//components/pref_registry", + "//components/prefs", "//components/signin/core/browser", "//components/signin/core/common", "//google_apis", @@ -56,9 +56,8 @@ source_set("unit_tests") { deps = [ ":test_support", - "//base:prefs", - "//base:prefs_test_support", "//components/pref_registry:test_support", + "//components/prefs:test_support", "//components/signin/core/browser", "//components/signin/core/browser:test_support", "//components/signin/core/common", diff --git a/components/ssl_config/BUILD.gn b/components/ssl_config/BUILD.gn index 709cb3d..babcc5c 100644 --- a/components/ssl_config/BUILD.gn +++ b/components/ssl_config/BUILD.gn @@ -15,9 +15,9 @@ source_set("ssl_config") { deps = [ "//base", - "//base:prefs", "//components/content_settings/core/browser", "//components/content_settings/core/common", + "//components/prefs", "//net", ] } @@ -30,7 +30,7 @@ source_set("unit_tests") { deps = [ ":ssl_config", "//base", - "//base:prefs_test_support", + "//components/prefs:test_support", "//net", "//testing/gtest", ] diff --git a/components/startup_metric_utils/browser/BUILD.gn b/components/startup_metric_utils/browser/BUILD.gn index a56b59f..7d03b43 100644 --- a/components/startup_metric_utils/browser/BUILD.gn +++ b/components/startup_metric_utils/browser/BUILD.gn @@ -25,7 +25,7 @@ source_set("lib") { deps = [ "//base", - "//base:prefs", + "//components/prefs", "//components/version_info", ] } diff --git a/components/suggestions/BUILD.gn b/components/suggestions/BUILD.gn index b9b1aea..4ffad36 100644 --- a/components/suggestions/BUILD.gn +++ b/components/suggestions/BUILD.gn @@ -23,7 +23,7 @@ source_set("suggestions") { public_deps = [ "//base", - "//base:prefs", + "//components/prefs", "//components/suggestions/proto", "//net", "//ui/gfx", diff --git a/components/sync_bookmarks/BUILD.gn b/components/sync_bookmarks/BUILD.gn index 705f3c3..a1eb017 100644 --- a/components/sync_bookmarks/BUILD.gn +++ b/components/sync_bookmarks/BUILD.gn @@ -36,10 +36,10 @@ source_set("unit_tests") { deps = [ ":sync_bookmarks", "//base", - "//base:prefs_test_support", "//components/bookmarks/browser", "//components/bookmarks/test", "//components/history/core/browser", + "//components/prefs:test_support", "//components/sync_driver", "//components/sync_driver:test_support", "//sync", diff --git a/components/sync_driver/BUILD.gn b/components/sync_driver/BUILD.gn index 49debde..46e586f 100644 --- a/components/sync_driver/BUILD.gn +++ b/components/sync_driver/BUILD.gn @@ -124,11 +124,11 @@ source_set("sync_driver") { ] deps = [ "//base", - "//base:prefs", "//base/third_party/dynamic_annotations", "//components/data_use_measurement/core", "//components/invalidation/public", "//components/os_crypt", + "//components/prefs", "//components/pref_registry", "//components/signin/core/browser", "//components/version_info", @@ -230,11 +230,11 @@ source_set("unit_tests") { deps = [ ":test_support", "//base", - "//base:prefs_test_support", "//base/test:test_support", "//components/invalidation/impl", "//components/os_crypt", "//components/pref_registry:test_support", + "//components/prefs:test_support", "//components/signin/core/browser:test_support", "//components/syncable_prefs", "//components/syncable_prefs:test_support", diff --git a/components/sync_sessions/BUILD.gn b/components/sync_sessions/BUILD.gn index 3f6ceb8..669b7fb 100644 --- a/components/sync_sessions/BUILD.gn +++ b/components/sync_sessions/BUILD.gn @@ -49,10 +49,10 @@ source_set("sync_sessions") { deps = [ "//base", - "//base:prefs", "//components/bookmarks/browser", "//components/favicon/core", "//components/history/core/browser", + "//components/prefs", "//components/sessions", "//components/sync_driver", "//components/variations", @@ -97,11 +97,10 @@ source_set("unit_tests") { deps = [ ":sync_sessions", ":test_support", - "//base:prefs", - "//base:prefs_test_support", "//base/test:test_support", "//components/bookmarks/browser", "//components/history/core/browser", + "//components/prefs:test_support", "//components/sessions:test_support", "//components/sync_driver", "//components/sync_driver:test_support", diff --git a/components/syncable_prefs/BUILD.gn b/components/syncable_prefs/BUILD.gn index c854abb..d2c94ac 100644 --- a/components/syncable_prefs/BUILD.gn +++ b/components/syncable_prefs/BUILD.gn @@ -21,8 +21,8 @@ source_set("syncable_prefs") { deps = [ "//base", - "//base:prefs", "//components/pref_registry", + "//components/prefs", "//sync", ] @@ -46,8 +46,8 @@ source_set("test_support") { deps = [ ":syncable_prefs", "//base", - "//base:prefs_test_support", "//components/pref_registry", + "//components/prefs:test_support", "//testing/gtest", ] } @@ -62,8 +62,8 @@ source_set("unit_tests") { deps = [ ":syncable_prefs", ":test_support", - "//base:prefs", "//components/pref_registry", + "//components/prefs", "//sync:test_support_sync_api", "//testing/gtest", ] diff --git a/components/translate/core/browser/BUILD.gn b/components/translate/core/browser/BUILD.gn index d6593fd..d14062c 100644 --- a/components/translate/core/browser/BUILD.gn +++ b/components/translate/core/browser/BUILD.gn @@ -42,10 +42,10 @@ source_set("browser") { deps = [ "//base", "//base:i18n", - "//base:prefs", "//components/data_use_measurement/core", "//components/language_usage_metrics", "//components/pref_registry", + "//components/prefs", "//components/resources:components_resources", "//components/strings", "//components/translate/core/common", @@ -84,8 +84,8 @@ source_set("unit_tests") { deps = [ ":browser", "//base", - "//base:prefs", "//components/pref_registry:test_support", + "//components/prefs", "//components/translate/core/common", "//net:test_support", "//testing/gtest", diff --git a/components/translate/ios/browser/BUILD.gn b/components/translate/ios/browser/BUILD.gn index d71d121..1eefbb0 100644 --- a/components/translate/ios/browser/BUILD.gn +++ b/components/translate/ios/browser/BUILD.gn @@ -21,7 +21,7 @@ source_set("browser") { deps = [ ":injected_js", "//base", - "//base:prefs", + "//components/prefs", "//components/translate/core/browser", "//components/translate/core/common", "//components/translate/core/language_detection", @@ -50,7 +50,7 @@ source_set("unit_tests") { deps = [ ":browser", "//base", - "//base:prefs_test_support", + "//components/prefs:test_support", "//components/resources", "//components/translate/core/common", "//ios/web:test_support", diff --git a/components/ui/zoom/BUILD.gn b/components/ui/zoom/BUILD.gn index d1d5b00..4a2f3ea 100644 --- a/components/ui/zoom/BUILD.gn +++ b/components/ui/zoom/BUILD.gn @@ -18,7 +18,7 @@ source_set("zoom") { deps = [ "//base", - "//base:prefs", + "//components/prefs", "//content/public/browser", "//content/public/common", "//ipc", @@ -47,7 +47,7 @@ source_set("unit_tests") { ] deps = [ ":zoom", - "//base:prefs", + "//components/prefs", "//content/public/common", "//testing/gtest", ] diff --git a/components/user_manager/BUILD.gn b/components/user_manager/BUILD.gn index 959bcfe..32fbdc2 100644 --- a/components/user_manager/BUILD.gn +++ b/components/user_manager/BUILD.gn @@ -38,7 +38,7 @@ component("user_manager") { "user_type.h", ] deps += [ - "//base:prefs", + "//components/prefs", "//components/session_manager/core", "//google_apis", "//url", diff --git a/components/user_prefs/BUILD.gn b/components/user_prefs/BUILD.gn index 3d777d2..ed09b2d 100644 --- a/components/user_prefs/BUILD.gn +++ b/components/user_prefs/BUILD.gn @@ -13,6 +13,6 @@ component("user_prefs") { deps = [ "//base", - "//base:prefs", + "//components/prefs", ] } diff --git a/components/user_prefs/tracked/BUILD.gn b/components/user_prefs/tracked/BUILD.gn index 25fc09c..8a855ee 100644 --- a/components/user_prefs/tracked/BUILD.gn +++ b/components/user_prefs/tracked/BUILD.gn @@ -54,8 +54,8 @@ static_library("user_prefs_tracked") { deps = [ "//base:base", - "//base:prefs", "//components/pref_registry", + "//components/prefs", "//crypto:crypto", ] } @@ -89,8 +89,7 @@ source_set("unit_tests") { ":user_prefs_tracked", ":user_prefs_tracked_test_support", "//base:base", - "//base:prefs", - "//base:prefs_test_support", + "//components/prefs:test_support", "//testing/gtest", ] } diff --git a/components/variations/BUILD.gn b/components/variations/BUILD.gn index 482d400..32c71f2 100644 --- a/components/variations/BUILD.gn +++ b/components/variations/BUILD.gn @@ -68,8 +68,8 @@ source_set("variations") { deps = [ "proto", "//base", - "//base:prefs", "//components/crash/core/common", + "//components/prefs", "//crypto", "//third_party/mt19937ar", "//third_party/protobuf:protobuf_lite", @@ -118,8 +118,8 @@ source_set("unit_tests") { ":variations", "net", "proto", - "//base:prefs_test_support", "//base/test:test_support", + "//components/prefs:test_support", "//testing/gtest", "//third_party/zlib:compression_utils", ] diff --git a/components/variations/service/BUILD.gn b/components/variations/service/BUILD.gn index 66fa838..099be5c2 100644 --- a/components/variations/service/BUILD.gn +++ b/components/variations/service/BUILD.gn @@ -13,11 +13,11 @@ source_set("service") { deps = [ "//base", - "//base:prefs", "//components/data_use_measurement/core", "//components/metrics", "//components/network_time", "//components/pref_registry", + "//components/prefs", "//components/variations", "//components/variations/proto", "//components/version_info", @@ -37,8 +37,8 @@ source_set("unit_tests") { deps = [ ":service", "//base", - "//base:prefs_test_support", "//base/test:test_support", + "//components/prefs:test_support", "//components/variations", "//components/variations/proto", "//components/web_resource:test_support", diff --git a/components/wallpaper/BUILD.gn b/components/wallpaper/BUILD.gn index befd942..04cc0a1 100644 --- a/components/wallpaper/BUILD.gn +++ b/components/wallpaper/BUILD.gn @@ -17,7 +17,7 @@ component("wallpaper") { "//skia", ] deps = [ - "//base:prefs", + "//components/prefs", "//ui/gfx", "//ui/gfx/geometry", "//url", diff --git a/components/web_cache/browser/BUILD.gn b/components/web_cache/browser/BUILD.gn index e64a2d5..25f1d6d 100644 --- a/components/web_cache/browser/BUILD.gn +++ b/components/web_cache/browser/BUILD.gn @@ -12,7 +12,7 @@ source_set("browser") { deps = [ "//base", - "//base:prefs", + "//components/prefs", "//components/web_cache/common", "//content/public/browser", "//third_party/WebKit/public:blink", diff --git a/components/web_resource/BUILD.gn b/components/web_resource/BUILD.gn index 6c396d9..387a006 100644 --- a/components/web_resource/BUILD.gn +++ b/components/web_resource/BUILD.gn @@ -29,9 +29,9 @@ static_library("web_resource") { deps = [ "//base", - "//base:prefs", "//components/google/core/browser", "//components/pref_registry", + "//components/prefs", "//components/version_info", "//net", "//ui/base", @@ -66,7 +66,7 @@ source_set("unit_tests") { ":test_support", ":web_resource", "//base", - "//base:prefs_test_support", + "//components/prefs:test_support", "//components/version_info", "//net:test_support", "//testing/gtest", diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn index ad2ea80..45db1d7 100644 --- a/extensions/BUILD.gn +++ b/extensions/BUILD.gn @@ -81,9 +81,9 @@ source_set("test_support") { deps = [ ":extensions_resources", "//base", - "//base:prefs_test_support", "//components/guest_view/browser:test_support", "//components/pref_registry:test_support", + "//components/prefs:test_support", "//content/public/common", "//content/test:test_support", "//extensions/browser", @@ -175,10 +175,10 @@ test("extensions_unittests") { ":shell_and_test_pak", ":test_support", "//base", - "//base:prefs_test_support", "//base/test:test_support", "//components/keyed_service/content", "//components/pref_registry:test_support", + "//components/prefs:test_support", "//components/user_prefs", "//content/test:test_support", "//device/bluetooth:mocks", @@ -251,8 +251,8 @@ test("extensions_browsertests") { # TODO(yoz): find the right deps "//base", - "//base:prefs_test_support", "//base/test:test_support", + "//components/prefs:test_support", "//components/storage_monitor:test_support", "//content/test:test_support", "//device/bluetooth:mocks", diff --git a/extensions/shell/BUILD.gn b/extensions/shell/BUILD.gn index fbc8b9b..52e3cab 100644 --- a/extensions/shell/BUILD.gn +++ b/extensions/shell/BUILD.gn @@ -30,13 +30,13 @@ source_set("app_shell_lib") { ":resources", ":version_header", "//base", - "//base:prefs", "//components/devtools_discovery", "//components/devtools_http_handler", "//components/guest_view/browser", "//components/guest_view/common", "//components/guest_view/renderer", "//components/pref_registry", + "//components/prefs", "//components/update_client", "//components/user_prefs", "//components/web_cache/renderer", diff --git a/ios/chrome/BUILD.gn b/ios/chrome/BUILD.gn index 1f7355f..6145aef 100644 --- a/ios/chrome/BUILD.gn +++ b/ios/chrome/BUILD.gn @@ -42,12 +42,12 @@ test("ios_chrome_unittests") { deps = [ "//base", - "//base:prefs_test_support", "//base/test:test_support", "//components/bookmarks/test", "//components/favicon_base", "//components/metrics", "//components/metrics:test_support", + "//components/prefs:test_support", "//components/signin/core/browser:test_support", "//components/signin/ios/browser:test_support", "//components/sync_driver:test_support", diff --git a/ios/chrome/browser/BUILD.gn b/ios/chrome/browser/BUILD.gn index 8c46774..cea1de6 100644 --- a/ios/chrome/browser/BUILD.gn +++ b/ios/chrome/browser/BUILD.gn @@ -498,7 +498,6 @@ source_set("browser") { ":about_flags", ":injected_js", "//base", - "//base:prefs", "//breakpad:client", "//components/about_handler", "//components/autofill/core/browser", @@ -544,6 +543,7 @@ source_set("browser") { "//components/password_manager/sync/browser", "//components/policy:policy_component_common", "//components/pref_registry", + "//components/prefs", "//components/profile_metrics", "//components/proxy_config", "//components/rappor", diff --git a/ios/chrome/test/BUILD.gn b/ios/chrome/test/BUILD.gn index 8be284b..fe3d023 100644 --- a/ios/chrome/test/BUILD.gn +++ b/ios/chrome/test/BUILD.gn @@ -20,8 +20,8 @@ source_set("test") { deps = [ "//base", - "//base:prefs", "//components/network_time", + "//components/prefs", "//ios/chrome/browser", "//ios/public/provider/chrome/browser", "//ios/public/test", diff --git a/mash/wallpaper/BUILD.gn b/mash/wallpaper/BUILD.gn index 26cad0f..00232e6 100644 --- a/mash/wallpaper/BUILD.gn +++ b/mash/wallpaper/BUILD.gn @@ -13,11 +13,11 @@ mojo_native_application("wallpaper") { deps = [ "//base", - "//base:prefs", "//components/filesystem/public/cpp/prefs", "//components/filesystem/public/interfaces", "//components/mus/public/cpp", "//components/mus/public/interfaces", + "//components/prefs", "//mash/wm/public/interfaces", "//mojo/public/cpp/bindings", "//mojo/services/tracing/public/cpp", diff --git a/net/BUILD.gn b/net/BUILD.gn index 56525c6..102c703 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -122,8 +122,8 @@ if (!is_nacl) { net_shared_sources += gypi_values.net_non_nacl_sources net_shared_deps += [ - "//base:prefs", "//base/third_party/dynamic_annotations", + "//components/prefs", "//sdch", "//third_party/zlib", ] @@ -1407,7 +1407,6 @@ test("net_unittests") { ":test_support", "//base", "//base:i18n", - "//base:prefs_test_support", "//base/third_party/dynamic_annotations", "//crypto", "//crypto:platform", diff --git a/rlz/BUILD.gn b/rlz/BUILD.gn index fd5862d..4bc2224 100644 --- a/rlz/BUILD.gn +++ b/rlz/BUILD.gn @@ -113,7 +113,6 @@ test("rlz_unittests") { ":rlz_lib", ":test_support", "//base", - "//base:prefs", "//net:test_support", "//testing/gmock", "//testing/gtest", diff --git a/third_party/libaddressinput/BUILD.gn b/third_party/libaddressinput/BUILD.gn index 36fed6f..4132f14 100644 --- a/third_party/libaddressinput/BUILD.gn +++ b/third_party/libaddressinput/BUILD.gn @@ -210,8 +210,8 @@ if (!is_android || use_aura) { deps = [ ":libaddressinput", ":strings", - "//base:prefs", "//base/test:run_all_unittests", + "//components/prefs", "//net:test_support", "//testing/gtest", ] |