diff options
291 files changed, 473 insertions, 664 deletions
diff --git a/android_webview/DEPS b/android_webview/DEPS index b53964d..cd20d21 100644 --- a/android_webview/DEPS +++ b/android_webview/DEPS @@ -10,6 +10,7 @@ include_rules = [ "+components/data_reduction_proxy", "+components/devtools_discovery", "+components/metrics", + "+components/prefs", "+content/public/common", "+crypto", "+gpu", diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc index 0003e2e..a5e985f 100644 --- a/android_webview/browser/aw_browser_context.cc +++ b/android_webview/browser/aw_browser_context.cc @@ -20,8 +20,6 @@ #include "base/base_paths_android.h" #include "base/bind.h" #include "base/path_service.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/pref_service_factory.h" #include "components/autofill/core/common/autofill_pref_names.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h" @@ -35,6 +33,8 @@ #include "components/policy/core/browser/configuration_policy_pref_store.h" #include "components/policy/core/browser/url_blacklist_manager.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/pref_service_factory.h" #include "components/url_formatter/url_fixer.h" #include "components/user_prefs/user_prefs.h" #include "components/visitedlink/browser/visitedlink_master.h" @@ -347,7 +347,7 @@ void AwBrowserContext::InitUserPrefService() { metrics::MetricsService::RegisterPrefs(pref_registry); - base::PrefServiceFactory pref_service_factory; + PrefServiceFactory pref_service_factory; pref_service_factory.set_user_prefs(make_scoped_refptr(new AwPrefStore())); pref_service_factory.set_managed_prefs( make_scoped_refptr(new policy::ConfigurationPolicyPrefStore( diff --git a/android_webview/browser/aw_metrics_service_client.cc b/android_webview/browser/aw_metrics_service_client.cc index eb07828..26d465f 100644 --- a/android_webview/browser/aw_metrics_service_client.cc +++ b/android_webview/browser/aw_metrics_service_client.cc @@ -9,7 +9,6 @@ #include "base/files/file_util.h" #include "base/guid.h" #include "base/i18n/rtl.h" -#include "base/prefs/pref_service.h" #include "components/metrics/call_stack_profile_metrics_provider.h" #include "components/metrics/gpu/gpu_metrics_provider.h" #include "components/metrics/metrics_pref_names.h" @@ -19,6 +18,7 @@ #include "components/metrics/profiler/profiler_metrics_provider.h" #include "components/metrics/ui/screen_info_metrics_provider.h" #include "components/metrics/url_constants.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/browser_thread.h" namespace android_webview { diff --git a/android_webview/browser/aw_pref_store.h b/android_webview/browser/aw_pref_store.h index b3fd021..6607e25 100644 --- a/android_webview/browser/aw_pref_store.h +++ b/android_webview/browser/aw_pref_store.h @@ -12,8 +12,8 @@ #include "base/compiler_specific.h" #include "base/macros.h" #include "base/observer_list.h" -#include "base/prefs/persistent_pref_store.h" -#include "base/prefs/pref_value_map.h" +#include "components/prefs/persistent_pref_store.h" +#include "components/prefs/pref_value_map.h" // A light-weight prefstore implementation that keeps preferences // in a memory backed store. This is not a persistent prefstore -- we diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc index 7ab710f..7b54fa9 100644 --- a/android_webview/browser/net/aw_url_request_context_getter.cc +++ b/android_webview/browser/net/aw_url_request_context_getter.cc @@ -19,13 +19,13 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/threading/sequenced_worker_pool.h" #include "base/threading/worker_pool.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/cookie_store_factory.h" diff --git a/android_webview/browser/net/aw_url_request_context_getter.h b/android_webview/browser/net/aw_url_request_context_getter.h index bdafa05..46c2146 100644 --- a/android_webview/browser/net/aw_url_request_context_getter.h +++ b/android_webview/browser/net/aw_url_request_context_getter.h @@ -9,7 +9,7 @@ #include "base/files/file_path.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_member.h" +#include "components/prefs/pref_member.h" #include "content/public/browser/content_browser_client.h" #include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_job_factory.h" diff --git a/android_webview/native/aw_autofill_client.cc b/android_webview/native/aw_autofill_client.cc index cb7b646..e70afc2 100644 --- a/android_webview/native/aw_autofill_client.cc +++ b/android_webview/native/aw_autofill_client.cc @@ -13,13 +13,13 @@ #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" #include "base/logging.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/pref_service_factory.h" #include "components/autofill/core/browser/autofill_popup_delegate.h" #include "components/autofill/core/browser/suggestion.h" #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" #include "components/autofill/core/common/autofill_pref_names.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/pref_service_factory.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" diff --git a/android_webview/native/aw_autofill_client.h b/android_webview/native/aw_autofill_client.h index 78cfa96..da8a685 100644 --- a/android_webview/native/aw_autofill_client.h +++ b/android_webview/native/aw_autofill_client.h @@ -11,9 +11,9 @@ #include "base/android/jni_weak_ref.h" #include "base/compiler_specific.h" #include "base/macros.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service_factory.h" #include "components/autofill/core/browser/autofill_client.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service_factory.h" #include "content/public/browser/web_contents_user_data.h" namespace autofill { diff --git a/ash/system/DEPS b/ash/system/DEPS index 1121c69..246c8e1 100644 --- a/ash/system/DEPS +++ b/ash/system/DEPS @@ -1,4 +1,5 @@ include_rules = [ "-chromeos", + "+components/prefs", "+components/signin/core/account_id", ] diff --git a/ash/system/chromeos/power/power_event_observer.cc b/ash/system/chromeos/power/power_event_observer.cc index 3dad764..284e09f 100644 --- a/ash/system/chromeos/power/power_event_observer.cc +++ b/ash/system/chromeos/power/power_event_observer.cc @@ -8,8 +8,8 @@ #include "ash/shell.h" #include "ash/system/tray/system_tray_notifier.h" #include "ash/wm/power_button_controller.h" -#include "base/prefs/pref_service.h" #include "chromeos/dbus/dbus_thread_manager.h" +#include "components/prefs/pref_service.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" #include "ui/base/user_activity/user_activity_detector.h" diff --git a/base/prefs/DEPS b/base/prefs/DEPS deleted file mode 100644 index 2edd44e..0000000 --- a/base/prefs/DEPS +++ /dev/null @@ -1,4 +0,0 @@ -# TODO(brettw) remove this when prefs is completely moved to components. -include_rules = [ - "+components/prefs", -] diff --git a/base/prefs/base_prefs_export.h b/base/prefs/base_prefs_export.h deleted file mode 100644 index 477e1aa..0000000 --- a/base/prefs/base_prefs_export.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2012 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. - -// TODO(brettw) remove this forwarding header when prefs is completely moved to -// components. -#include "components/prefs/base_prefs_export.h" diff --git a/base/prefs/default_pref_store.h b/base/prefs/default_pref_store.h deleted file mode 100644 index e590bf8..0000000 --- a/base/prefs/default_pref_store.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2012 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. - -// TODO(brettw) remove this forwarding header when prefs is completely moved to -// components. -#include "components/prefs/default_pref_store.h" diff --git a/base/prefs/json_pref_store.h b/base/prefs/json_pref_store.h deleted file mode 100644 index 247102f..0000000 --- a/base/prefs/json_pref_store.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2012 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. - -// TODO(brettw) remove this forwarding header when prefs is completely moved to -// components. -#include "components/prefs/json_pref_store.h" diff --git a/base/prefs/mock_pref_change_callback.h b/base/prefs/mock_pref_change_callback.h deleted file mode 100644 index 90ad294..0000000 --- a/base/prefs/mock_pref_change_callback.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2011 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. - -// TODO(brettw) remove this forwarding header when prefs is completely moved to -// components. -#include "components/prefs/mock_pref_change_callback.h" diff --git a/base/prefs/overlay_user_pref_store.h b/base/prefs/overlay_user_pref_store.h deleted file mode 100644 index 594c501..0000000 --- a/base/prefs/overlay_user_pref_store.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2012 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. - -// TODO(brettw) remove this forwarding header when prefs is completely moved to -// components. -#include "components/prefs/overlay_user_pref_store.h" diff --git a/base/prefs/persistent_pref_store.h b/base/prefs/persistent_pref_store.h deleted file mode 100644 index a0fcf68..0000000 --- a/base/prefs/persistent_pref_store.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2012 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. - -// TODO(brettw) remove this forwarding header when prefs is completely moved to -// components. -#include "components/prefs/persistent_pref_store.h" diff --git a/base/prefs/pref_change_registrar.h b/base/prefs/pref_change_registrar.h deleted file mode 100644 index 517b63f..0000000 --- a/base/prefs/pref_change_registrar.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2010 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. - -// TODO(brettw) remove this forwarding header when prefs is completely moved to -// components. -#include "components/prefs/pref_change_registrar.h" diff --git a/base/prefs/pref_filter.h b/base/prefs/pref_filter.h deleted file mode 100644 index 6ed06bc..0000000 --- a/base/prefs/pref_filter.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2013 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. - -// TODO(brettw) remove this forwarding header when prefs is completely moved to -// components. -#include "components/prefs/pref_filter.h" diff --git a/base/prefs/pref_member.h b/base/prefs/pref_member.h deleted file mode 100644 index ff90e5e..0000000 --- a/base/prefs/pref_member.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2012 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. - -// TODO(brettw) remove this forwarding header when prefs is completely moved to -// components. -#include "components/prefs/pref_member.h" diff --git a/base/prefs/pref_notifier.h b/base/prefs/pref_notifier.h deleted file mode 100644 index d99f5b8..0000000 --- a/base/prefs/pref_notifier.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2011 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. - -// TODO(brettw) remove this forwarding header when prefs is completely moved to -// components. -#include "components/prefs/pref_notifier.h" diff --git a/base/prefs/pref_notifier_impl.h b/base/prefs/pref_notifier_impl.h deleted file mode 100644 index f47cc3e..0000000 --- a/base/prefs/pref_notifier_impl.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2011 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. - -// TODO(brettw) remove this forwarding header when prefs is completely moved to -// components. -#include "components/prefs/pref_notifier_impl.h" diff --git a/base/prefs/pref_observer.h b/base/prefs/pref_observer.h deleted file mode 100644 index df5d1af..0000000 --- a/base/prefs/pref_observer.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2012 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. - -// TODO(brettw) remove this forwarding header when prefs is completely moved to -// components. -#include "components/prefs/pref_observer.h" diff --git a/base/prefs/pref_registry.h b/base/prefs/pref_registry.h deleted file mode 100644 index 94126d1..0000000 --- a/base/prefs/pref_registry.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2012 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. - -// TODO(brettw) remove this forwarding header when prefs is completely moved to -// components. -#include "components/prefs/pref_registry.h" diff --git a/base/prefs/pref_registry_simple.h b/base/prefs/pref_registry_simple.h deleted file mode 100644 index 0f157a2..0000000 --- a/base/prefs/pref_registry_simple.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2012 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. - -// TODO(brettw) remove this forwarding header when prefs is completely moved to -// components. -#include "components/prefs/pref_registry_simple.h" diff --git a/base/prefs/pref_service.h b/base/prefs/pref_service.h deleted file mode 100644 index aced2f0..0000000 --- a/base/prefs/pref_service.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2012 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. - -// TODO(brettw) remove this forwarding header when prefs is completely moved to -// components. -#include "components/prefs/pref_service.h" diff --git a/base/prefs/pref_service_factory.h b/base/prefs/pref_service_factory.h deleted file mode 100644 index 3bc4932..0000000 --- a/base/prefs/pref_service_factory.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2013 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. - -// TODO(brettw) remove this forwarding header when prefs is completely moved to -// components. -#include "components/prefs/pref_service_factory.h" diff --git a/base/prefs/pref_store.h b/base/prefs/pref_store.h deleted file mode 100644 index c1c6583..0000000 --- a/base/prefs/pref_store.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2012 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. - -// TODO(brettw) remove this forwarding header when prefs is completely moved to -// components. -#include "components/prefs/pref_store.h" diff --git a/base/prefs/pref_store_observer_mock.h b/base/prefs/pref_store_observer_mock.h deleted file mode 100644 index be8e4d5..0000000 --- a/base/prefs/pref_store_observer_mock.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2011 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. - -// TODO(brettw) remove this forwarding header when prefs is completely moved to -// components. -#include "components/prefs/pref_store_observer_mock.h" diff --git a/base/prefs/pref_value_map.h b/base/prefs/pref_value_map.h deleted file mode 100644 index e1ec94a..0000000 --- a/base/prefs/pref_value_map.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2011 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. - -// TODO(brettw) remove this forwarding header when prefs is completely moved to -// components. -#include "components/prefs/pref_value_map.h" diff --git a/base/prefs/pref_value_store.h b/base/prefs/pref_value_store.h deleted file mode 100644 index de10c56..0000000 --- a/base/prefs/pref_value_store.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2012 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. - -// TODO(brettw) remove this forwarding header when prefs is completely moved to -// components. -#include "components/prefs/pref_value_store.h" diff --git a/base/prefs/scoped_user_pref_update.h b/base/prefs/scoped_user_pref_update.h deleted file mode 100644 index ce03c6a..0000000 --- a/base/prefs/scoped_user_pref_update.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2013 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. - -// TODO(brettw) remove this forwarding header when prefs is completely moved to -// components. -#include "components/prefs/scoped_user_pref_update.h" diff --git a/base/prefs/testing_pref_service.h b/base/prefs/testing_pref_service.h deleted file mode 100644 index c60b89e..0000000 --- a/base/prefs/testing_pref_service.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2012 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. - -// TODO(brettw) remove this forwarding header when prefs is completely moved to -// components. -#include "components/prefs/testing_pref_service.h" diff --git a/base/prefs/testing_pref_store.h b/base/prefs/testing_pref_store.h deleted file mode 100644 index 297aa11..0000000 --- a/base/prefs/testing_pref_store.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2012 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. - -// TODO(brettw) remove this forwarding header when prefs is completely moved to -// components. -#include "components/prefs/testing_pref_store.h" diff --git a/base/prefs/value_map_pref_store.h b/base/prefs/value_map_pref_store.h deleted file mode 100644 index 4373ff7..0000000 --- a/base/prefs/value_map_pref_store.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2012 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. - -// TODO(brettw) remove this forwarding header when prefs is completely moved to -// components. -#include "components/prefs/value_map_pref_store.h" diff --git a/base/prefs/writeable_pref_store.h b/base/prefs/writeable_pref_store.h deleted file mode 100644 index 69bd2cb..0000000 --- a/base/prefs/writeable_pref_store.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// TODO(brettw) remove this forwarding header when prefs is completely moved to -// components. -#include "components/prefs/writeable_pref_store.h" diff --git a/chrome/browser/chromeos/arc/arc_auth_service.cc b/chrome/browser/chromeos/arc/arc_auth_service.cc index 55f2baf..82ae12c 100644 --- a/chrome/browser/chromeos/arc/arc_auth_service.cc +++ b/chrome/browser/chromeos/arc/arc_auth_service.cc @@ -6,12 +6,12 @@ #include <utility> -#include "base/prefs/pref_service.h" #include "chrome/browser/chromeos/arc/arc_auth_ui.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "components/arc/arc_bridge_service.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" namespace arc { diff --git a/chrome/browser/chromeos/arc/arc_auth_service.h b/chrome/browser/chromeos/arc/arc_auth_service.h index 37f70b4e..1e3eea4 100644 --- a/chrome/browser/chromeos/arc/arc_auth_service.h +++ b/chrome/browser/chromeos/arc/arc_auth_service.h @@ -9,13 +9,13 @@ #include "base/macros.h" #include "base/observer_list.h" -#include "base/prefs/pref_change_registrar.h" #include "base/threading/thread_checker.h" #include "chrome/browser/chromeos/arc/arc_auth_ui.h" #include "components/arc/arc_bridge_service.h" #include "components/arc/arc_service.h" #include "components/arc/auth/arc_auth_fetcher.h" #include "components/arc/common/auth.mojom.h" +#include "components/prefs/pref_change_registrar.h" #include "mojo/public/cpp/bindings/binding.h" class PrefService; diff --git a/chrome/browser/chromeos/arc/arc_auth_service_unittest.cc b/chrome/browser/chromeos/arc/arc_auth_service_unittest.cc index 822b7fa..22b329c1 100644 --- a/chrome/browser/chromeos/arc/arc_auth_service_unittest.cc +++ b/chrome/browser/chromeos/arc/arc_auth_service_unittest.cc @@ -10,7 +10,6 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "chrome/browser/chromeos/arc/arc_auth_service.h" #include "chrome/browser/profiles/profile.h" @@ -19,6 +18,7 @@ #include "components/arc/arc_bridge_service.h" #include "components/arc/auth/arc_auth_fetcher.h" #include "components/arc/test/fake_arc_bridge_service.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/gaia/gaia_constants.h" diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc index 01ec241..f447b91 100644 --- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc @@ -907,7 +907,7 @@ class WizardControllerBrokenLocalStateTest : public WizardControllerTest { } void SetUpOnMainThread() override { - base::PrefServiceFactory factory; + PrefServiceFactory factory; factory.set_user_prefs(make_scoped_refptr(new PrefStoreStub())); local_state_ = factory.Create(new PrefRegistrySimple()); WizardController::set_local_state_for_testing(local_state_.get()); diff --git a/chrome/browser/prefs/profile_pref_store_manager_unittest.cc b/chrome/browser/prefs/profile_pref_store_manager_unittest.cc index 0d83b65..bfd5e36 100644 --- a/chrome/browser/prefs/profile_pref_store_manager_unittest.cc +++ b/chrome/browser/prefs/profile_pref_store_manager_unittest.cc @@ -144,7 +144,7 @@ class ProfilePrefStoreManagerTest : public testing::Test { void VerifyResetRecorded(bool reset_expected) { EXPECT_EQ(reset_expected, reset_recorded_); - base::PrefServiceFactory pref_service_factory; + PrefServiceFactory pref_service_factory; pref_service_factory.set_user_prefs(pref_store_); scoped_ptr<PrefService> pref_service( @@ -158,7 +158,7 @@ class ProfilePrefStoreManagerTest : public testing::Test { void ClearResetRecorded() { reset_recorded_ = false; - base::PrefServiceFactory pref_service_factory; + PrefServiceFactory pref_service_factory; pref_service_factory.set_user_prefs(pref_store_); scoped_ptr<PrefService> pref_service( diff --git a/chrome/browser/ui/app_list/app_list_service_unittest.cc b/chrome/browser/ui/app_list/app_list_service_unittest.cc index 0683b38..2e8f039e 100644 --- a/chrome/browser/ui/app_list/app_list_service_unittest.cc +++ b/chrome/browser/ui/app_list/app_list_service_unittest.cc @@ -100,7 +100,7 @@ class AppListServiceUnitTest : public testing::Test { AppListService::RegisterPrefs(pref_registry); profiles::RegisterPrefs(pref_registry); - base::PrefServiceFactory factory; + PrefServiceFactory factory; factory.set_user_prefs(make_scoped_refptr(new TestingPrefStore)); local_state_ = factory.Create(pref_registry); diff --git a/chromecast/browser/DEPS b/chromecast/browser/DEPS index c57cc05..c983df0 100644 --- a/chromecast/browser/DEPS +++ b/chromecast/browser/DEPS @@ -9,6 +9,7 @@ include_rules = [ "+components/devtools_http_handler", "+components/external_video_surface", "+components/network_hints/browser", + "+components/prefs", "+content/public/browser", "+gin/v8_initializer.h", "+gpu/command_buffer/service/gpu_switches.h", diff --git a/chromecast/browser/android/cast_window_manager.cc b/chromecast/browser/android/cast_window_manager.cc index 7a0c51f..a2ba453 100644 --- a/chromecast/browser/android/cast_window_manager.cc +++ b/chromecast/browser/android/cast_window_manager.cc @@ -11,13 +11,13 @@ #include "base/android/scoped_java_ref.h" #include "base/bind.h" #include "base/lazy_instance.h" -#include "base/prefs/pref_service.h" #include "chromecast/base/pref_names.h" #include "chromecast/browser/android/cast_window_android.h" #include "chromecast/browser/cast_browser_context.h" #include "chromecast/browser/cast_browser_main_parts.h" #include "chromecast/browser/cast_browser_process.h" #include "chromecast/browser/cast_content_browser_client.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" #include "ipc/ipc_channel.h" diff --git a/chromecast/browser/cast_browser_main_parts.cc b/chromecast/browser/cast_browser_main_parts.cc index e67b3d2..8c29892 100644 --- a/chromecast/browser/cast_browser_main_parts.cc +++ b/chromecast/browser/cast_browser_main_parts.cc @@ -14,7 +14,6 @@ #include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h" -#include "base/prefs/pref_registry_simple.h" #include "base/run_loop.h" #include "base/thread_task_runner_handle.h" #include "build/build_config.h" @@ -43,6 +42,7 @@ #include "chromecast/public/cast_media_shlib.h" #include "chromecast/public/cast_sys_info.h" #include "chromecast/service/cast_service.h" +#include "components/prefs/pref_registry_simple.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_security_policy.h" #include "content/public/browser/gpu_data_manager.h" diff --git a/chromecast/browser/cast_browser_process.cc b/chromecast/browser/cast_browser_process.cc index 747bc35..3f42342 100644 --- a/chromecast/browser/cast_browser_process.cc +++ b/chromecast/browser/cast_browser_process.cc @@ -7,7 +7,6 @@ #include <utility> #include "base/logging.h" -#include "base/prefs/pref_service.h" #include "build/build_config.h" #include "chromecast/base/metrics/cast_metrics_helper.h" #include "chromecast/browser/cast_browser_context.h" @@ -16,6 +15,7 @@ #include "chromecast/browser/metrics/cast_metrics_service_client.h" #include "chromecast/net/connectivity_checker.h" #include "chromecast/service/cast_service.h" +#include "components/prefs/pref_service.h" #if defined(OS_ANDROID) #include "components/crash/content/browser/crash_dump_manager_android.h" diff --git a/chromecast/browser/devtools/remote_debugging_server.h b/chromecast/browser/devtools/remote_debugging_server.h index 172e1fb..216655e 100644 --- a/chromecast/browser/devtools/remote_debugging_server.h +++ b/chromecast/browser/devtools/remote_debugging_server.h @@ -9,7 +9,7 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_member.h" +#include "components/prefs/pref_member.h" namespace devtools_http_handler { class DevToolsHttpHandler; diff --git a/chromecast/browser/metrics/cast_metrics_service_client.cc b/chromecast/browser/metrics/cast_metrics_service_client.cc index d3739c2..0d6aed7 100644 --- a/chromecast/browser/metrics/cast_metrics_service_client.cc +++ b/chromecast/browser/metrics/cast_metrics_service_client.cc @@ -8,8 +8,6 @@ #include "base/guid.h" #include "base/i18n/rtl.h" #include "base/logging.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/thread_task_runner_handle.h" #include "build/build_config.h" @@ -32,6 +30,8 @@ #include "components/metrics/profiler/profiler_metrics_provider.h" #include "components/metrics/ui/screen_info_metrics_provider.h" #include "components/metrics/url_constants.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "content/public/common/content_switches.h" #if defined(OS_LINUX) diff --git a/chromecast/browser/metrics/cast_stability_metrics_provider.cc b/chromecast/browser/metrics/cast_stability_metrics_provider.cc index ab21ac2..3829d6b 100644 --- a/chromecast/browser/metrics/cast_stability_metrics_provider.cc +++ b/chromecast/browser/metrics/cast_stability_metrics_provider.cc @@ -9,13 +9,13 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/metrics/sparse_histogram.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "chromecast/base/pref_names.h" #include "chromecast/browser/cast_browser_process.h" #include "chromecast/browser/metrics/cast_metrics_service_client.h" #include "components/metrics/metrics_service.h" #include "components/metrics/proto/system_profile.pb.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/child_process_data.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/notification_service.h" diff --git a/chromecast/browser/pref_service_helper.cc b/chromecast/browser/pref_service_helper.cc index 3265efb5..a81bbf90 100644 --- a/chromecast/browser/pref_service_helper.cc +++ b/chromecast/browser/pref_service_helper.cc @@ -10,12 +10,12 @@ #include "base/files/file_util.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/prefs/json_pref_store.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service_factory.h" -#include "base/prefs/pref_store.h" #include "chromecast/base/cast_paths.h" #include "chromecast/base/pref_names.h" +#include "components/prefs/json_pref_store.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service_factory.h" +#include "components/prefs/pref_store.h" #include "content/public/browser/browser_thread.h" namespace chromecast { @@ -56,7 +56,7 @@ scoped_ptr<PrefService> PrefServiceHelper::CreatePrefService( RegisterPlatformPrefs(registry); - base::PrefServiceFactory prefServiceFactory; + PrefServiceFactory prefServiceFactory; scoped_refptr<base::SequencedTaskRunner> task_runner = JsonPrefStore::GetTaskRunnerForFile( config_path, diff --git a/chromecast/browser/pref_service_helper.h b/chromecast/browser/pref_service_helper.h index cf41a92..1546cc8 100644 --- a/chromecast/browser/pref_service_helper.h +++ b/chromecast/browser/pref_service_helper.h @@ -12,9 +12,9 @@ #include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_service.h" #include "base/threading/sequenced_worker_pool.h" #include "base/threading/thread_checker.h" +#include "components/prefs/pref_service.h" class PrefRegistrySimple; diff --git a/chromeos/DEPS b/chromeos/DEPS index ecef880..f55569a 100644 --- a/chromeos/DEPS +++ b/chromeos/DEPS @@ -3,6 +3,7 @@ # be kept as small as possible. include_rules = [ "+components/device_event_log", + "+components/prefs", "+crypto", "+net", "+policy/proto", diff --git a/chromeos/audio/audio_devices_pref_handler_impl.cc b/chromeos/audio/audio_devices_pref_handler_impl.cc index 3f95829..61b2fc5 100644 --- a/chromeos/audio/audio_devices_pref_handler_impl.cc +++ b/chromeos/audio/audio_devices_pref_handler_impl.cc @@ -11,12 +11,12 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/logging.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/strings/string_number_conversions.h" #include "chromeos/audio/audio_device.h" #include "chromeos/chromeos_pref_names.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" namespace { diff --git a/chromeos/audio/audio_devices_pref_handler_impl.h b/chromeos/audio/audio_devices_pref_handler_impl.h index c2132db..7e30e59 100644 --- a/chromeos/audio/audio_devices_pref_handler_impl.h +++ b/chromeos/audio/audio_devices_pref_handler_impl.h @@ -9,10 +9,10 @@ #include "base/macros.h" #include "base/observer_list.h" -#include "base/prefs/pref_change_registrar.h" #include "base/values.h" #include "chromeos/audio/audio_devices_pref_handler.h" #include "chromeos/chromeos_export.h" +#include "components/prefs/pref_change_registrar.h" class PrefRegistrySimple; class PrefService; diff --git a/chromeos/audio/audio_devices_pref_handler_impl_unittest.cc b/chromeos/audio/audio_devices_pref_handler_impl_unittest.cc index dea358f..c0ffe80 100644 --- a/chromeos/audio/audio_devices_pref_handler_impl_unittest.cc +++ b/chromeos/audio/audio_devices_pref_handler_impl_unittest.cc @@ -8,11 +8,11 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" -#include "base/prefs/testing_pref_service.h" #include "chromeos/audio/audio_device.h" #include "chromeos/audio/audio_devices_pref_handler.h" #include "chromeos/chromeos_pref_names.h" #include "chromeos/dbus/audio_node.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" namespace chromeos { diff --git a/chromeos/login/auth/login_performer.cc b/chromeos/login/auth/login_performer.cc index f5a1f76..080084f 100644 --- a/chromeos/login/auth/login_performer.cc +++ b/chromeos/login/auth/login_performer.cc @@ -10,7 +10,6 @@ #include "base/metrics/histogram.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" #include "chromeos/dbus/dbus_thread_manager.h" @@ -18,6 +17,7 @@ #include "chromeos/login/user_names.h" #include "chromeos/login_event_recorder.h" #include "chromeos/settings/cros_settings_names.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/account_id/account_id.h" #include "google_apis/gaia/gaia_auth_util.h" #include "net/cookies/cookie_monster.h" diff --git a/chromeos/timezone/timezone_resolver.cc b/chromeos/timezone/timezone_resolver.cc index 5938654..c6ebfb4 100644 --- a/chromeos/timezone/timezone_resolver.cc +++ b/chromeos/timezone/timezone_resolver.cc @@ -15,14 +15,14 @@ #include "base/macros.h" #include "base/power_monitor/power_monitor.h" #include "base/power_monitor/power_observer.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/rand_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "chromeos/geolocation/geoposition.h" #include "chromeos/geolocation/simple_geolocation_provider.h" #include "chromeos/timezone/timezone_provider.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" namespace chromeos { diff --git a/components/autofill/core/browser/autocomplete_history_manager_unittest.cc b/components/autofill/core/browser/autocomplete_history_manager_unittest.cc index 095f13a..601e574 100644 --- a/components/autofill/core/browser/autocomplete_history_manager_unittest.cc +++ b/components/autofill/core/browser/autocomplete_history_manager_unittest.cc @@ -6,7 +6,6 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" -#include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" @@ -20,6 +19,7 @@ #include "components/autofill/core/browser/test_autofill_driver.h" #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" #include "components/autofill/core/common/form_data.h" +#include "components/prefs/pref_service.h" #include "components/webdata_services/web_data_service_test_util.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/autofill/core/browser/autofill_experiments.cc b/components/autofill/core/browser/autofill_experiments.cc index 3ccfe96..b878035 100644 --- a/components/autofill/core/browser/autofill_experiments.cc +++ b/components/autofill/core/browser/autofill_experiments.cc @@ -6,11 +6,11 @@ #include "base/command_line.h" #include "base/metrics/field_trial.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "build/build_config.h" #include "components/autofill/core/common/autofill_pref_names.h" #include "components/autofill/core/common/autofill_switches.h" +#include "components/prefs/pref_service.h" #include "components/sync_driver/sync_service.h" #include "google_apis/gaia/gaia_auth_util.h" diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc index 304d7cc..47a9037 100644 --- a/components/autofill/core/browser/autofill_manager.cc +++ b/components/autofill/core/browser/autofill_manager.cc @@ -23,7 +23,6 @@ #include "base/metrics/field_trial.h" #include "base/metrics/histogram_macros.h" #include "base/path_service.h" -#include "base/prefs/pref_service.h" #include "base/strings/string16.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" @@ -58,6 +57,7 @@ #include "components/autofill/core/common/form_field_data.h" #include "components/autofill/core/common/password_form_fill_data.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "google_apis/gaia/identity_provider.h" #include "grit/components_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/components/autofill/core/browser/autofill_manager_unittest.cc b/components/autofill/core/browser/autofill_manager_unittest.cc index b994ebf..3588d9d 100644 --- a/components/autofill/core/browser/autofill_manager_unittest.cc +++ b/components/autofill/core/browser/autofill_manager_unittest.cc @@ -13,7 +13,6 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" -#include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" @@ -42,6 +41,7 @@ #include "components/autofill/core/common/autofill_util.h" #include "components/autofill/core/common/form_data.h" #include "components/autofill/core/common/form_field_data.h" +#include "components/prefs/pref_service.h" #include "grit/components_strings.h" #include "net/url_request/url_request_test_util.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/components/autofill/core/browser/autofill_metrics_unittest.cc b/components/autofill/core/browser/autofill_metrics_unittest.cc index 9a45408..11dca25 100644 --- a/components/autofill/core/browser/autofill_metrics_unittest.cc +++ b/components/autofill/core/browser/autofill_metrics_unittest.cc @@ -10,7 +10,6 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" @@ -27,6 +26,7 @@ #include "components/autofill/core/common/autofill_pref_names.h" #include "components/autofill/core/common/form_data.h" #include "components/autofill/core/common/form_field_data.h" +#include "components/prefs/pref_service.h" #include "components/rappor/test_rappor_service.h" #include "components/signin/core/browser/account_tracker_service.h" #include "components/signin/core/browser/fake_signin_manager.h" diff --git a/components/autofill/core/browser/autofill_test_utils.cc b/components/autofill/core/browser/autofill_test_utils.cc index f33ce63..8854b8b 100644 --- a/components/autofill/core/browser/autofill_test_utils.cc +++ b/components/autofill/core/browser/autofill_test_utils.cc @@ -7,9 +7,6 @@ #include <string> #include "base/guid.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/pref_service_factory.h" -#include "base/prefs/testing_pref_store.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "components/autofill/core/browser/autofill_manager.h" @@ -22,6 +19,9 @@ #include "components/autofill/core/common/form_field_data.h" #include "components/os_crypt/os_crypt.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/pref_service_factory.h" +#include "components/prefs/testing_pref_store.h" #include "components/signin/core/browser/account_fetcher_service.h" #include "components/signin/core/browser/account_tracker_service.h" #include "components/signin/core/common/signin_pref_names.h" @@ -62,7 +62,7 @@ scoped_ptr<PrefService> PrefServiceForTesting() { AccountTrackerService::MIGRATION_NOT_STARTED); registry->RegisterInt64Pref(AccountFetcherService::kLastUpdatePref, 0); - base::PrefServiceFactory factory; + PrefServiceFactory factory; factory.set_user_prefs(make_scoped_refptr(new TestingPrefStore())); return factory.Create(registry.get()); } diff --git a/components/autofill/core/browser/autofill_wallet_data_type_controller.cc b/components/autofill/core/browser/autofill_wallet_data_type_controller.cc index 811d967..d4275e9 100644 --- a/components/autofill/core/browser/autofill_wallet_data_type_controller.cc +++ b/components/autofill/core/browser/autofill_wallet_data_type_controller.cc @@ -5,10 +5,10 @@ #include "components/autofill/core/browser/autofill_wallet_data_type_controller.h" #include "base/bind.h" -#include "base/prefs/pref_service.h" #include "components/autofill/core/browser/personal_data_manager.h" #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" #include "components/autofill/core/common/autofill_pref_names.h" +#include "components/prefs/pref_service.h" #include "components/sync_driver/sync_client.h" #include "components/sync_driver/sync_service.h" #include "sync/api/sync_error.h" diff --git a/components/autofill/core/browser/autofill_wallet_data_type_controller.h b/components/autofill/core/browser/autofill_wallet_data_type_controller.h index 2b890f8..2850c22 100644 --- a/components/autofill/core/browser/autofill_wallet_data_type_controller.h +++ b/components/autofill/core/browser/autofill_wallet_data_type_controller.h @@ -6,7 +6,7 @@ #define COMPONENTS_SYNC_DRIVER_GLUE_AUTOFILL_WALLET_DATA_TYPE_CONTROLLER_H_ #include "base/macros.h" -#include "base/prefs/pref_change_registrar.h" +#include "components/prefs/pref_change_registrar.h" #include "components/sync_driver/non_ui_data_type_controller.h" namespace autofill { diff --git a/components/autofill/core/browser/options_util_unittest.cc b/components/autofill/core/browser/options_util_unittest.cc index 5a89d00..0712dbe 100644 --- a/components/autofill/core/browser/options_util_unittest.cc +++ b/components/autofill/core/browser/options_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 "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" #include "components/autofill/core/browser/autofill_test_utils.h" #include "components/autofill/core/browser/options_util.h" #include "components/autofill/core/browser/test_personal_data_manager.h" #include "components/autofill/core/common/autofill_pref_names.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "components/sync_driver/data_type_manager.h" #include "components/sync_driver/fake_sync_service.h" #include "components/sync_driver/sync_service.h" diff --git a/components/autofill/core/browser/personal_data_manager.cc b/components/autofill/core/browser/personal_data_manager.cc index 7e17254..315cec1 100644 --- a/components/autofill/core/browser/personal_data_manager.cc +++ b/components/autofill/core/browser/personal_data_manager.cc @@ -13,7 +13,6 @@ #include "base/i18n/case_conversion.h" #include "base/i18n/timezone.h" -#include "base/prefs/pref_service.h" #include "base/profiler/scoped_tracker.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" @@ -35,6 +34,7 @@ #include "components/autofill/core/common/autofill_pref_names.h" #include "components/autofill/core/common/autofill_switches.h" #include "components/autofill/core/common/autofill_util.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/account_tracker_service.h" #include "components/signin/core/browser/signin_manager.h" #include "components/signin/core/common/signin_pref_names.h" diff --git a/components/autofill/core/browser/personal_data_manager.h b/components/autofill/core/browser/personal_data_manager.h index 48e3106..68515e5 100644 --- a/components/autofill/core/browser/personal_data_manager.h +++ b/components/autofill/core/browser/personal_data_manager.h @@ -14,7 +14,6 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/observer_list.h" -#include "base/prefs/pref_member.h" #include "base/strings/string16.h" #include "build/build_config.h" #include "components/autofill/core/browser/autofill_profile.h" @@ -24,6 +23,7 @@ #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" #include "components/autofill/core/browser/webdata/autofill_webdata_service_observer.h" #include "components/keyed_service/core/keyed_service.h" +#include "components/prefs/pref_member.h" #include "components/webdata/common/web_data_service_consumer.h" class AccountTrackerService; diff --git a/components/autofill/core/browser/personal_data_manager_unittest.cc b/components/autofill/core/browser/personal_data_manager_unittest.cc index f4358b8..33358a5 100644 --- a/components/autofill/core/browser/personal_data_manager_unittest.cc +++ b/components/autofill/core/browser/personal_data_manager_unittest.cc @@ -13,7 +13,6 @@ #include "base/guid.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/field_trial.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" #include "base/thread_task_runner_handle.h" @@ -31,6 +30,7 @@ #include "components/autofill/core/common/autofill_pref_names.h" #include "components/autofill/core/common/autofill_switches.h" #include "components/autofill/core/common/form_data.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/account_tracker_service.h" #include "components/signin/core/browser/fake_signin_manager.h" #include "components/signin/core/browser/test_signin_client.h" diff --git a/components/autofill/core/browser/test_autofill_client.h b/components/autofill/core/browser/test_autofill_client.h index 62a7039..d11e874 100644 --- a/components/autofill/core/browser/test_autofill_client.h +++ b/components/autofill/core/browser/test_autofill_client.h @@ -11,8 +11,8 @@ #include "base/i18n/rtl.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_service.h" #include "components/autofill/core/browser/autofill_client.h" +#include "components/prefs/pref_service.h" #include "components/rappor/test_rappor_service.h" #include "google_apis/gaia/fake_identity_provider.h" #include "google_apis/gaia/fake_oauth2_token_service.h" diff --git a/components/autofill/core/browser/ui/card_unmask_prompt_controller_impl.cc b/components/autofill/core/browser/ui/card_unmask_prompt_controller_impl.cc index da0fe37..9b5bfeb 100644 --- a/components/autofill/core/browser/ui/card_unmask_prompt_controller_impl.cc +++ b/components/autofill/core/browser/ui/card_unmask_prompt_controller_impl.cc @@ -7,7 +7,6 @@ #include <stddef.h> #include "base/bind.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" @@ -16,6 +15,7 @@ #include "components/autofill/core/browser/autofill_metrics.h" #include "components/autofill/core/browser/ui/card_unmask_prompt_view.h" #include "components/autofill/core/common/autofill_pref_names.h" +#include "components/prefs/pref_service.h" #include "grit/components_scaled_resources.h" #include "grit/components_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/components/autofill/core/browser/ui/card_unmask_prompt_controller_impl_unittest.cc b/components/autofill/core/browser/ui/card_unmask_prompt_controller_impl_unittest.cc index 2850629..fb6e4b8 100644 --- a/components/autofill/core/browser/ui/card_unmask_prompt_controller_impl_unittest.cc +++ b/components/autofill/core/browser/ui/card_unmask_prompt_controller_impl_unittest.cc @@ -8,8 +8,6 @@ #include "base/bind.h" #include "base/macros.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/test/histogram_tester.h" #include "components/autofill/core/browser/autofill_client.h" @@ -17,6 +15,8 @@ #include "components/autofill/core/browser/autofill_test_utils.h" #include "components/autofill/core/browser/ui/card_unmask_prompt_view.h" #include "components/autofill/core/common/autofill_pref_names.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" namespace autofill { diff --git a/components/bookmarks/DEPS b/components/bookmarks/DEPS index 1871065..40b213e 100644 --- a/components/bookmarks/DEPS +++ b/components/bookmarks/DEPS @@ -2,6 +2,7 @@ include_rules = [ "+components/favicon_base", "+components/keyed_service", "+components/pref_registry", + "+components/prefs", "+components/query_parser", "+components/url_formatter", "+grit/components_strings.h", diff --git a/components/bookmarks/browser/bookmark_expanded_state_tracker.cc b/components/bookmarks/browser/bookmark_expanded_state_tracker.cc index 656e1b0..427f2d3 100644 --- a/components/bookmarks/browser/bookmark_expanded_state_tracker.cc +++ b/components/bookmarks/browser/bookmark_expanded_state_tracker.cc @@ -6,12 +6,12 @@ #include <stdint.h> -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_utils.h" #include "components/bookmarks/common/bookmark_pref_names.h" +#include "components/prefs/pref_service.h" namespace bookmarks { diff --git a/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc b/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc index 2b97a42..deb7ec2 100644 --- a/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc +++ b/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc @@ -7,14 +7,14 @@ #include "base/files/file_path.h" #include "base/macros.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/common/bookmark_pref_names.h" #include "components/bookmarks/test/bookmark_test_helpers.h" #include "components/bookmarks/test/test_bookmark_client.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" namespace bookmarks { diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmarks/browser/bookmark_utils.cc index b7de975..5843ab5 100644 --- a/components/bookmarks/browser/bookmark_utils.cc +++ b/components/bookmarks/browser/bookmark_utils.cc @@ -14,7 +14,6 @@ #include "base/i18n/string_search.h" #include "base/macros.h" #include "base/metrics/user_metrics_action.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" @@ -25,6 +24,7 @@ #include "components/bookmarks/browser/scoped_group_bookmark_actions.h" #include "components/bookmarks/common/bookmark_pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "components/query_parser/query_parser.h" #include "components/url_formatter/url_formatter.h" #include "ui/base/clipboard/clipboard.h" diff --git a/components/bookmarks/managed/managed_bookmarks_tracker.cc b/components/bookmarks/managed/managed_bookmarks_tracker.cc index 8ced8e6..c26784c 100644 --- a/components/bookmarks/managed/managed_bookmarks_tracker.cc +++ b/components/bookmarks/managed/managed_bookmarks_tracker.cc @@ -10,12 +10,12 @@ #include "base/bind_helpers.h" #include "base/callback.h" #include "base/logging.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_node.h" #include "components/bookmarks/common/bookmark_pref_names.h" +#include "components/prefs/pref_service.h" #include "grit/components_strings.h" #include "ui/base/l10n/l10n_util.h" #include "url/gurl.h" diff --git a/components/bookmarks/managed/managed_bookmarks_tracker.h b/components/bookmarks/managed/managed_bookmarks_tracker.h index 772ddf9..5cb838f 100644 --- a/components/bookmarks/managed/managed_bookmarks_tracker.h +++ b/components/bookmarks/managed/managed_bookmarks_tracker.h @@ -10,8 +10,8 @@ #include "base/callback_forward.h" #include "base/macros.h" -#include "base/prefs/pref_change_registrar.h" #include "base/strings/string16.h" +#include "components/prefs/pref_change_registrar.h" class GURL; class PrefService; diff --git a/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc b/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc index 83f3bcd..0538d5e 100644 --- a/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc +++ b/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc @@ -10,8 +10,6 @@ #include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" #include "components/bookmarks/browser/bookmark_model.h" @@ -21,6 +19,8 @@ #include "components/bookmarks/test/bookmark_test_helpers.h" #include "components/bookmarks/test/mock_bookmark_model_observer.h" #include "components/bookmarks/test/test_bookmark_client.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "grit/components_strings.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/browser_sync/browser/DEPS b/components/browser_sync/browser/DEPS index 320e143..72ed951 100644 --- a/components/browser_sync/browser/DEPS +++ b/components/browser_sync/browser/DEPS @@ -7,6 +7,7 @@ include_rules = [ "+components/password_manager/core/browser", "+components/password_manager/sync/browser", "+components/pref_registry", + "+components/prefs", "+components/signin/core/browser", "+components/syncable_prefs", "+components/sync_bookmarks", diff --git a/components/browser_sync/browser/profile_sync_components_factory_impl.cc b/components/browser_sync/browser/profile_sync_components_factory_impl.cc index 69bf558..36896a9 100644 --- a/components/browser_sync/browser/profile_sync_components_factory_impl.cc +++ b/components/browser_sync/browser/profile_sync_components_factory_impl.cc @@ -8,7 +8,6 @@ #include "base/command_line.h" #include "base/memory/ref_counted.h" -#include "base/prefs/pref_service.h" #include "build/build_config.h" #include "components/autofill/core/browser/autofill_wallet_data_type_controller.h" #include "components/autofill/core/browser/webdata/autofill_data_type_controller.h" @@ -23,6 +22,7 @@ #include "components/history/core/browser/typed_url_data_type_controller.h" #include "components/password_manager/core/browser/password_store.h" #include "components/password_manager/sync/browser/password_data_type_controller.h" +#include "components/prefs/pref_service.h" #include "components/sync_bookmarks/bookmark_change_processor.h" #include "components/sync_bookmarks/bookmark_data_type_controller.h" #include "components/sync_bookmarks/bookmark_model_associator.h" diff --git a/components/browser_sync/browser/profile_sync_service.cc b/components/browser_sync/browser/profile_sync_service.cc index 771208f..34bf304 100644 --- a/components/browser_sync/browser/profile_sync_service.cc +++ b/components/browser_sync/browser/profile_sync_service.cc @@ -20,7 +20,6 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/metrics/histogram.h" -#include "base/prefs/json_pref_store.h" #include "base/profiler/scoped_tracker.h" #include "base/single_thread_task_runner.h" #include "base/strings/string16.h" @@ -35,6 +34,7 @@ #include "components/invalidation/impl/invalidation_prefs.h" #include "components/invalidation/public/invalidation_service.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/json_pref_store.h" #include "components/signin/core/browser/about_signin_internals.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" diff --git a/components/content_settings/DEPS b/components/content_settings/DEPS index df72508..3a4400f 100644 --- a/components/content_settings/DEPS +++ b/components/content_settings/DEPS @@ -2,4 +2,5 @@ include_rules = [ # Content settings is a layered component; subdirectories must explicitly # introduce the ability to use the content layer as appropriate. "-components/content_settings/content", + "+components/prefs", ] diff --git a/components/content_settings/core/browser/content_settings_default_provider.cc b/components/content_settings/core/browser/content_settings_default_provider.cc index 9cd6eba..7d8d25b 100644 --- a/components/content_settings/core/browser/content_settings_default_provider.cc +++ b/components/content_settings/core/browser/content_settings_default_provider.cc @@ -11,9 +11,6 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_registry.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "components/content_settings/core/browser/content_settings_rule.h" #include "components/content_settings/core/browser/content_settings_utils.h" #include "components/content_settings/core/browser/website_settings_info.h" @@ -22,6 +19,9 @@ #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/content_settings/core/common/pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_registry.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "url/gurl.h" namespace content_settings { diff --git a/components/content_settings/core/browser/content_settings_default_provider.h b/components/content_settings/core/browser/content_settings_default_provider.h index 3541c51..e2ce847 100644 --- a/components/content_settings/core/browser/content_settings_default_provider.h +++ b/components/content_settings/core/browser/content_settings_default_provider.h @@ -11,9 +11,9 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_change_registrar.h" #include "base/synchronization/lock.h" #include "components/content_settings/core/browser/content_settings_observable_provider.h" +#include "components/prefs/pref_change_registrar.h" class PrefService; diff --git a/components/content_settings/core/browser/content_settings_policy_provider.cc b/components/content_settings/core/browser/content_settings_policy_provider.cc index 0f773dd..ef9643d 100644 --- a/components/content_settings/core/browser/content_settings_policy_provider.cc +++ b/components/content_settings/core/browser/content_settings_policy_provider.cc @@ -11,13 +11,13 @@ #include "base/bind.h" #include "base/json/json_reader.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/values.h" #include "components/content_settings/core/browser/content_settings_rule.h" #include "components/content_settings/core/browser/content_settings_utils.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/content_settings/core/common/pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" namespace { diff --git a/components/content_settings/core/browser/content_settings_policy_provider.h b/components/content_settings/core/browser/content_settings_policy_provider.h index ae49eee..f205845 100644 --- a/components/content_settings/core/browser/content_settings_policy_provider.h +++ b/components/content_settings/core/browser/content_settings_policy_provider.h @@ -10,10 +10,10 @@ #include <vector> #include "base/macros.h" -#include "base/prefs/pref_change_registrar.h" #include "base/synchronization/lock.h" #include "components/content_settings/core/browser/content_settings_observable_provider.h" #include "components/content_settings/core/browser/content_settings_origin_identifier_value_map.h" +#include "components/prefs/pref_change_registrar.h" class PrefService; diff --git a/components/content_settings/core/browser/content_settings_pref.cc b/components/content_settings/core/browser/content_settings_pref.cc index 6145152..e1e2b33 100644 --- a/components/content_settings/core/browser/content_settings_pref.cc +++ b/components/content_settings/core/browser/content_settings_pref.cc @@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/strings/string_split.h" #include "base/time/clock.h" #include "components/content_settings/core/browser/content_settings_info.h" @@ -19,6 +18,7 @@ #include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/content_settings/core/common/pref_names.h" +#include "components/prefs/scoped_user_pref_update.h" #include "url/gurl.h" namespace { diff --git a/components/content_settings/core/browser/content_settings_pref_provider.cc b/components/content_settings/core/browser/content_settings_pref_provider.cc index a29dfbd..9a7e358 100644 --- a/components/content_settings/core/browser/content_settings_pref_provider.cc +++ b/components/content_settings/core/browser/content_settings_pref_provider.cc @@ -14,9 +14,6 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_registry.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/strings/string_split.h" #include "base/time/clock.h" #include "base/time/default_clock.h" @@ -30,6 +27,9 @@ #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/content_settings/core/common/pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_registry.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" namespace { diff --git a/components/content_settings/core/browser/content_settings_pref_provider.h b/components/content_settings/core/browser/content_settings_pref_provider.h index 395632d..3ef2d7c 100644 --- a/components/content_settings/core/browser/content_settings_pref_provider.h +++ b/components/content_settings/core/browser/content_settings_pref_provider.h @@ -12,9 +12,9 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_change_registrar.h" #include "components/content_settings/core/browser/content_settings_observable_provider.h" #include "components/content_settings/core/browser/content_settings_utils.h" +#include "components/prefs/pref_change_registrar.h" class PrefService; diff --git a/components/content_settings/core/browser/content_settings_registry_unittest.cc b/components/content_settings/core/browser/content_settings_registry_unittest.cc index 50d4b6c..4184b8c 100644 --- a/components/content_settings/core/browser/content_settings_registry_unittest.cc +++ b/components/content_settings/core/browser/content_settings_registry_unittest.cc @@ -6,7 +6,6 @@ #include <vector> #include "base/logging.h" -#include "base/prefs/pref_registry.h" #include "base/values.h" #include "components/content_settings/core/browser/content_settings_info.h" #include "components/content_settings/core/browser/content_settings_registry.h" @@ -15,6 +14,7 @@ #include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_registry.h" #include "testing/gtest/include/gtest/gtest.h" namespace content_settings { diff --git a/components/content_settings/core/browser/content_settings_usages_state.cc b/components/content_settings/core/browser/content_settings_usages_state.cc index 8113260..6c5db41 100644 --- a/components/content_settings/core/browser/content_settings_usages_state.cc +++ b/components/content_settings/core/browser/content_settings_usages_state.cc @@ -6,9 +6,9 @@ #include <string> -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "components/content_settings/core/browser/host_content_settings_map.h" +#include "components/prefs/pref_service.h" #include "components/url_formatter/url_formatter.h" ContentSettingsUsagesState::CommittedDetails::CommittedDetails() diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc index 7225477..2339c86 100644 --- a/components/content_settings/core/browser/cookie_settings.cc +++ b/components/content_settings/core/browser/cookie_settings.cc @@ -6,12 +6,12 @@ #include "base/bind.h" #include "base/logging.h" -#include "base/prefs/pref_service.h" #include "components/content_settings/core/browser/content_settings_utils.h" #include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/content_settings/core/common/pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "net/base/net_errors.h" #include "net/base/static_cookie_policy.h" #include "url/gurl.h" diff --git a/components/content_settings/core/browser/cookie_settings.h b/components/content_settings/core/browser/cookie_settings.h index 31057e8..681f04c 100644 --- a/components/content_settings/core/browser/cookie_settings.h +++ b/components/content_settings/core/browser/cookie_settings.h @@ -10,12 +10,12 @@ #include "base/compiler_specific.h" #include "base/macros.h" #include "base/memory/ref_counted.h" -#include "base/prefs/pref_change_registrar.h" #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h" #include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/content_settings/core/common/content_settings.h" #include "components/keyed_service/core/refcounted_keyed_service.h" +#include "components/prefs/pref_change_registrar.h" class ContentSettingsPattern; class GURL; diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc index 4d0aadd..2e781a6 100644 --- a/components/content_settings/core/browser/host_content_settings_map.cc +++ b/components/content_settings/core/browser/host_content_settings_map.cc @@ -10,7 +10,6 @@ #include "base/command_line.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" @@ -30,6 +29,7 @@ #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/content_settings/core/common/pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "net/base/net_errors.h" #include "net/base/static_cookie_policy.h" #include "url/gurl.h" diff --git a/components/content_settings/core/browser/host_content_settings_map.h b/components/content_settings/core/browser/host_content_settings_map.h index b31228e..98fe724 100644 --- a/components/content_settings/core/browser/host_content_settings_map.h +++ b/components/content_settings/core/browser/host_content_settings_map.h @@ -15,7 +15,6 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h" -#include "base/prefs/pref_change_registrar.h" #include "base/threading/platform_thread.h" #include "base/threading/thread_checker.h" #include "components/content_settings/core/browser/content_settings_observer.h" @@ -24,6 +23,7 @@ #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/content_settings/core/common/content_settings_types.h" #include "components/keyed_service/core/refcounted_keyed_service.h" +#include "components/prefs/pref_change_registrar.h" class ExtensionService; class GURL; diff --git a/components/content_settings/core/browser/website_settings_info.cc b/components/content_settings/core/browser/website_settings_info.cc index 0543f072..97a532d 100644 --- a/components/content_settings/core/browser/website_settings_info.cc +++ b/components/content_settings/core/browser/website_settings_info.cc @@ -7,10 +7,10 @@ #include <utility> #include "base/logging.h" -#include "base/prefs/pref_registry.h" #include "base/strings/string_util.h" #include "base/values.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_registry.h" namespace { diff --git a/components/content_settings/core/browser/website_settings_registry_unittest.cc b/components/content_settings/core/browser/website_settings_registry_unittest.cc index c476859..aa72fc1 100644 --- a/components/content_settings/core/browser/website_settings_registry_unittest.cc +++ b/components/content_settings/core/browser/website_settings_registry_unittest.cc @@ -3,13 +3,13 @@ // found in the LICENSE file. #include "base/logging.h" -#include "base/prefs/pref_registry.h" #include "base/values.h" #include "components/content_settings/core/browser/website_settings_info.h" #include "components/content_settings/core/browser/website_settings_registry.h" #include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_registry.h" #include "testing/gtest/include/gtest/gtest.h" namespace content_settings { diff --git a/components/cronet/DEPS b/components/cronet/DEPS index 413c4b4..bd43afc 100644 --- a/components/cronet/DEPS +++ b/components/cronet/DEPS @@ -1,4 +1,5 @@ include_rules = [ "+components/metrics", + "+components/prefs", "+net", ] diff --git a/components/cronet/android/cronet_data_reduction_proxy.cc b/components/cronet/android/cronet_data_reduction_proxy.cc index 0b6bf02..360862fb 100644 --- a/components/cronet/android/cronet_data_reduction_proxy.cc +++ b/components/cronet/android/cronet_data_reduction_proxy.cc @@ -8,9 +8,6 @@ #include "base/command_line.h" #include "base/logging.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/pref_service_factory.h" #include "base/single_thread_task_runner.h" #include "components/cronet/android/cronet_in_memory_pref_store.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h" @@ -23,6 +20,9 @@ #include "components/data_reduction_proxy/core/browser/data_store.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/pref_service_factory.h" #include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_interceptor.h" @@ -36,7 +36,7 @@ scoped_ptr<PrefService> CreatePrefService() { scoped_refptr<PrefRegistrySimple> pref_registry(new PrefRegistrySimple()); pref_registry->RegisterBooleanPref(kDataReductionProxyEnabled, false); data_reduction_proxy::RegisterSimpleProfilePrefs(pref_registry.get()); - base::PrefServiceFactory pref_service_factory; + PrefServiceFactory pref_service_factory; pref_service_factory.set_user_prefs( make_scoped_refptr(new CronetInMemoryPrefStore())); scoped_ptr<PrefService> pref_service = diff --git a/components/cronet/android/cronet_in_memory_pref_store.h b/components/cronet/android/cronet_in_memory_pref_store.h index 1aede14..42d9d27 100644 --- a/components/cronet/android/cronet_in_memory_pref_store.h +++ b/components/cronet/android/cronet_in_memory_pref_store.h @@ -13,8 +13,8 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/prefs/persistent_pref_store.h" -#include "base/prefs/pref_value_map.h" +#include "components/prefs/persistent_pref_store.h" +#include "components/prefs/pref_value_map.h" namespace base { class Value; @@ -22,7 +22,7 @@ class Value; // A light-weight prefstore implementation that keeps preferences // in a memory backed store. This is not a persistent prefstore. -// TODO(bengr): Move to base/prefs or some other shared location. +// TODO(bengr): Move to components/prefs or some other shared location. class CronetInMemoryPrefStore : public PersistentPrefStore { public: CronetInMemoryPrefStore(); diff --git a/components/cronet/android/cronet_url_request_context_adapter.cc b/components/cronet/android/cronet_url_request_context_adapter.cc index a8fe96d..49ba22a 100644 --- a/components/cronet/android/cronet_url_request_context_adapter.cc +++ b/components/cronet/android/cronet_url_request_context_adapter.cc @@ -21,16 +21,16 @@ #include "base/memory/scoped_vector.h" #include "base/message_loop/message_loop.h" #include "base/metrics/statistics_recorder.h" -#include "base/prefs/pref_change_registrar.h" -#include "base/prefs/pref_filter.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/pref_service_factory.h" #include "base/single_thread_task_runner.h" #include "base/time/time.h" #include "base/values.h" #include "components/cronet/histogram_manager.h" #include "components/cronet/url_request_context_config.h" +#include "components/prefs/pref_change_registrar.h" +#include "components/prefs/pref_filter.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/pref_service_factory.h" #include "jni/CronetUrlRequestContext_jni.h" #include "net/base/external_estimate_provider.h" #include "net/base/load_flags.h" @@ -443,7 +443,7 @@ void CronetURLRequestContextAdapter::InitializeOnNetworkThread( context_builder.SetFileTaskRunner(GetFileThread()->task_runner()); // Set up HttpServerPropertiesManager. - base::PrefServiceFactory factory; + PrefServiceFactory factory; factory.set_user_prefs(json_pref_store_); scoped_refptr<PrefRegistrySimple> registry(new PrefRegistrySimple()); registry->RegisterDictionaryPref(kHttpServerProperties, diff --git a/components/cronet/android/cronet_url_request_context_adapter.h b/components/cronet/android/cronet_url_request_context_adapter.h index 851dc75..81c07dd 100644 --- a/components/cronet/android/cronet_url_request_context_adapter.h +++ b/components/cronet/android/cronet_url_request_context_adapter.h @@ -16,8 +16,8 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/json_pref_store.h" #include "base/threading/thread.h" +#include "components/prefs/json_pref_store.h" #include "net/base/network_quality_estimator.h" class PrefService; diff --git a/components/data_reduction_proxy/DEPS b/components/data_reduction_proxy/DEPS index 596361d..f7c0da4 100644 --- a/components/data_reduction_proxy/DEPS +++ b/components/data_reduction_proxy/DEPS @@ -1,5 +1,6 @@ include_rules = [ "+components/pref_registry", + "+components/prefs", "+components/variations", "+crypto", "+google_apis", diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_stats_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_stats_unittest.cc index 100756e..e1c1f46 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_stats_unittest.cc +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_stats_unittest.cc @@ -15,7 +15,6 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" -#include "base/prefs/testing_pref_service.h" #include "base/test/histogram_tester.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator.h" @@ -26,6 +25,7 @@ #include "components/data_reduction_proxy/core/common/data_reduction_proxy_headers_test_utils.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h" +#include "components/prefs/testing_pref_service.h" #include "net/base/host_port_pair.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc index d096c17..c60fd70 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc @@ -13,8 +13,6 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/strings/string_number_conversions.h" #include "base/trace_event/trace_event.h" #include "base/values.h" @@ -23,6 +21,8 @@ #include "components/data_reduction_proxy/core/browser/data_usage_store.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "net/base/mime_util.h" namespace data_reduction_proxy { diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h index 3aa182a..59eca58 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h @@ -16,8 +16,6 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/pref_change_registrar.h" -#include "base/prefs/pref_member.h" #include "base/threading/thread_checker.h" #include "base/time/time.h" #include "base/timer/timer.h" @@ -25,6 +23,8 @@ #include "components/data_reduction_proxy/core/browser/db_data_owner.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h" #include "components/data_reduction_proxy/proto/data_store.pb.h" +#include "components/prefs/pref_change_registrar.h" +#include "components/prefs/pref_member.h" #include "net/base/network_change_notifier.h" class PrefService; diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats_unittest.cc index 10f85b7..d4604af 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats_unittest.cc +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats_unittest.cc @@ -12,9 +12,6 @@ #include "base/command_line.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/testing_pref_service.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/test/histogram_tester.h" @@ -24,6 +21,9 @@ #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_retrieval_params.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_retrieval_params.cc index 38315d1..6409064 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_retrieval_params.cc +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_retrieval_params.cc @@ -6,10 +6,10 @@ #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h" +#include "components/prefs/pref_service.h" #include "components/variations/variations_associated_data.h" namespace { diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_retrieval_params_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_retrieval_params_unittest.cc index 7b04eea..088c637 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_retrieval_params_unittest.cc +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_retrieval_params_unittest.cc @@ -9,11 +9,11 @@ #include <map> #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/time/time.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h" +#include "components/prefs/pref_service.h" #include "components/variations/variations_associated_data.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_experiments_stats_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_experiments_stats_unittest.cc index 3270be9..7ecd3f8 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_experiments_stats_unittest.cc +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_experiments_stats_unittest.cc @@ -9,13 +9,13 @@ #include <utility> #include "base/metrics/field_trial.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/test/histogram_tester.h" #include "base/time/time.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config_retrieval_params.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h" +#include "components/prefs/pref_service.h" #include "components/variations/variations_associated_data.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc index 1dd1475..66f6a94 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc @@ -13,7 +13,6 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator.h" @@ -22,6 +21,7 @@ #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h" +#include "components/prefs/pref_service.h" #include "net/base/net_errors.h" #include "net/base/request_priority.h" #include "net/http/http_response_headers.h" diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data_unittest.cc index 867a7c3..691e2c4 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data_unittest.cc +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data_unittest.cc @@ -8,8 +8,6 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/testing_pref_service.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" @@ -19,6 +17,8 @@ #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/testing_pref_service.h" #include "net/http/http_network_session.h" #include "net/log/net_log.h" diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.cc index f739eac..cb51e34 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.cc +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.cc @@ -4,11 +4,11 @@ #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" namespace { diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs_unittest.cc index 6ff2b5d..20032c0 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs_unittest.cc +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs_unittest.cc @@ -6,12 +6,12 @@ #include <stdint.h> -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" -#include "base/prefs/testing_pref_service.h" #include "base/strings/string_number_conversions.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" namespace data_reduction_proxy { diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_service.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_service.cc index e7174f8..b1c8f13 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_service.cc +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_service.cc @@ -10,7 +10,6 @@ #include "base/files/file_path.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_service.h" #include "base/sequenced_task_runner.h" #include "base/task_runner_util.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h" @@ -22,6 +21,7 @@ #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h" #include "components/data_reduction_proxy/proto/data_store.pb.h" +#include "components/prefs/pref_service.h" namespace data_reduction_proxy { diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc index 9c5e4b4..60f0b7a 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc @@ -9,8 +9,6 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_member.h" -#include "base/prefs/pref_service.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h" @@ -18,6 +16,8 @@ #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h" +#include "components/prefs/pref_member.h" +#include "components/prefs/pref_service.h" #include "net/base/network_change_notifier.h" namespace { diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h index eb5400e..1984241 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h @@ -15,10 +15,10 @@ #include "base/gtest_prod_util.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_member.h" #include "base/threading/thread_checker.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_metrics.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_service_observer.h" +#include "components/prefs/pref_member.h" #include "url/gurl.h" class PrefService; diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.cc index 244d34b..8dbe6a6 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.cc +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.cc @@ -8,9 +8,6 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/scoped_user_pref_update.h" -#include "base/prefs/testing_pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/time/time.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h" @@ -20,6 +17,9 @@ #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/scoped_user_pref_update.h" +#include "components/prefs/testing_pref_service.h" using testing::_; using testing::AnyNumber; diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h index 15acb69..bf2944f 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h @@ -9,8 +9,8 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "base/prefs/testing_pref_service.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h" +#include "components/prefs/testing_pref_service.h" #include "net/log/test_net_log.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_request_test_util.h" diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_unittest.cc index e2a4e40..0bc39ae 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_unittest.cc +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_unittest.cc @@ -12,7 +12,6 @@ #include "base/md5.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram_samples.h" -#include "base/prefs/pref_registry_simple.h" #include "base/test/histogram_tester.h" #include "base/test/mock_entropy_provider.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h" @@ -25,6 +24,7 @@ #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h" +#include "components/prefs/pref_registry_simple.h" #include "net/socket/socket_test_util.h" #include "net/url_request/url_request_test_util.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.cc index 8e187a6..5a73741 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.cc +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.cc @@ -8,8 +8,6 @@ #include <utility> #include "base/macros.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.h" @@ -27,6 +25,8 @@ #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "net/socket/socket_test_util.h" #include "net/url_request/url_request_context_storage.h" #include "net/url_request/url_request_intercepting_job_factory.h" diff --git a/components/dom_distiller/DEPS b/components/dom_distiller/DEPS index 7c1ea01..15150b5 100644 --- a/components/dom_distiller/DEPS +++ b/components/dom_distiller/DEPS @@ -1,6 +1,7 @@ include_rules = [ "+components/leveldb_proto", "+components/pref_registry", + "+components/prefs", "+components/variations", "+google", # For third_party/protobuf. "+grit", # For generated headers. diff --git a/components/dom_distiller/core/distilled_page_prefs.cc b/components/dom_distiller/core/distilled_page_prefs.cc index 9a68ef8..f8735a8 100644 --- a/components/dom_distiller/core/distilled_page_prefs.cc +++ b/components/dom_distiller/core/distilled_page_prefs.cc @@ -8,10 +8,10 @@ #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" -#include "base/prefs/pref_service.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" namespace { diff --git a/components/drive/DEPS b/components/drive/DEPS index 48aeee1..c23c40e 100644 --- a/components/drive/DEPS +++ b/components/drive/DEPS @@ -1,6 +1,7 @@ include_rules = [ "+components/invalidation", "+components/keyed_service", + "+components/prefs", "+google_apis", "+google/cacheinvalidation/types.pb.h", "+net", diff --git a/components/drive/change_list_loader_unittest.cc b/components/drive/change_list_loader_unittest.cc index cef19aef..4db2c9b 100644 --- a/components/drive/change_list_loader_unittest.cc +++ b/components/drive/change_list_loader_unittest.cc @@ -10,7 +10,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/testing_pref_service.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" @@ -24,6 +23,7 @@ #include "components/drive/resource_metadata.h" #include "components/drive/service/fake_drive_service.h" #include "components/drive/service/test_util.h" +#include "components/prefs/testing_pref_service.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/drive/drive_api_parser.h" #include "google_apis/drive/test_util.h" diff --git a/components/drive/directory_loader_unittest.cc b/components/drive/directory_loader_unittest.cc index 810a3db..f47691d 100644 --- a/components/drive/directory_loader_unittest.cc +++ b/components/drive/directory_loader_unittest.cc @@ -8,7 +8,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/testing_pref_service.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" @@ -22,6 +21,7 @@ #include "components/drive/resource_metadata.h" #include "components/drive/service/fake_drive_service.h" #include "components/drive/service/test_util.h" +#include "components/prefs/testing_pref_service.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/drive/drive_api_parser.h" #include "google_apis/drive/test_util.h" diff --git a/components/drive/drive_test_util.cc b/components/drive/drive_test_util.cc index 48bece2..d80f4d9 100644 --- a/components/drive/drive_test_util.cc +++ b/components/drive/drive_test_util.cc @@ -4,10 +4,10 @@ #include "components/drive/drive_test_util.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" #include "components/drive/drive.pb.h" #include "components/drive/drive_pref_names.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" namespace drive { namespace test_util { diff --git a/components/drive/file_system.cc b/components/drive/file_system.cc index c42da59..dcb00a6 100644 --- a/components/drive/file_system.cc +++ b/components/drive/file_system.cc @@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/files/file_util.h" -#include "base/prefs/pref_service.h" #include "components/drive/change_list_loader.h" #include "components/drive/directory_loader.h" #include "components/drive/drive.pb.h" @@ -35,6 +34,7 @@ #include "components/drive/resource_entry_conversion.h" #include "components/drive/search_metadata.h" #include "components/drive/sync_client.h" +#include "components/prefs/pref_service.h" #include "google_apis/drive/drive_api_parser.h" namespace drive { diff --git a/components/drive/file_system/operation_test_base.cc b/components/drive/file_system/operation_test_base.cc index 603aed4..0aad574 100644 --- a/components/drive/file_system/operation_test_base.cc +++ b/components/drive/file_system/operation_test_base.cc @@ -4,7 +4,6 @@ #include "components/drive/file_system/operation_test_base.h" -#include "base/prefs/testing_pref_service.h" #include "base/threading/sequenced_worker_pool.h" #include "components/drive/change_list_loader.h" #include "components/drive/event_logger.h" @@ -16,6 +15,7 @@ #include "components/drive/resource_metadata.h" #include "components/drive/service/fake_drive_service.h" #include "components/drive/service/test_util.h" +#include "components/prefs/testing_pref_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_utils.h" #include "google_apis/drive/test_util.h" diff --git a/components/drive/file_system_core_util.cc b/components/drive/file_system_core_util.cc index c7b9bb1..51e3472 100644 --- a/components/drive/file_system_core_util.cc +++ b/components/drive/file_system_core_util.cc @@ -18,7 +18,6 @@ #include "base/json/json_file_value_serializer.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" @@ -27,6 +26,7 @@ #include "components/drive/drive.pb.h" #include "components/drive/drive_pref_names.h" #include "components/drive/job_list.h" +#include "components/prefs/pref_service.h" namespace drive { namespace util { diff --git a/components/drive/file_system_unittest.cc b/components/drive/file_system_unittest.cc index 354c3e4..271dba1 100644 --- a/components/drive/file_system_unittest.cc +++ b/components/drive/file_system_unittest.cc @@ -16,7 +16,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/testing_pref_service.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" @@ -33,6 +32,7 @@ #include "components/drive/service/fake_drive_service.h" #include "components/drive/service/test_util.h" #include "components/drive/sync_client.h" +#include "components/prefs/testing_pref_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/drive/drive_api_parser.h" diff --git a/components/drive/job_scheduler.cc b/components/drive/job_scheduler.cc index 036d3c8..a422e1d 100644 --- a/components/drive/job_scheduler.cc +++ b/components/drive/job_scheduler.cc @@ -10,13 +10,13 @@ #include "base/files/file_util.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "base/rand_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/thread_task_runner_handle.h" #include "components/drive/drive_pref_names.h" #include "components/drive/event_logger.h" +#include "components/prefs/pref_service.h" #include "google_apis/drive/drive_api_parser.h" namespace drive { diff --git a/components/drive/job_scheduler_unittest.cc b/components/drive/job_scheduler_unittest.cc index a6e4f13..4b390fe 100644 --- a/components/drive/job_scheduler_unittest.cc +++ b/components/drive/job_scheduler_unittest.cc @@ -12,7 +12,6 @@ #include "base/bind.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" -#include "base/prefs/testing_pref_service.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/stl_util.h" @@ -23,6 +22,7 @@ #include "components/drive/event_logger.h" #include "components/drive/service/fake_drive_service.h" #include "components/drive/service/test_util.h" +#include "components/prefs/testing_pref_service.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/drive/drive_api_parser.h" #include "google_apis/drive/test_util.h" diff --git a/components/drive/sync_client_unittest.cc b/components/drive/sync_client_unittest.cc index 250b85d..6770264 100644 --- a/components/drive/sync_client_unittest.cc +++ b/components/drive/sync_client_unittest.cc @@ -8,7 +8,6 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/testing_pref_service.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/test/test_timeouts.h" @@ -28,6 +27,7 @@ #include "components/drive/resource_entry_conversion.h" #include "components/drive/resource_metadata.h" #include "components/drive/service/fake_drive_service.h" +#include "components/prefs/testing_pref_service.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/drive/drive_api_parser.h" #include "google_apis/drive/test_util.h" diff --git a/components/feedback/DEPS b/components/feedback/DEPS index 3a9dc0b20..73e72b2 100644 --- a/components/feedback/DEPS +++ b/components/feedback/DEPS @@ -2,6 +2,7 @@ include_rules = [ "-content", "+components/keyed_service", "+components/pref_registry", + "+components/prefs", "+components/user_prefs", "+components/variations", "+content/public/browser", diff --git a/components/feedback/feedback_data_unittest.cc b/components/feedback/feedback_data_unittest.cc index 074a31c..53efa43 100644 --- a/components/feedback/feedback_data_unittest.cc +++ b/components/feedback/feedback_data_unittest.cc @@ -9,11 +9,11 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/testing_pref_service.h" #include "base/run_loop.h" #include "components/feedback/feedback_uploader.h" #include "components/feedback/feedback_uploader_factory.h" #include "components/keyed_service/core/keyed_service.h" +#include "components/prefs/testing_pref_service.h" #include "components/user_prefs/user_prefs.h" #include "content/public/test/test_browser_context.h" #include "content/public/test/test_browser_thread.h" diff --git a/components/filesystem/DEPS b/components/filesystem/DEPS index 89e17ff..994c4ca 100644 --- a/components/filesystem/DEPS +++ b/components/filesystem/DEPS @@ -1,4 +1,5 @@ include_rules = [ + "+components/prefs", "+mojo/common", "+mojo/shell", "+mojo/platform_handle", diff --git a/components/filesystem/public/cpp/prefs/filesystem_json_pref_store.cc b/components/filesystem/public/cpp/prefs/filesystem_json_pref_store.cc index bedf5e3..a31b6f2 100644 --- a/components/filesystem/public/cpp/prefs/filesystem_json_pref_store.cc +++ b/components/filesystem/public/cpp/prefs/filesystem_json_pref_store.cc @@ -17,12 +17,12 @@ #include "base/logging.h" #include "base/macros.h" #include "base/memory/ref_counted.h" -#include "base/prefs/pref_filter.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/task_runner_util.h" #include "base/time/default_clock.h" #include "base/values.h" +#include "components/prefs/pref_filter.h" #include "mojo/common/common_type_converters.h" namespace filesystem { diff --git a/components/filesystem/public/cpp/prefs/filesystem_json_pref_store.h b/components/filesystem/public/cpp/prefs/filesystem_json_pref_store.h index 75cdead..d75fcd6 100644 --- a/components/filesystem/public/cpp/prefs/filesystem_json_pref_store.h +++ b/components/filesystem/public/cpp/prefs/filesystem_json_pref_store.h @@ -18,14 +18,14 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" -#include "base/prefs/base_prefs_export.h" -#include "base/prefs/persistent_pref_store.h" -#include "base/prefs/pref_filter.h" #include "base/threading/non_thread_safe.h" #include "components/filesystem/public/interfaces/directory.mojom.h" #include "components/filesystem/public/interfaces/file.mojom.h" #include "components/filesystem/public/interfaces/file_system.mojom.h" #include "components/filesystem/public/interfaces/types.mojom.h" +#include "components/prefs/base_prefs_export.h" +#include "components/prefs/persistent_pref_store.h" +#include "components/prefs/pref_filter.h" #include "mojo/public/cpp/bindings/binding.h" class PrefFilter; @@ -45,9 +45,9 @@ namespace filesystem { // filesystem. Unlike base::JsonPrefStore, this class can safely be used inside // a sandboxed process. // -// In the long run, we'll want to replace the current base::PrefService code -// with something very different, especially since this component hard punts on -// all the hard things that the preference service does (enterprise management, +// In the long run, we'll want to replace the current PrefService code with +// something very different, especially since this component hard punts on all +// the hard things that the preference service does (enterprise management, // parental controls, extension integration, etc.) and its interface is really // not optimal for a mojoified world--there are a few places where we assume // that writing to disk is synchronous...but it no longer is! diff --git a/components/filesystem/public/cpp/prefs/pref_service_factory.cc b/components/filesystem/public/cpp/prefs/pref_service_factory.cc index b2209e7..8608b6e 100644 --- a/components/filesystem/public/cpp/prefs/pref_service_factory.cc +++ b/components/filesystem/public/cpp/prefs/pref_service_factory.cc @@ -5,13 +5,13 @@ #include "components/filesystem/public/cpp/prefs/pref_service_factory.h" #include "base/bind.h" -#include "base/prefs/pref_notifier_impl.h" -#include "base/prefs/pref_registry.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/pref_value_store.h" -#include "base/prefs/value_map_pref_store.h" -#include "base/prefs/writeable_pref_store.h" #include "components/filesystem/public/cpp/prefs/filesystem_json_pref_store.h" +#include "components/prefs/pref_notifier_impl.h" +#include "components/prefs/pref_registry.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/pref_value_store.h" +#include "components/prefs/value_map_pref_store.h" +#include "components/prefs/writeable_pref_store.h" #include "mojo/shell/public/cpp/application_impl.h" namespace filesystem { diff --git a/components/filesystem/public/cpp/prefs/pref_service_factory.h b/components/filesystem/public/cpp/prefs/pref_service_factory.h index ccf981e..23780ff 100644 --- a/components/filesystem/public/cpp/prefs/pref_service_factory.h +++ b/components/filesystem/public/cpp/prefs/pref_service_factory.h @@ -6,7 +6,7 @@ #define COMPONENTS_FILESYSTEM_PUBLIC_CPP_PREFS_PREF_SERVICE_FACTORY_H_ #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_service.h" namespace mojo { class ApplicationImpl; diff --git a/components/flags_ui/DEPS b/components/flags_ui/DEPS index e7e9488..983d01e 100644 --- a/components/flags_ui/DEPS +++ b/components/flags_ui/DEPS @@ -1,5 +1,6 @@ include_rules = [ "+components/pref_registry", + "+components/prefs", "+grit/components_strings.h", "+ui/base", ] diff --git a/components/flags_ui/flags_state_unittest.cc b/components/flags_ui/flags_state_unittest.cc index 88fa150..fc3c31f 100644 --- a/components/flags_ui/flags_state_unittest.cc +++ b/components/flags_ui/flags_state_unittest.cc @@ -14,8 +14,6 @@ #include "base/feature_list.h" #include "base/format_macros.h" #include "base/macros.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" @@ -25,6 +23,8 @@ #include "components/flags_ui/flags_ui_pref_names.h" #include "components/flags_ui/flags_ui_switches.h" #include "components/flags_ui/pref_service_flags_storage.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "grit/components_strings.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/flags_ui/pref_service_flags_storage.cc b/components/flags_ui/pref_service_flags_storage.cc index 7d817d3..3932ded 100644 --- a/components/flags_ui/pref_service_flags_storage.cc +++ b/components/flags_ui/pref_service_flags_storage.cc @@ -4,13 +4,13 @@ #include "components/flags_ui/pref_service_flags_storage.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/values.h" #include "build/build_config.h" #include "components/flags_ui/flags_ui_pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" namespace flags_ui { diff --git a/components/gcm_driver/DEPS b/components/gcm_driver/DEPS index 964bdca..8f929c4 100644 --- a/components/gcm_driver/DEPS +++ b/components/gcm_driver/DEPS @@ -2,6 +2,7 @@ include_rules = [ "+components/os_crypt", "+components/keyed_service", "+components/pref_registry", + "+components/prefs", "+components/signin", "+components/sync_driver", "+components/timers", # Only used for Chrome OS builds. diff --git a/components/gcm_driver/gcm_channel_status_syncer.cc b/components/gcm_driver/gcm_channel_status_syncer.cc index f26008a..4a3a239 100644 --- a/components/gcm_driver/gcm_channel_status_syncer.cc +++ b/components/gcm_driver/gcm_channel_status_syncer.cc @@ -10,8 +10,6 @@ #include "base/command_line.h" #include "base/location.h" #include "base/logging.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/rand_util.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" @@ -19,6 +17,8 @@ #include "components/gcm_driver/gcm_channel_status_request.h" #include "components/gcm_driver/gcm_driver.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" namespace gcm { diff --git a/components/gcm_driver/gcm_driver_desktop_unittest.cc b/components/gcm_driver/gcm_driver_desktop_unittest.cc index 9e29c33..b3fbe5e 100644 --- a/components/gcm_driver/gcm_driver_desktop_unittest.cc +++ b/components/gcm_driver/gcm_driver_desktop_unittest.cc @@ -12,8 +12,6 @@ #include "base/location.h" #include "base/macros.h" #include "base/metrics/field_trial.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" #include "base/run_loop.h" #include "base/strings/string_util.h" #include "base/test/test_simple_task_runner.h" @@ -28,6 +26,8 @@ #include "components/gcm_driver/gcm_channel_status_syncer.h" #include "components/gcm_driver/gcm_client_factory.h" #include "components/gcm_driver/gcm_connection_observer.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_fetcher_delegate.h" #include "net/url_request/url_request_context_getter.h" diff --git a/components/gcm_driver/gcm_profile_service.cc b/components/gcm_driver/gcm_profile_service.cc index 5ca79db..0356adf 100644 --- a/components/gcm_driver/gcm_profile_service.cc +++ b/components/gcm_driver/gcm_profile_service.cc @@ -9,11 +9,11 @@ #include "base/logging.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "build/build_config.h" #include "components/gcm_driver/gcm_driver.h" #include "components/gcm_driver/gcm_driver_constants.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #if defined(OS_ANDROID) #include "base/sequenced_task_runner.h" diff --git a/components/google/DEPS b/components/google/DEPS index 683dd04..21c1e50 100644 --- a/components/google/DEPS +++ b/components/google/DEPS @@ -1,4 +1,5 @@ include_rules = [ + "+components/prefs", "+components/url_formatter", "+net", ] diff --git a/components/google/core/browser/google_url_tracker.cc b/components/google/core/browser/google_url_tracker.cc index 0b3e0b3..9a21ca4 100644 --- a/components/google/core/browser/google_url_tracker.cc +++ b/components/google/core/browser/google_url_tracker.cc @@ -10,7 +10,6 @@ #include "base/command_line.h" #include "base/location.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_util.h" #include "base/thread_task_runner_handle.h" @@ -19,6 +18,7 @@ #include "components/google/core/browser/google_switches.h" #include "components/google/core/browser/google_util.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "net/base/load_flags.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_request_status.h" diff --git a/components/google/core/browser/google_url_tracker_unittest.cc b/components/google/core/browser/google_url_tracker_unittest.cc index e63d36d..03b34e2 100644 --- a/components/google/core/browser/google_url_tracker_unittest.cc +++ b/components/google/core/browser/google_url_tracker_unittest.cc @@ -9,12 +9,12 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/testing_pref_service.h" #include "base/thread_task_runner_handle.h" #include "components/google/core/browser/google_pref_names.h" #include "components/google/core/browser/google_url_tracker_client.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/testing_pref_service.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_request_test_util.h" diff --git a/components/history/DEPS b/components/history/DEPS index 9111271..01352e6 100644 --- a/components/history/DEPS +++ b/components/history/DEPS @@ -2,6 +2,7 @@ include_rules = [ "+components/favicon_base", "+components/keyed_service", "+components/query_parser", + "+components/prefs", "+components/signin/core", "+components/sync_driver", "+google_apis/gaia", diff --git a/components/history/core/browser/expire_history_backend_unittest.cc b/components/history/core/browser/expire_history_backend_unittest.cc index 149a92e..feb4933 100644 --- a/components/history/core/browser/expire_history_backend_unittest.cc +++ b/components/history/core/browser/expire_history_backend_unittest.cc @@ -17,8 +17,6 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" #include "base/scoped_observer.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" @@ -35,6 +33,8 @@ #include "components/history/core/test/test_history_database.h" #include "components/history/core/test/thumbnail.h" #include "components/history/core/test/wait_top_sites_loaded_observer.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" // The test must be in the history namespace for the gtest forward declarations diff --git a/components/history/core/browser/history_backend_unittest.cc b/components/history/core/browser/history_backend_unittest.cc index 13bcad8..a1574fb 100644 --- a/components/history/core/browser/history_backend_unittest.cc +++ b/components/history/core/browser/history_backend_unittest.cc @@ -24,7 +24,6 @@ #include "base/metrics/histogram_base.h" #include "base/metrics/histogram_samples.h" #include "base/metrics/statistics_recorder.h" -#include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" @@ -46,6 +45,7 @@ #include "components/history/core/test/database_test_utils.h" #include "components/history/core/test/history_client_fake_bookmarks.h" #include "components/history/core/test/test_history_database.h" +#include "components/prefs/pref_service.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/components/history/core/browser/top_sites_impl.cc b/components/history/core/browser/top_sites_impl.cc index 09458bf..fb8e080 100644 --- a/components/history/core/browser/top_sites_impl.cc +++ b/components/history/core/browser/top_sites_impl.cc @@ -16,9 +16,6 @@ #include "base/md5.h" #include "base/memory/ref_counted_memory.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" @@ -34,6 +31,9 @@ #include "components/history/core/browser/top_sites_observer.h" #include "components/history/core/browser/url_utils.h" #include "components/history/core/common/thumbnail_score.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" diff --git a/components/history/core/browser/top_sites_impl_unittest.cc b/components/history/core/browser/top_sites_impl_unittest.cc index 2efb4af..a36357d 100644 --- a/components/history/core/browser/top_sites_impl_unittest.cc +++ b/components/history/core/browser/top_sites_impl_unittest.cc @@ -12,8 +12,6 @@ #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/task/cancelable_task_tracker.h" #include "build/build_config.h" @@ -29,6 +27,8 @@ #include "components/history/core/test/history_unittest_base.h" #include "components/history/core/test/test_history_database.h" #include "components/history/core/test/wait_top_sites_loaded_observer.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "url/gurl.h" diff --git a/components/history/core/browser/typed_url_data_type_controller.cc b/components/history/core/browser/typed_url_data_type_controller.cc index 462569f..d833f02 100644 --- a/components/history/core/browser/typed_url_data_type_controller.cc +++ b/components/history/core/browser/typed_url_data_type_controller.cc @@ -7,9 +7,9 @@ #include "base/bind.h" #include "base/callback.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "components/history/core/browser/history_db_task.h" #include "components/history/core/browser/history_service.h" +#include "components/prefs/pref_service.h" #include "components/sync_driver/sync_client.h" namespace browser_sync { diff --git a/components/history/core/browser/typed_url_data_type_controller.h b/components/history/core/browser/typed_url_data_type_controller.h index 58c4e8d..9e84a35 100644 --- a/components/history/core/browser/typed_url_data_type_controller.h +++ b/components/history/core/browser/typed_url_data_type_controller.h @@ -10,8 +10,8 @@ #include "base/compiler_specific.h" #include "base/macros.h" #include "base/memory/ref_counted.h" -#include "base/prefs/pref_change_registrar.h" #include "base/task/cancelable_task_tracker.h" +#include "components/prefs/pref_change_registrar.h" #include "components/sync_driver/non_ui_data_type_controller.h" #include "components/sync_driver/sync_api_component_factory.h" diff --git a/components/invalidation/DEPS b/components/invalidation/DEPS index 0fdd76d..05f988e 100644 --- a/components/invalidation/DEPS +++ b/components/invalidation/DEPS @@ -2,5 +2,6 @@ include_rules = [ # Explicitly forbid //content even though it is not allowed presently. "-content", "-components/invalidation", + "+components/prefs", "+google/cacheinvalidation", ] diff --git a/components/invalidation/impl/invalidator_storage.cc b/components/invalidation/impl/invalidator_storage.cc index 6710854..a06c2fc 100644 --- a/components/invalidation/impl/invalidator_storage.cc +++ b/components/invalidation/impl/invalidator_storage.cc @@ -12,12 +12,12 @@ #include "base/base64.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/values.h" #include "components/invalidation/impl/invalidation_prefs.h" #include "components/invalidation/impl/unacked_invalidation_set.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "google/cacheinvalidation/types.pb.h" namespace { diff --git a/components/invalidation/impl/invalidator_storage_unittest.cc b/components/invalidation/impl/invalidator_storage_unittest.cc index 5a7b6bf..23fe0da 100644 --- a/components/invalidation/impl/invalidator_storage_unittest.cc +++ b/components/invalidation/impl/invalidator_storage_unittest.cc @@ -4,10 +4,10 @@ #include "components/invalidation/impl/invalidator_storage.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "components/invalidation/impl/unacked_invalidation_set_test_util.h" #include "components/pref_registry/testing_pref_service_syncable.h" +#include "components/prefs/pref_service.h" #include "testing/gtest/include/gtest/gtest.h" namespace invalidation { diff --git a/components/invalidation/impl/ticl_profile_settings_provider.cc b/components/invalidation/impl/ticl_profile_settings_provider.cc index 1658c16..e9424f2 100644 --- a/components/invalidation/impl/ticl_profile_settings_provider.cc +++ b/components/invalidation/impl/ticl_profile_settings_provider.cc @@ -7,11 +7,11 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" -#include "base/prefs/pref_service.h" #include "components/gcm_driver/gcm_channel_status_syncer.h" #include "components/invalidation/impl/invalidation_prefs.h" #include "components/invalidation/impl/invalidation_switches.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" namespace invalidation { diff --git a/components/invalidation/impl/ticl_profile_settings_provider.h b/components/invalidation/impl/ticl_profile_settings_provider.h index 83841ba..15020ef 100644 --- a/components/invalidation/impl/ticl_profile_settings_provider.h +++ b/components/invalidation/impl/ticl_profile_settings_provider.h @@ -7,8 +7,8 @@ #include "base/compiler_specific.h" #include "base/macros.h" -#include "base/prefs/pref_change_registrar.h" #include "components/invalidation/impl/ticl_settings_provider.h" +#include "components/prefs/pref_change_registrar.h" class PrefService; diff --git a/components/invalidation/impl/ticl_profile_settings_provider_unittest.cc b/components/invalidation/impl/ticl_profile_settings_provider_unittest.cc index 0f660d5..80ba9820 100644 --- a/components/invalidation/impl/ticl_profile_settings_provider_unittest.cc +++ b/components/invalidation/impl/ticl_profile_settings_provider_unittest.cc @@ -7,7 +7,6 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_service.h" #include "components/gcm_driver/fake_gcm_driver.h" #include "components/gcm_driver/gcm_channel_status_syncer.h" #include "components/invalidation/impl/fake_invalidation_state_tracker.h" @@ -17,6 +16,7 @@ #include "components/invalidation/impl/ticl_invalidation_service.h" #include "components/invalidation/impl/ticl_settings_provider.h" #include "components/pref_registry/testing_pref_service_syncable.h" +#include "components/prefs/pref_service.h" #include "google_apis/gaia/fake_identity_provider.h" #include "google_apis/gaia/fake_oauth2_token_service.h" #include "google_apis/gaia/identity_provider.h" diff --git a/components/keyed_service/DEPS b/components/keyed_service/DEPS index 5c12ca8..4153fdb 100644 --- a/components/keyed_service/DEPS +++ b/components/keyed_service/DEPS @@ -4,5 +4,6 @@ include_rules = [ "-components/keyed_service/content", "+components/pref_registry", + "+components/prefs", "+components/user_prefs", ] diff --git a/components/keyed_service/core/keyed_service_base_factory.cc b/components/keyed_service/core/keyed_service_base_factory.cc index 3833d68..9f0991d 100644 --- a/components/keyed_service/core/keyed_service_base_factory.cc +++ b/components/keyed_service/core/keyed_service_base_factory.cc @@ -4,11 +4,11 @@ #include "components/keyed_service/core/keyed_service_base_factory.h" -#include "base/prefs/pref_service.h" #include "base/supports_user_data.h" #include "base/trace_event/trace_event.h" #include "components/keyed_service/core/dependency_manager.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "components/user_prefs/user_prefs.h" void KeyedServiceBaseFactory::RegisterUserPrefsOnContextForTest( diff --git a/components/metrics/clean_exit_beacon.cc b/components/metrics/clean_exit_beacon.cc index 1756467..f90f2d0 100644 --- a/components/metrics/clean_exit_beacon.cc +++ b/components/metrics/clean_exit_beacon.cc @@ -5,9 +5,9 @@ #include "components/metrics/clean_exit_beacon.h" #include "base/logging.h" -#include "base/prefs/pref_service.h" #include "build/build_config.h" #include "components/metrics/metrics_pref_names.h" +#include "components/prefs/pref_service.h" #if defined(OS_WIN) #include "base/metrics/histogram.h" diff --git a/components/metrics/cloned_install_detector.cc b/components/metrics/cloned_install_detector.cc index ff80116..7e9be8c 100644 --- a/components/metrics/cloned_install_detector.cc +++ b/components/metrics/cloned_install_detector.cc @@ -12,12 +12,12 @@ #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/metrics_hashes.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/single_thread_task_runner.h" #include "base/task_runner_util.h" #include "components/metrics/machine_id_provider.h" #include "components/metrics/metrics_pref_names.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" namespace metrics { diff --git a/components/metrics/cloned_install_detector_unittest.cc b/components/metrics/cloned_install_detector_unittest.cc index 4c26479..91b24e8 100644 --- a/components/metrics/cloned_install_detector_unittest.cc +++ b/components/metrics/cloned_install_detector_unittest.cc @@ -4,10 +4,10 @@ #include "components/metrics/cloned_install_detector.h" -#include "base/prefs/testing_pref_service.h" #include "components/metrics/machine_id_provider.h" #include "components/metrics/metrics_pref_names.h" #include "components/metrics/metrics_state_manager.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" namespace metrics { diff --git a/components/metrics/daily_event.cc b/components/metrics/daily_event.cc index 0f9b68a..42ba48c 100644 --- a/components/metrics/daily_event.cc +++ b/components/metrics/daily_event.cc @@ -8,8 +8,8 @@ #include "base/i18n/time_formatting.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" namespace metrics { diff --git a/components/metrics/daily_event_unittest.cc b/components/metrics/daily_event_unittest.cc index 741bab5..4adbaaf 100644 --- a/components/metrics/daily_event_unittest.cc +++ b/components/metrics/daily_event_unittest.cc @@ -5,7 +5,7 @@ #include "components/metrics/daily_event.h" #include "base/macros.h" -#include "base/prefs/testing_pref_service.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" namespace metrics { diff --git a/components/metrics/metrics_log.cc b/components/metrics/metrics_log.cc index 728068f..9777412 100644 --- a/components/metrics/metrics_log.cc +++ b/components/metrics/metrics_log.cc @@ -17,8 +17,6 @@ #include "base/metrics/histogram.h" #include "base/metrics/histogram_samples.h" #include "base/metrics/metrics_hashes.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/sha1.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" @@ -33,6 +31,8 @@ #include "components/metrics/proto/histogram_event.pb.h" #include "components/metrics/proto/system_profile.pb.h" #include "components/metrics/proto/user_action_event.pb.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/variations/active_field_trials.h" #if defined(OS_ANDROID) diff --git a/components/prefs/BUILD.gn b/components/prefs/BUILD.gn index 0919fe3..fdbb5cf 100644 --- a/components/prefs/BUILD.gn +++ b/components/prefs/BUILD.gn @@ -4,30 +4,6 @@ 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", @@ -70,7 +46,7 @@ component("prefs") { ] } - defines = [ "BASE_PREFS_IMPLEMENTATION" ] + defines = [ "COMPONENTS_PREFS_IMPLEMENTATION" ] deps = [ "//base", @@ -85,13 +61,6 @@ 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/prefs/base_prefs_export.h b/components/prefs/base_prefs_export.h index 3d207db..e047ad9 100644 --- a/components/prefs/base_prefs_export.h +++ b/components/prefs/base_prefs_export.h @@ -2,28 +2,28 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_PREFS_BASE_PREFS_EXPORT_H_ -#define BASE_PREFS_BASE_PREFS_EXPORT_H_ +#ifndef COMPONENTS_PREFS_COMPONENTS_PREFS_EXPORT_H_ +#define COMPONENTS_PREFS_COMPONENTS_PREFS_EXPORT_H_ #if defined(COMPONENT_BUILD) #if defined(WIN32) -#if defined(BASE_PREFS_IMPLEMENTATION) -#define BASE_PREFS_EXPORT __declspec(dllexport) +#if defined(COMPONENTS_PREFS_IMPLEMENTATION) +#define COMPONENTS_PREFS_EXPORT __declspec(dllexport) #else -#define BASE_PREFS_EXPORT __declspec(dllimport) -#endif // defined(BASE_PREFS_IMPLEMENTATION) +#define COMPONENTS_PREFS_EXPORT __declspec(dllimport) +#endif // defined(COMPONENTS_PREFS_IMPLEMENTATION) #else // defined(WIN32) -#if defined(BASE_PREFS_IMPLEMENTATION) -#define BASE_PREFS_EXPORT __attribute__((visibility("default"))) +#if defined(COMPONENTS_PREFS_IMPLEMENTATION) +#define COMPONENTS_PREFS_EXPORT __attribute__((visibility("default"))) #else -#define BASE_PREFS_EXPORT +#define COMPONENTS_PREFS_EXPORT #endif #endif #else // defined(COMPONENT_BUILD) -#define BASE_PREFS_EXPORT +#define COMPONENTS_PREFS_EXPORT #endif -#endif // BASE_PREFS_BASE_PREFS_EXPORT_H_ +#endif // COMPONENTS_PREFS_COMPONENTS_PREFS_EXPORT_H_ diff --git a/components/prefs/default_pref_store.h b/components/prefs/default_pref_store.h index af7306d..2e33889 100644 --- a/components/prefs/default_pref_store.h +++ b/components/prefs/default_pref_store.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 BASE_PREFS_DEFAULT_PREF_STORE_H_ -#define BASE_PREFS_DEFAULT_PREF_STORE_H_ +#ifndef COMPONENTS_PREFS_DEFAULT_PREF_STORE_H_ +#define COMPONENTS_PREFS_DEFAULT_PREF_STORE_H_ #include <string> @@ -15,7 +15,7 @@ #include "components/prefs/pref_value_map.h" // Used within a PrefRegistry to keep track of default preference values. -class BASE_PREFS_EXPORT DefaultPrefStore : public PrefStore { +class COMPONENTS_PREFS_EXPORT DefaultPrefStore : public PrefStore { public: typedef PrefValueMap::const_iterator const_iterator; @@ -50,4 +50,4 @@ class BASE_PREFS_EXPORT DefaultPrefStore : public PrefStore { DISALLOW_COPY_AND_ASSIGN(DefaultPrefStore); }; -#endif // BASE_PREFS_DEFAULT_PREF_STORE_H_ +#endif // COMPONENTS_PREFS_DEFAULT_PREF_STORE_H_ diff --git a/components/prefs/json_pref_store.h b/components/prefs/json_pref_store.h index 30c1642..4b19c95 100644 --- a/components/prefs/json_pref_store.h +++ b/components/prefs/json_pref_store.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 BASE_PREFS_JSON_PREF_STORE_H_ -#define BASE_PREFS_JSON_PREF_STORE_H_ +#ifndef COMPONENTS_PREFS_JSON_PREF_STORE_H_ +#define COMPONENTS_PREFS_JSON_PREF_STORE_H_ #include <stdint.h> @@ -41,7 +41,7 @@ FORWARD_DECLARE_TEST(JsonPrefStoreTest, WriteCountHistogramTestPeriodWithGaps); } // A writable PrefStore implementation that is used for user preferences. -class BASE_PREFS_EXPORT JsonPrefStore +class COMPONENTS_PREFS_EXPORT JsonPrefStore : public PersistentPrefStore, public base::ImportantFileWriter::DataSerializer, public base::SupportsWeakPtr<JsonPrefStore>, @@ -114,7 +114,7 @@ class BASE_PREFS_EXPORT JsonPrefStore private: // Represents a histogram for recording the number of writes to the pref file // that occur every kHistogramWriteReportIntervalInMins minutes. - class BASE_PREFS_EXPORT WriteCountHistogram { + class COMPONENTS_PREFS_EXPORT WriteCountHistogram { public: static const int32_t kHistogramWriteReportIntervalMins; @@ -226,4 +226,4 @@ class BASE_PREFS_EXPORT JsonPrefStore DISALLOW_COPY_AND_ASSIGN(JsonPrefStore); }; -#endif // BASE_PREFS_JSON_PREF_STORE_H_ +#endif // COMPONENTS_PREFS_JSON_PREF_STORE_H_ diff --git a/components/prefs/mock_pref_change_callback.h b/components/prefs/mock_pref_change_callback.h index b1ea0ad..9c0aeec 100644 --- a/components/prefs/mock_pref_change_callback.h +++ b/components/prefs/mock_pref_change_callback.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 BASE_PREFS_MOCK_PREF_CHANGE_CALLBACK_H_ -#define BASE_PREFS_MOCK_PREF_CHANGE_CALLBACK_H_ +#ifndef COMPONENTS_PREFS_MOCK_PREF_CHANGE_CALLBACK_H_ +#define COMPONENTS_PREFS_MOCK_PREF_CHANGE_CALLBACK_H_ #include <string> @@ -48,4 +48,4 @@ class MockPrefChangeCallback { PrefService* prefs_; }; -#endif // BASE_PREFS_MOCK_PREF_CHANGE_CALLBACK_H_ +#endif // COMPONENTS_PREFS_MOCK_PREF_CHANGE_CALLBACK_H_ diff --git a/components/prefs/overlay_user_pref_store.h b/components/prefs/overlay_user_pref_store.h index 92875a6..82d13a1 100644 --- a/components/prefs/overlay_user_pref_store.h +++ b/components/prefs/overlay_user_pref_store.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 BASE_PREFS_OVERLAY_USER_PREF_STORE_H_ -#define BASE_PREFS_OVERLAY_USER_PREF_STORE_H_ +#ifndef COMPONENTS_PREFS_OVERLAY_USER_PREF_STORE_H_ +#define COMPONENTS_PREFS_OVERLAY_USER_PREF_STORE_H_ #include <stdint.h> @@ -21,7 +21,7 @@ // PrefValueMap. Read operations are first answered by the PrefValueMap. // If the PrefValueMap does not contain a value for the requested key, // the look-up is passed on to an underlying PersistentPrefStore |underlay_|. -class BASE_PREFS_EXPORT OverlayUserPrefStore : public PersistentPrefStore, +class COMPONENTS_PREFS_EXPORT OverlayUserPrefStore : public PersistentPrefStore, public PrefStore::Observer { public: explicit OverlayUserPrefStore(PersistentPrefStore* underlay); @@ -86,4 +86,4 @@ class BASE_PREFS_EXPORT OverlayUserPrefStore : public PersistentPrefStore, DISALLOW_COPY_AND_ASSIGN(OverlayUserPrefStore); }; -#endif // BASE_PREFS_OVERLAY_USER_PREF_STORE_H_ +#endif // COMPONENTS_PREFS_OVERLAY_USER_PREF_STORE_H_ diff --git a/components/prefs/persistent_pref_store.h b/components/prefs/persistent_pref_store.h index 51d9656..1356f8e5 100644 --- a/components/prefs/persistent_pref_store.h +++ b/components/prefs/persistent_pref_store.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 BASE_PREFS_PERSISTENT_PREF_STORE_H_ -#define BASE_PREFS_PERSISTENT_PREF_STORE_H_ +#ifndef COMPONENTS_PREFS_PERSISTENT_PREF_STORE_H_ +#define COMPONENTS_PREFS_PERSISTENT_PREF_STORE_H_ #include <string> @@ -13,7 +13,7 @@ // This interface is complementary to the PrefStore interface, declaring // additional functionality that adds support for setting values and persisting // the data to some backing store. -class BASE_PREFS_EXPORT PersistentPrefStore : public WriteablePrefStore { +class COMPONENTS_PREFS_EXPORT PersistentPrefStore : public WriteablePrefStore { public: // Unique integer code for each type of error so we can report them // distinctly in a histogram. @@ -74,4 +74,4 @@ class BASE_PREFS_EXPORT PersistentPrefStore : public WriteablePrefStore { ~PersistentPrefStore() override {} }; -#endif // BASE_PREFS_PERSISTENT_PREF_STORE_H_ +#endif // COMPONENTS_PREFS_PERSISTENT_PREF_STORE_H_ diff --git a/components/prefs/pref_change_registrar.h b/components/prefs/pref_change_registrar.h index 5e5b6a8..2ae3b19 100644 --- a/components/prefs/pref_change_registrar.h +++ b/components/prefs/pref_change_registrar.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 BASE_PREFS_PREF_CHANGE_REGISTRAR_H_ -#define BASE_PREFS_PREF_CHANGE_REGISTRAR_H_ +#ifndef COMPONENTS_PREFS_PREF_CHANGE_REGISTRAR_H_ +#define COMPONENTS_PREFS_PREF_CHANGE_REGISTRAR_H_ #include <map> #include <string> @@ -19,7 +19,7 @@ class PrefService; // with a PrefStore. Functions much like NotificationRegistrar, but specifically // manages observers of preference changes. When the Registrar is destroyed, // all registered observers are automatically unregistered with the PrefStore. -class BASE_PREFS_EXPORT PrefChangeRegistrar : public PrefObserver { +class COMPONENTS_PREFS_EXPORT PrefChangeRegistrar : public PrefObserver { public: // You can register this type of callback if you need to know the // path of the preference that is changing. @@ -78,4 +78,4 @@ class BASE_PREFS_EXPORT PrefChangeRegistrar : public PrefObserver { DISALLOW_COPY_AND_ASSIGN(PrefChangeRegistrar); }; -#endif // BASE_PREFS_PREF_CHANGE_REGISTRAR_H_ +#endif // COMPONENTS_PREFS_PREF_CHANGE_REGISTRAR_H_ diff --git a/components/prefs/pref_filter.h b/components/prefs/pref_filter.h index bb4847b..8fa6627 100644 --- a/components/prefs/pref_filter.h +++ b/components/prefs/pref_filter.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 BASE_PREFS_PREF_FILTER_H_ -#define BASE_PREFS_PREF_FILTER_H_ +#ifndef COMPONENTS_PREFS_PREF_FILTER_H_ +#define COMPONENTS_PREFS_PREF_FILTER_H_ #include <string> @@ -18,7 +18,7 @@ class Value; // Filters preferences as they are loaded from disk or updated at runtime. // Currently supported only by JsonPrefStore. -class BASE_PREFS_EXPORT PrefFilter { +class COMPONENTS_PREFS_EXPORT PrefFilter { public: // A callback to be invoked when |prefs| have been read (and possibly // pre-modified) and are now ready to be handed back to this callback's @@ -52,4 +52,4 @@ class BASE_PREFS_EXPORT PrefFilter { base::DictionaryValue* pref_store_contents) = 0; }; -#endif // BASE_PREFS_PREF_FILTER_H_ +#endif // COMPONENTS_PREFS_PREF_FILTER_H_ diff --git a/components/prefs/pref_member.h b/components/prefs/pref_member.h index 8ca9789..f46e368 100644 --- a/components/prefs/pref_member.h +++ b/components/prefs/pref_member.h @@ -21,8 +21,8 @@ // notify MyClass of changes. Note that if you use SetValue(), the observer // will not be notified. -#ifndef BASE_PREFS_PREF_MEMBER_H_ -#define BASE_PREFS_PREF_MEMBER_H_ +#ifndef COMPONENTS_PREFS_PREF_MEMBER_H_ +#define COMPONENTS_PREFS_PREF_MEMBER_H_ #include <string> #include <vector> @@ -42,7 +42,7 @@ class PrefService; namespace subtle { -class BASE_PREFS_EXPORT PrefMemberBase : public PrefObserver { +class COMPONENTS_PREFS_EXPORT PrefMemberBase : public PrefObserver { public: // Type of callback you can register if you need to know the name of // the pref that is changing. @@ -52,7 +52,7 @@ class BASE_PREFS_EXPORT PrefMemberBase : public PrefObserver { const PrefService* prefs() const { return prefs_; } protected: - class BASE_PREFS_EXPORT Internal + class COMPONENTS_PREFS_EXPORT Internal : public base::RefCountedThreadSafe<Internal> { public: Internal(); @@ -151,7 +151,7 @@ class BASE_PREFS_EXPORT PrefMemberBase : public PrefObserver { // This function implements StringListPrefMember::UpdateValue(). // It is exposed here for testing purposes. -bool BASE_PREFS_EXPORT PrefMemberVectorStringUpdate( +bool COMPONENTS_PREFS_EXPORT PrefMemberVectorStringUpdate( const base::Value& value, std::vector<std::string>* string_vector); @@ -263,7 +263,7 @@ class PrefMember : public subtle::PrefMemberBase { protected: ~Internal() override {} - BASE_PREFS_EXPORT bool UpdateValueInternal( + COMPONENTS_PREFS_EXPORT bool UpdateValueInternal( const base::Value& value) const override; // We cache the value of the pref so we don't have to keep walking the pref @@ -278,7 +278,7 @@ class PrefMember : public subtle::PrefMemberBase { void CreateInternal() const override { internal_ = new Internal(); } // This method is used to do the actual sync with pref of the specified type. - void BASE_PREFS_EXPORT UpdatePref(const ValueType& value); + void COMPONENTS_PREFS_EXPORT UpdatePref(const ValueType& value); mutable scoped_refptr<Internal> internal_; @@ -298,50 +298,52 @@ class PrefMember : public subtle::PrefMemberBase { // --install --runhooks template <> -BASE_PREFS_EXPORT void PrefMember<bool>::UpdatePref(const bool& value); +COMPONENTS_PREFS_EXPORT void PrefMember<bool>::UpdatePref(const bool& value); template <> -BASE_PREFS_EXPORT bool PrefMember<bool>::Internal::UpdateValueInternal( +COMPONENTS_PREFS_EXPORT bool PrefMember<bool>::Internal::UpdateValueInternal( const base::Value& value) const; template <> -BASE_PREFS_EXPORT void PrefMember<int>::UpdatePref(const int& value); +COMPONENTS_PREFS_EXPORT void PrefMember<int>::UpdatePref(const int& value); template <> -BASE_PREFS_EXPORT bool PrefMember<int>::Internal::UpdateValueInternal( +COMPONENTS_PREFS_EXPORT bool PrefMember<int>::Internal::UpdateValueInternal( const base::Value& value) const; template <> -BASE_PREFS_EXPORT void PrefMember<double>::UpdatePref(const double& value); +COMPONENTS_PREFS_EXPORT void +PrefMember<double>::UpdatePref(const double& value); template <> -BASE_PREFS_EXPORT bool PrefMember<double>::Internal::UpdateValueInternal( +COMPONENTS_PREFS_EXPORT bool PrefMember<double>::Internal::UpdateValueInternal( const base::Value& value) const; template <> -BASE_PREFS_EXPORT void PrefMember<std::string>::UpdatePref( +COMPONENTS_PREFS_EXPORT void PrefMember<std::string>::UpdatePref( const std::string& value); template <> -BASE_PREFS_EXPORT bool PrefMember<std::string>::Internal::UpdateValueInternal( +COMPONENTS_PREFS_EXPORT bool +PrefMember<std::string>::Internal::UpdateValueInternal( const base::Value& value) const; template <> -BASE_PREFS_EXPORT void PrefMember<base::FilePath>::UpdatePref( +COMPONENTS_PREFS_EXPORT void PrefMember<base::FilePath>::UpdatePref( const base::FilePath& value); template <> -BASE_PREFS_EXPORT bool +COMPONENTS_PREFS_EXPORT bool PrefMember<base::FilePath>::Internal::UpdateValueInternal( const base::Value& value) const; template <> -BASE_PREFS_EXPORT void PrefMember<std::vector<std::string> >::UpdatePref( +COMPONENTS_PREFS_EXPORT void PrefMember<std::vector<std::string>>::UpdatePref( const std::vector<std::string>& value); template <> -BASE_PREFS_EXPORT bool -PrefMember<std::vector<std::string> >::Internal::UpdateValueInternal( +COMPONENTS_PREFS_EXPORT bool +PrefMember<std::vector<std::string>>::Internal::UpdateValueInternal( const base::Value& value) const; typedef PrefMember<bool> BooleanPrefMember; @@ -350,6 +352,6 @@ typedef PrefMember<double> DoublePrefMember; typedef PrefMember<std::string> StringPrefMember; typedef PrefMember<base::FilePath> FilePathPrefMember; // This preference member is expensive for large string arrays. -typedef PrefMember<std::vector<std::string> > StringListPrefMember; +typedef PrefMember<std::vector<std::string>> StringListPrefMember; -#endif // BASE_PREFS_PREF_MEMBER_H_ +#endif // COMPONENTS_PREFS_PREF_MEMBER_H_ diff --git a/components/prefs/pref_notifier.h b/components/prefs/pref_notifier.h index e0df260..2abc213 100644 --- a/components/prefs/pref_notifier.h +++ b/components/prefs/pref_notifier.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 BASE_PREFS_PREF_NOTIFIER_H_ -#define BASE_PREFS_PREF_NOTIFIER_H_ +#ifndef COMPONENTS_PREFS_PREF_NOTIFIER_H_ +#define COMPONENTS_PREFS_PREF_NOTIFIER_H_ #include <string> @@ -23,4 +23,4 @@ class PrefNotifier { virtual void OnInitializationCompleted(bool succeeded) = 0; }; -#endif // BASE_PREFS_PREF_NOTIFIER_H_ +#endif // COMPONENTS_PREFS_PREF_NOTIFIER_H_ diff --git a/components/prefs/pref_notifier_impl.h b/components/prefs/pref_notifier_impl.h index bd26d03..e0da264 100644 --- a/components/prefs/pref_notifier_impl.h +++ b/components/prefs/pref_notifier_impl.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 BASE_PREFS_PREF_NOTIFIER_IMPL_H_ -#define BASE_PREFS_PREF_NOTIFIER_IMPL_H_ +#ifndef COMPONENTS_PREFS_PREF_NOTIFIER_IMPL_H_ +#define COMPONENTS_PREFS_PREF_NOTIFIER_IMPL_H_ #include <list> #include <string> @@ -21,7 +21,7 @@ class PrefService; // The PrefNotifier implementation used by the PrefService. -class BASE_PREFS_EXPORT PrefNotifierImpl +class COMPONENTS_PREFS_EXPORT PrefNotifierImpl : public NON_EXPORTED_BASE(PrefNotifier) { public: PrefNotifierImpl(); @@ -71,4 +71,4 @@ class BASE_PREFS_EXPORT PrefNotifierImpl DISALLOW_COPY_AND_ASSIGN(PrefNotifierImpl); }; -#endif // BASE_PREFS_PREF_NOTIFIER_IMPL_H_ +#endif // COMPONENTS_PREFS_PREF_NOTIFIER_IMPL_H_ diff --git a/components/prefs/pref_observer.h b/components/prefs/pref_observer.h index 5d8f5b6..3f48931 100644 --- a/components/prefs/pref_observer.h +++ b/components/prefs/pref_observer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_PREFS_PREF_OBSERVER_H_ -#define BASE_PREFS_PREF_OBSERVER_H_ +#ifndef COMPONENTS_PREFS_PREF_OBSERVER_H_ +#define COMPONENTS_PREFS_PREF_OBSERVER_H_ #include <string> @@ -18,4 +18,4 @@ class PrefObserver { const std::string& pref_name) = 0; }; -#endif // BASE_PREFS_PREF_OBSERVER_H_ +#endif // COMPONENTS_PREFS_PREF_OBSERVER_H_ diff --git a/components/prefs/pref_registry.h b/components/prefs/pref_registry.h index 56755ca..31a4956 100644 --- a/components/prefs/pref_registry.h +++ b/components/prefs/pref_registry.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 BASE_PREFS_PREF_REGISTRY_H_ -#define BASE_PREFS_PREF_REGISTRY_H_ +#ifndef COMPONENTS_PREFS_PREF_REGISTRY_H_ +#define COMPONENTS_PREFS_PREF_REGISTRY_H_ #include <stdint.h> @@ -29,7 +29,8 @@ class PrefStore; // // Currently, registrations after constructing the PrefService will // also work, but this is being deprecated. -class BASE_PREFS_EXPORT PrefRegistry : public base::RefCounted<PrefRegistry> { +class COMPONENTS_PREFS_EXPORT PrefRegistry + : public base::RefCounted<PrefRegistry> { public: // Registration flags that can be specified which impact how the pref will // behave or be stored. This will be passed in a bitmask when the pref is @@ -86,4 +87,4 @@ class BASE_PREFS_EXPORT PrefRegistry : public base::RefCounted<PrefRegistry> { DISALLOW_COPY_AND_ASSIGN(PrefRegistry); }; -#endif // BASE_PREFS_PREF_REGISTRY_H_ +#endif // COMPONENTS_PREFS_PREF_REGISTRY_H_ diff --git a/components/prefs/pref_registry_simple.h b/components/prefs/pref_registry_simple.h index 4348029..e326787 100644 --- a/components/prefs/pref_registry_simple.h +++ b/components/prefs/pref_registry_simple.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 BASE_PREFS_PREF_REGISTRY_SIMPLE_H_ -#define BASE_PREFS_PREF_REGISTRY_SIMPLE_H_ +#ifndef COMPONENTS_PREFS_PREF_REGISTRY_SIMPLE_H_ +#define COMPONENTS_PREFS_PREF_REGISTRY_SIMPLE_H_ #include <stdint.h> @@ -20,7 +20,7 @@ class ListValue; } // A simple implementation of PrefRegistry. -class BASE_PREFS_EXPORT PrefRegistrySimple : public PrefRegistry { +class COMPONENTS_PREFS_EXPORT PrefRegistrySimple : public PrefRegistry { public: PrefRegistrySimple(); @@ -88,4 +88,4 @@ class BASE_PREFS_EXPORT PrefRegistrySimple : public PrefRegistry { DISALLOW_COPY_AND_ASSIGN(PrefRegistrySimple); }; -#endif // BASE_PREFS_PREF_REGISTRY_SIMPLE_H_ +#endif // COMPONENTS_PREFS_PREF_REGISTRY_SIMPLE_H_ diff --git a/components/prefs/pref_service.h b/components/prefs/pref_service.h index 7b94cb6..50a827c 100644 --- a/components/prefs/pref_service.h +++ b/components/prefs/pref_service.h @@ -8,8 +8,8 @@ // information and MUST not be extracted, overwritten or modified except // through Chromium defined APIs. -#ifndef BASE_PREFS_PREF_SERVICE_H_ -#define BASE_PREFS_PREF_SERVICE_H_ +#ifndef COMPONENTS_PREFS_PREF_SERVICE_H_ +#define COMPONENTS_PREFS_PREF_SERVICE_H_ #include <stdint.h> @@ -51,7 +51,7 @@ class ScopedUserPrefUpdateBase; // Settings and storage accessed through this class represent // user-selected preferences and information and MUST not be // extracted, overwritten or modified except through the defined APIs. -class BASE_PREFS_EXPORT PrefService : public base::NonThreadSafe { +class COMPONENTS_PREFS_EXPORT PrefService : public base::NonThreadSafe { public: enum PrefInitializationStatus { INITIALIZATION_STATUS_WAITING, @@ -61,7 +61,7 @@ class BASE_PREFS_EXPORT PrefService : public base::NonThreadSafe { }; // A helper class to store all the information associated with a preference. - class BASE_PREFS_EXPORT Preference { + class COMPONENTS_PREFS_EXPORT Preference { public: // The type of the preference is determined by the type with which it is // registered. This type needs to be a boolean, integer, double, string, @@ -382,4 +382,4 @@ class BASE_PREFS_EXPORT PrefService : public base::NonThreadSafe { DISALLOW_COPY_AND_ASSIGN(PrefService); }; -#endif // BASE_PREFS_PREF_SERVICE_H_ +#endif // COMPONENTS_PREFS_PREF_SERVICE_H_ diff --git a/components/prefs/pref_service_factory.cc b/components/prefs/pref_service_factory.cc index e8b9bb4..663695d 100644 --- a/components/prefs/pref_service_factory.cc +++ b/components/prefs/pref_service_factory.cc @@ -13,8 +13,6 @@ #include "components/prefs/pref_service.h" #include "components/prefs/pref_value_store.h" -namespace base { - namespace { // Do-nothing default implementation. @@ -61,5 +59,3 @@ scoped_ptr<PrefService> PrefServiceFactory::Create( async_)); return pref_service; } - -} // namespace base diff --git a/components/prefs/pref_service_factory.h b/components/prefs/pref_service_factory.h index b56fb23..bf7f56c 100644 --- a/components/prefs/pref_service_factory.h +++ b/components/prefs/pref_service_factory.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 BASE_PREFS_PREF_SERVICE_FACTORY_H_ -#define BASE_PREFS_PREF_SERVICE_FACTORY_H_ +#ifndef COMPONENTS_PREFS_PREF_SERVICE_FACTORY_H_ +#define COMPONENTS_PREFS_PREF_SERVICE_FACTORY_H_ #include "base/callback.h" #include "base/macros.h" @@ -16,12 +16,12 @@ class PrefService; namespace base { - class FilePath; class SequencedTaskRunner; +} // A class that allows convenient building of PrefService. -class BASE_PREFS_EXPORT PrefServiceFactory { +class COMPONENTS_PREFS_EXPORT PrefServiceFactory { public: PrefServiceFactory(); virtual ~PrefServiceFactory(); @@ -86,6 +86,4 @@ class BASE_PREFS_EXPORT PrefServiceFactory { DISALLOW_COPY_AND_ASSIGN(PrefServiceFactory); }; -} // namespace base - -#endif // BASE_PREFS_PREF_SERVICE_FACTORY_H_ +#endif // COMPONENTS_PREFS_PREF_SERVICE_FACTORY_H_ diff --git a/components/prefs/pref_service_unittest.cc b/components/prefs/pref_service_unittest.cc index 8500cf6..77ecd19 100644 --- a/components/prefs/pref_service_unittest.cc +++ b/components/prefs/pref_service_unittest.cc @@ -284,7 +284,7 @@ class WriteFlagChecker : public TestingPrefStore { TEST(PrefServiceTest, WriteablePrefStoreFlags) { scoped_refptr<WriteFlagChecker> flag_checker(new WriteFlagChecker); scoped_refptr<PrefRegistrySimple> registry(new PrefRegistrySimple); - base::PrefServiceFactory factory; + PrefServiceFactory factory; factory.set_user_prefs(flag_checker); scoped_ptr<PrefService> prefs(factory.Create(registry.get())); diff --git a/components/prefs/pref_store.h b/components/prefs/pref_store.h index 6f0c16b..ef2bc49 100644 --- a/components/prefs/pref_store.h +++ b/components/prefs/pref_store.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 BASE_PREFS_PREF_STORE_H_ -#define BASE_PREFS_PREF_STORE_H_ +#ifndef COMPONENTS_PREFS_PREF_STORE_H_ +#define COMPONENTS_PREFS_PREF_STORE_H_ #include <string> @@ -22,10 +22,10 @@ class Value; // CommandLinePrefStore, which bridges command line options to preferences and // ConfigurationPolicyPrefStore, which is used for hooking up configuration // policy with the preference subsystem. -class BASE_PREFS_EXPORT PrefStore : public base::RefCounted<PrefStore> { +class COMPONENTS_PREFS_EXPORT PrefStore : public base::RefCounted<PrefStore> { public: // Observer interface for monitoring PrefStore. - class BASE_PREFS_EXPORT Observer { + class COMPONENTS_PREFS_EXPORT Observer { public: // Called when the value for the given |key| in the store changes. virtual void OnPrefValueChanged(const std::string& key) = 0; @@ -60,4 +60,4 @@ class BASE_PREFS_EXPORT PrefStore : public base::RefCounted<PrefStore> { DISALLOW_COPY_AND_ASSIGN(PrefStore); }; -#endif // BASE_PREFS_PREF_STORE_H_ +#endif // COMPONENTS_PREFS_PREF_STORE_H_ diff --git a/components/prefs/pref_store_observer_mock.h b/components/prefs/pref_store_observer_mock.h index 107aeb3..01bd6a6 100644 --- a/components/prefs/pref_store_observer_mock.h +++ b/components/prefs/pref_store_observer_mock.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 BASE_PREFS_PREF_STORE_OBSERVER_MOCK_H_ -#define BASE_PREFS_PREF_STORE_OBSERVER_MOCK_H_ +#ifndef COMPONENTS_PREFS_PREF_STORE_OBSERVER_MOCK_H_ +#define COMPONENTS_PREFS_PREF_STORE_OBSERVER_MOCK_H_ #include <string> #include <vector> @@ -32,4 +32,4 @@ class PrefStoreObserverMock : public PrefStore::Observer { DISALLOW_COPY_AND_ASSIGN(PrefStoreObserverMock); }; -#endif // BASE_PREFS_PREF_STORE_OBSERVER_MOCK_H_ +#endif // COMPONENTS_PREFS_PREF_STORE_OBSERVER_MOCK_H_ diff --git a/components/prefs/pref_value_map.h b/components/prefs/pref_value_map.h index 56c32b0..988a638 100644 --- a/components/prefs/pref_value_map.h +++ b/components/prefs/pref_value_map.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 BASE_PREFS_PREF_VALUE_MAP_H_ -#define BASE_PREFS_PREF_VALUE_MAP_H_ +#ifndef COMPONENTS_PREFS_PREF_VALUE_MAP_H_ +#define COMPONENTS_PREFS_PREF_VALUE_MAP_H_ #include <string> #include <vector> @@ -18,7 +18,7 @@ class Value; } // A generic string to value map used by the PrefStore implementations. -class BASE_PREFS_EXPORT PrefValueMap { +class COMPONENTS_PREFS_EXPORT PrefValueMap { public: using Map = base::ScopedPtrHashMap<std::string, scoped_ptr<base::Value>>; using iterator = Map::iterator; @@ -88,4 +88,4 @@ class BASE_PREFS_EXPORT PrefValueMap { DISALLOW_COPY_AND_ASSIGN(PrefValueMap); }; -#endif // BASE_PREFS_PREF_VALUE_MAP_H_ +#endif // COMPONENTS_PREFS_PREF_VALUE_MAP_H_ diff --git a/components/prefs/pref_value_store.h b/components/prefs/pref_value_store.h index 3a2bf15..39b6bf1 100644 --- a/components/prefs/pref_value_store.h +++ b/components/prefs/pref_value_store.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 BASE_PREFS_PREF_VALUE_STORE_H_ -#define BASE_PREFS_PREF_VALUE_STORE_H_ +#ifndef COMPONENTS_PREFS_PREF_VALUE_STORE_H_ +#define COMPONENTS_PREFS_PREF_VALUE_STORE_H_ #include <map> #include <string> @@ -26,7 +26,7 @@ class PrefStore; // // Unless otherwise explicitly noted, all of the methods of this class must // be called on the UI thread. -class BASE_PREFS_EXPORT PrefValueStore { +class COMPONENTS_PREFS_EXPORT PrefValueStore { public: typedef base::Callback<void(const std::string&)> PrefChangedCallback; @@ -257,4 +257,4 @@ class BASE_PREFS_EXPORT PrefValueStore { DISALLOW_COPY_AND_ASSIGN(PrefValueStore); }; -#endif // BASE_PREFS_PREF_VALUE_STORE_H_ +#endif // COMPONENTS_PREFS_PREF_VALUE_STORE_H_ diff --git a/components/prefs/prefs.gyp b/components/prefs/prefs.gyp index ed9c58a..554bef4f 100644 --- a/components/prefs/prefs.gyp +++ b/components/prefs/prefs.gyp @@ -14,7 +14,7 @@ '../..', ], 'defines': [ - 'BASE_PREFS_IMPLEMENTATION', + 'COMPONENTS_PREFS_IMPLEMENTATION', ], 'sources': [ 'default_pref_store.cc', diff --git a/components/prefs/scoped_user_pref_update.h b/components/prefs/scoped_user_pref_update.h index 5a2c3ae..bfcdb3f 100644 --- a/components/prefs/scoped_user_pref_update.h +++ b/components/prefs/scoped_user_pref_update.h @@ -5,8 +5,8 @@ // A helper class that assists preferences in firing notifications when lists // or dictionaries are changed. -#ifndef BASE_PREFS_SCOPED_USER_PREF_UPDATE_H_ -#define BASE_PREFS_SCOPED_USER_PREF_UPDATE_H_ +#ifndef COMPONENTS_PREFS_SCOPED_USER_PREF_UPDATE_H_ +#define COMPONENTS_PREFS_SCOPED_USER_PREF_UPDATE_H_ #include <string> @@ -31,7 +31,8 @@ namespace subtle { // We need this base class mostly for making it a friend of PrefService // and getting access to PrefService::GetMutableUserPref and // PrefService::ReportUserPrefChanged. -class BASE_PREFS_EXPORT ScopedUserPrefUpdateBase : public base::NonThreadSafe { +class COMPONENTS_PREFS_EXPORT ScopedUserPrefUpdateBase + : public base::NonThreadSafe { protected: ScopedUserPrefUpdateBase(PrefService* service, const std::string& path); @@ -105,4 +106,4 @@ typedef ScopedUserPrefUpdate<base::DictionaryValue, typedef ScopedUserPrefUpdate<base::ListValue, base::Value::TYPE_LIST> ListPrefUpdate; -#endif // BASE_PREFS_SCOPED_USER_PREF_UPDATE_H_ +#endif // COMPONENTS_PREFS_SCOPED_USER_PREF_UPDATE_H_ diff --git a/components/prefs/testing_pref_service.h b/components/prefs/testing_pref_service.h index 5391c51..7568589 100644 --- a/components/prefs/testing_pref_service.h +++ b/components/prefs/testing_pref_service.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 BASE_PREFS_TESTING_PREF_SERVICE_H_ -#define BASE_PREFS_TESTING_PREF_SERVICE_H_ +#ifndef COMPONENTS_PREFS_TESTING_PREF_SERVICE_H_ +#define COMPONENTS_PREFS_TESTING_PREF_SERVICE_H_ #include "base/macros.h" #include "base/memory/ref_counted.h" @@ -193,4 +193,4 @@ void TestingPrefServiceBase<SuperPrefService, ConstructionPrefRegistry>:: pref_store->RemoveValue(path, WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS); } -#endif // BASE_PREFS_TESTING_PREF_SERVICE_H_ +#endif // COMPONENTS_PREFS_TESTING_PREF_SERVICE_H_ diff --git a/components/prefs/testing_pref_store.h b/components/prefs/testing_pref_store.h index e2a5997..ea21769 100644 --- a/components/prefs/testing_pref_store.h +++ b/components/prefs/testing_pref_store.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 BASE_PREFS_TESTING_PREF_STORE_H_ -#define BASE_PREFS_TESTING_PREF_STORE_H_ +#ifndef COMPONENTS_PREFS_TESTING_PREF_STORE_H_ +#define COMPONENTS_PREFS_TESTING_PREF_STORE_H_ #include <stdint.h> @@ -111,4 +111,4 @@ class TestingPrefStore : public PersistentPrefStore { DISALLOW_COPY_AND_ASSIGN(TestingPrefStore); }; -#endif // BASE_PREFS_TESTING_PREF_STORE_H_ +#endif // COMPONENTS_PREFS_TESTING_PREF_STORE_H_ diff --git a/components/prefs/value_map_pref_store.h b/components/prefs/value_map_pref_store.h index 517d07e..bddc641 100644 --- a/components/prefs/value_map_pref_store.h +++ b/components/prefs/value_map_pref_store.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 BASE_PREFS_VALUE_MAP_PREF_STORE_H_ -#define BASE_PREFS_VALUE_MAP_PREF_STORE_H_ +#ifndef COMPONENTS_PREFS_VALUE_MAP_PREF_STORE_H_ +#define COMPONENTS_PREFS_VALUE_MAP_PREF_STORE_H_ #include <stdint.h> @@ -18,7 +18,7 @@ // A basic PrefStore implementation that uses a simple name-value map for // storing the preference values. -class BASE_PREFS_EXPORT ValueMapPrefStore : public WriteablePrefStore { +class COMPONENTS_PREFS_EXPORT ValueMapPrefStore : public WriteablePrefStore { public: ValueMapPrefStore(); @@ -54,4 +54,4 @@ class BASE_PREFS_EXPORT ValueMapPrefStore : public WriteablePrefStore { DISALLOW_COPY_AND_ASSIGN(ValueMapPrefStore); }; -#endif // BASE_PREFS_VALUE_MAP_PREF_STORE_H_ +#endif // COMPONENTS_PREFS_VALUE_MAP_PREF_STORE_H_ diff --git a/components/prefs/writeable_pref_store.h b/components/prefs/writeable_pref_store.h index 94754d3..0cb9f83 100644 --- a/components/prefs/writeable_pref_store.h +++ b/components/prefs/writeable_pref_store.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 BASE_PREFS_WRITEABLE_PREF_STORE_H_ -#define BASE_PREFS_WRITEABLE_PREF_STORE_H_ +#ifndef COMPONENTS_PREFS_WRITEABLE_PREF_STORE_H_ +#define COMPONENTS_PREFS_WRITEABLE_PREF_STORE_H_ #include <stdint.h> @@ -18,7 +18,7 @@ class Value; } // A pref store that can be written to as well as read from. -class BASE_PREFS_EXPORT WriteablePrefStore : public PrefStore { +class COMPONENTS_PREFS_EXPORT WriteablePrefStore : public PrefStore { public: // PrefWriteFlags can be used to change the way a pref will be written to // storage. @@ -69,4 +69,4 @@ class BASE_PREFS_EXPORT WriteablePrefStore : public PrefStore { DISALLOW_COPY_AND_ASSIGN(WriteablePrefStore); }; -#endif // BASE_PREFS_WRITEABLE_PREF_STORE_H_ +#endif // COMPONENTS_PREFS_WRITEABLE_PREF_STORE_H_ diff --git a/components/search_engines/desktop_search_redirection_infobar_delegate.cc b/components/search_engines/desktop_search_redirection_infobar_delegate.cc index 736cce5..557a4e8 100644 --- a/components/search_engines/desktop_search_redirection_infobar_delegate.cc +++ b/components/search_engines/desktop_search_redirection_infobar_delegate.cc @@ -10,10 +10,10 @@ #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" -#include "base/prefs/pref_service.h" #include "components/infobars/core/infobar.h" #include "components/infobars/core/infobar_delegate.h" #include "components/infobars/core/infobar_manager.h" +#include "components/prefs/pref_service.h" #include "components/search_engines/desktop_search_utils.h" #include "grit/components_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/components/search_engines/desktop_search_utils.cc b/components/search_engines/desktop_search_utils.cc index f3d106b7..0999476 100644 --- a/components/search_engines/desktop_search_utils.cc +++ b/components/search_engines/desktop_search_utils.cc @@ -9,9 +9,9 @@ #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "components/search_engines/prepopulated_engines.h" #include "components/search_engines/template_url_prepopulate_data.h" #include "components/search_engines/template_url_service.h" diff --git a/components/syncable_prefs/pref_service_syncable_factory.h b/components/syncable_prefs/pref_service_syncable_factory.h index 28970a7..4695317 100644 --- a/components/syncable_prefs/pref_service_syncable_factory.h +++ b/components/syncable_prefs/pref_service_syncable_factory.h @@ -29,7 +29,7 @@ class PrefServiceSyncable; // A PrefServiceFactory that also knows how to build a // PrefServiceSyncable, and may know about Chrome concepts such as // PolicyService. -class PrefServiceSyncableFactory : public base::PrefServiceFactory { +class PrefServiceSyncableFactory : public PrefServiceFactory { public: PrefServiceSyncableFactory(); ~PrefServiceSyncableFactory() override; diff --git a/content/DEPS b/content/DEPS index d954f6e..66c8738 100644 --- a/content/DEPS +++ b/content/DEPS @@ -13,11 +13,6 @@ include_rules = [ "+content/shell", # for content_browsertests "+content/test", - # content isn't tied to prefs so that other embedders are able to pick - # different ways of storing their preferences. Also, this is to avoid prefs - # being used as a parallel API to the Content API. - "-base/prefs", - "+blink", "+cc", diff --git a/extensions/DEPS b/extensions/DEPS index ebf4915..52dbb3f 100644 --- a/extensions/DEPS +++ b/extensions/DEPS @@ -3,6 +3,7 @@ include_rules = [ "+components/browsing_data", "+components/crx_file", "+components/guest_view", + "+components/prefs", "+components/url_matcher", "-content", "+content/grit/content_resources.h", diff --git a/extensions/browser/app_window/app_window.cc b/extensions/browser/app_window/app_window.cc index 11a3dc7..e328ecf 100644 --- a/extensions/browser/app_window/app_window.cc +++ b/extensions/browser/app_window/app_window.cc @@ -57,7 +57,7 @@ #include "ui/gfx/screen.h" #if !defined(OS_MACOSX) -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_service.h" #include "extensions/browser/pref_names.h" #endif diff --git a/extensions/browser/app_window/app_window_geometry_cache_unittest.cc b/extensions/browser/app_window/app_window_geometry_cache_unittest.cc index edf1467..491f614 100644 --- a/extensions/browser/app_window/app_window_geometry_cache_unittest.cc +++ b/extensions/browser/app_window/app_window_geometry_cache_unittest.cc @@ -10,11 +10,11 @@ #include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/mock_pref_change_callback.h" -#include "base/prefs/pref_service_factory.h" -#include "base/prefs/testing_pref_store.h" #include "base/strings/string_number_conversions.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/mock_pref_change_callback.h" +#include "components/prefs/pref_service_factory.h" +#include "components/prefs/testing_pref_store.h" #include "content/public/test/test_browser_context.h" #include "content/public/test/test_browser_thread.h" #include "content/public/test/test_utils.h" @@ -85,7 +85,7 @@ void AppWindowGeometryCacheTest::SetUp() { // Set up all the dependencies of ExtensionPrefs. extension_pref_value_map_.reset(new ExtensionPrefValueMap); - base::PrefServiceFactory factory; + PrefServiceFactory factory; factory.set_user_prefs(new TestingPrefStore); factory.set_extension_prefs(new TestingPrefStore); user_prefs::PrefRegistrySyncable* pref_registry = diff --git a/extensions/browser/extension_pref_store.h b/extensions/browser/extension_pref_store.h index f8acc7a..3585c33 100644 --- a/extensions/browser/extension_pref_store.h +++ b/extensions/browser/extension_pref_store.h @@ -8,7 +8,7 @@ #include <string> #include "base/macros.h" -#include "base/prefs/value_map_pref_store.h" +#include "components/prefs/value_map_pref_store.h" #include "extensions/browser/extension_pref_value_map.h" // A (non-persistent) PrefStore implementation that holds effective preferences diff --git a/extensions/browser/extension_pref_value_map.cc b/extensions/browser/extension_pref_value_map.cc index 7d238aa..bb1fde5 100644 --- a/extensions/browser/extension_pref_value_map.cc +++ b/extensions/browser/extension_pref_value_map.cc @@ -4,8 +4,8 @@ #include "extensions/browser/extension_pref_value_map.h" -#include "base/prefs/pref_value_map.h" #include "base/values.h" +#include "components/prefs/pref_value_map.h" using extensions::ExtensionPrefsScope; diff --git a/extensions/browser/extension_pref_value_map_unittest.cc b/extensions/browser/extension_pref_value_map_unittest.cc index 8a546125..984448b 100644 --- a/extensions/browser/extension_pref_value_map_unittest.cc +++ b/extensions/browser/extension_pref_value_map_unittest.cc @@ -7,8 +7,8 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_store_observer_mock.h" #include "base/values.h" +#include "components/prefs/pref_store_observer_mock.h" #include "extensions/browser/extension_pref_value_map.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/extensions/browser/extension_prefs.cc b/extensions/browser/extension_prefs.cc index 30eb1dc..37f9842 100644 --- a/extensions/browser/extension_prefs.cc +++ b/extensions/browser/extension_prefs.cc @@ -12,13 +12,13 @@ #include "base/macros.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h" #include "components/crx_file/id_util.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "extensions/browser/app_sorting.h" #include "extensions/browser/event_router.h" #include "extensions/browser/extension_pref_store.h" diff --git a/extensions/browser/extension_prefs.h b/extensions/browser/extension_prefs.h index b20afc4..80b5e37 100644 --- a/extensions/browser/extension_prefs.h +++ b/extensions/browser/extension_prefs.h @@ -13,10 +13,10 @@ #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/time/time.h" #include "base/values.h" #include "components/keyed_service/core/keyed_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "extensions/browser/blacklist_state.h" #include "extensions/browser/extension_scoped_prefs.h" #include "extensions/browser/install_flag.h" diff --git a/extensions/browser/extension_prefs_factory.cc b/extensions/browser/extension_prefs_factory.cc index e110bad..888d9bd 100644 --- a/extensions/browser/extension_prefs_factory.cc +++ b/extensions/browser/extension_prefs_factory.cc @@ -7,8 +7,8 @@ #include <utility> #include "base/command_line.h" -#include "base/prefs/pref_service.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/browser_context.h" #include "extensions/browser/extension_pref_value_map.h" #include "extensions/browser/extension_pref_value_map_factory.h" diff --git a/extensions/browser/lazy_background_task_queue_unittest.cc b/extensions/browser/lazy_background_task_queue_unittest.cc index a54e313..a2b82eb 100644 --- a/extensions/browser/lazy_background_task_queue_unittest.cc +++ b/extensions/browser/lazy_background_task_queue_unittest.cc @@ -7,9 +7,9 @@ #include "base/bind.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/testing_pref_service.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/pref_registry/testing_pref_service_syncable.h" +#include "components/prefs/testing_pref_service.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_browser_context.h" diff --git a/extensions/shell/browser/shell_browser_main_parts.cc b/extensions/shell/browser/shell_browser_main_parts.cc index 55aee81..df6dc98 100644 --- a/extensions/shell/browser/shell_browser_main_parts.cc +++ b/extensions/shell/browser/shell_browser_main_parts.cc @@ -7,11 +7,11 @@ #include <string> #include "base/command_line.h" -#include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "build/build_config.h" #include "components/devtools_http_handler/devtools_http_handler.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" +#include "components/prefs/pref_service.h" #include "components/storage_monitor/storage_monitor.h" #include "components/update_client/update_query_params.h" #include "content/public/browser/child_process_security_policy.h" diff --git a/extensions/shell/browser/shell_prefs.cc b/extensions/shell/browser/shell_prefs.cc index fdbc656..82185cfc 100644 --- a/extensions/shell/browser/shell_prefs.cc +++ b/extensions/shell/browser/shell_prefs.cc @@ -4,13 +4,13 @@ #include "extensions/shell/browser/shell_prefs.h" -#include "base/prefs/json_pref_store.h" -#include "base/prefs/pref_filter.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/pref_service_factory.h" #include "build/build_config.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/json_pref_store.h" +#include "components/prefs/pref_filter.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/pref_service_factory.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" @@ -53,7 +53,7 @@ scoped_ptr<PrefService> CreateLocalState(const FilePath& data_dir) { scoped_refptr<JsonPrefStore> pref_store = CreateAndLoadPrefStore(filepath); // Local state is considered "user prefs" from the factory's perspective. - base::PrefServiceFactory factory; + PrefServiceFactory factory; factory.set_user_prefs(pref_store); // Local state preferences are not syncable. @@ -68,7 +68,7 @@ scoped_ptr<PrefService> CreateUserPrefService( FilePath filepath = browser_context->GetPath().AppendASCII("user_prefs.json"); scoped_refptr<JsonPrefStore> pref_store = CreateAndLoadPrefStore(filepath); - base::PrefServiceFactory factory; + PrefServiceFactory factory; factory.set_user_prefs(pref_store); // TODO(jamescook): If we want to support prefs that are set by extensions diff --git a/extensions/shell/browser/shell_prefs_unittest.cc b/extensions/shell/browser/shell_prefs_unittest.cc index 740c0ef..3f91f17 100644 --- a/extensions/shell/browser/shell_prefs_unittest.cc +++ b/extensions/shell/browser/shell_prefs_unittest.cc @@ -6,8 +6,8 @@ #include "base/macros.h" #include "base/path_service.h" -#include "base/prefs/pref_service.h" #include "build/build_config.h" +#include "components/prefs/pref_service.h" #include "components/user_prefs/user_prefs.h" #include "content/public/test/test_browser_context.h" #include "content/public/test/test_browser_thread_bundle.h" diff --git a/ios/chrome/browser/DEPS b/ios/chrome/browser/DEPS index 5764658..73a2669 100644 --- a/ios/chrome/browser/DEPS +++ b/ios/chrome/browser/DEPS @@ -43,6 +43,7 @@ include_rules = [ "+components/password_manager/core/common", "+components/password_manager/sync/browser", "+components/pref_registry", + "+components/prefs", "+components/profile_metrics", "+components/proxy_config", "+components/rappor", diff --git a/ios/chrome/browser/application_context_impl.cc b/ios/chrome/browser/application_context_impl.cc index eee2f06..9ad4a79 100644 --- a/ios/chrome/browser/application_context_impl.cc +++ b/ios/chrome/browser/application_context_impl.cc @@ -12,8 +12,6 @@ #include "base/logging.h" #include "base/macros.h" #include "base/path_service.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/time/default_tick_clock.h" #include "base/tracked_objects.h" #include "components/component_updater/component_updater_service.h" @@ -28,6 +26,8 @@ #include "components/metrics_services_manager/metrics_services_manager.h" #include "components/net_log/chrome_net_log.h" #include "components/network_time/network_time_tracker.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/translate/core/browser/translate_download_manager.h" #include "components/update_client/configurator.h" #include "components/update_client/update_query_params.h" diff --git a/ios/chrome/browser/autocomplete/autocomplete_provider_client_impl.cc b/ios/chrome/browser/autocomplete/autocomplete_provider_client_impl.cc index b3f933e..c0e9cbf 100644 --- a/ios/chrome/browser/autocomplete/autocomplete_provider_client_impl.cc +++ b/ios/chrome/browser/autocomplete/autocomplete_provider_client_impl.cc @@ -4,12 +4,12 @@ #include "ios/chrome/browser/autocomplete/autocomplete_provider_client_impl.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "components/browser_sync/browser/profile_sync_service.h" #include "components/history/core/browser/history_service.h" #include "components/keyed_service/core/service_access_type.h" #include "components/omnibox/browser/autocomplete_classifier.h" +#include "components/prefs/pref_service.h" #include "components/sync_driver/sync_service_utils.h" #include "ios/chrome/browser/autocomplete/autocomplete_classifier_factory.h" #include "ios/chrome/browser/autocomplete/in_memory_url_index_factory.h" diff --git a/ios/chrome/browser/autocomplete/in_memory_url_index_factory.cc b/ios/chrome/browser/autocomplete/in_memory_url_index_factory.cc index b9cf90d..4c6c556 100644 --- a/ios/chrome/browser/autocomplete/in_memory_url_index_factory.cc +++ b/ios/chrome/browser/autocomplete/in_memory_url_index_factory.cc @@ -7,10 +7,10 @@ #include <utility> #include "base/memory/singleton.h" -#include "base/prefs/pref_service.h" #include "components/keyed_service/core/service_access_type.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h" #include "components/omnibox/browser/in_memory_url_index.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h" #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" #include "ios/chrome/browser/chrome_url_constants.h" diff --git a/ios/chrome/browser/autocomplete/shortcuts_backend_factory.cc b/ios/chrome/browser/autocomplete/shortcuts_backend_factory.cc index eb14bf1..53b77ea 100644 --- a/ios/chrome/browser/autocomplete/shortcuts_backend_factory.cc +++ b/ios/chrome/browser/autocomplete/shortcuts_backend_factory.cc @@ -5,11 +5,11 @@ #include "ios/chrome/browser/autocomplete/shortcuts_backend_factory.h" #include "base/memory/singleton.h" -#include "base/prefs/pref_service.h" #include "components/keyed_service/core/service_access_type.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h" #include "components/omnibox/browser/shortcuts_backend.h" #include "components/omnibox/browser/shortcuts_constants.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/history/history_service_factory.h" #include "ios/chrome/browser/pref_names.h" #include "ios/chrome/browser/search_engines/template_url_service_factory.h" diff --git a/ios/chrome/browser/bookmarks/bookmark_model_factory.cc b/ios/chrome/browser/bookmarks/bookmark_model_factory.cc index d199a67..08ae8dc 100644 --- a/ios/chrome/browser/bookmarks/bookmark_model_factory.cc +++ b/ios/chrome/browser/bookmarks/bookmark_model_factory.cc @@ -7,11 +7,11 @@ #include <utility> #include "base/memory/singleton.h" -#include "base/prefs/pref_service.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_utils.h" #include "components/bookmarks/browser/startup_task_runner_service.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h" +#include "components/prefs/pref_service.h" #include "components/undo/bookmark_undo_service.h" #include "ios/chrome/browser/bookmarks/bookmark_client_impl.h" #include "ios/chrome/browser/bookmarks/startup_task_runner_service_factory.h" diff --git a/ios/chrome/browser/bookmarks/bookmarks_utils.cc b/ios/chrome/browser/bookmarks/bookmarks_utils.cc index 9d4f378..3c1085f 100644 --- a/ios/chrome/browser/bookmarks/bookmarks_utils.cc +++ b/ios/chrome/browser/bookmarks/bookmarks_utils.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_service.h" #include "components/bookmarks/browser/bookmark_model.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h" #include "ios/chrome/browser/pref_names.h" #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h" diff --git a/ios/chrome/browser/browser_state/browser_state_info_cache.cc b/ios/chrome/browser/browser_state/browser_state_info_cache.cc index ac6869c..95130f0 100644 --- a/ios/chrome/browser/browser_state/browser_state_info_cache.cc +++ b/ios/chrome/browser/browser_state/browser_state_info_cache.cc @@ -11,9 +11,9 @@ #include "base/i18n/case_conversion.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/values.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/scoped_user_pref_update.h" #include "ios/chrome/browser/browser_state/browser_state_info_cache_observer.h" #include "ios/chrome/browser/pref_names.h" diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.cc b/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.cc index 1d3af81..a91488d 100644 --- a/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.cc +++ b/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.cc @@ -11,9 +11,6 @@ #include "base/callback.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/json_pref_store.h" -#include "base/prefs/pref_filter.h" -#include "base/prefs/pref_service.h" #include "base/sequenced_task_runner.h" #include "base/threading/sequenced_worker_pool.h" #include "base/threading/worker_pool.h" @@ -23,6 +20,9 @@ #include "components/data_reduction_proxy/core/browser/data_store_impl.h" #include "components/domain_reliability/monitor.h" #include "components/net_log/chrome_net_log.h" +#include "components/prefs/json_pref_store.h" +#include "components/prefs/pref_filter.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/application_context.h" #include "ios/chrome/browser/chrome_constants.h" #include "ios/chrome/browser/data_reduction_proxy/ios_chrome_data_reduction_proxy_io_data.h" diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.h b/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.h index 3461e59..c9449ea9 100644 --- a/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.h +++ b/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.h @@ -8,7 +8,7 @@ #include "base/callback_forward.h" #include "base/macros.h" #include "base/memory/ref_counted.h" -#include "base/prefs/pref_store.h" +#include "components/prefs/pref_store.h" #include "ios/chrome/browser/browser_state/chrome_browser_state_io_data.h" #include "ios/chrome/browser/net/net_types.h" diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc b/ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc index 8a965a8..ecf3eda 100644 --- a/ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc +++ b/ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc @@ -18,7 +18,6 @@ #include "base/logging.h" #include "base/macros.h" #include "base/path_service.h" -#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" @@ -31,6 +30,7 @@ #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h" #include "components/metrics/metrics_pref_names.h" #include "components/net_log/chrome_net_log.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/common/signin_pref_names.h" #include "components/sync_driver/pref_names.h" #include "ios/chrome/browser/application_context.h" diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_io_data.h b/ios/chrome/browser/browser_state/chrome_browser_state_io_data.h index 8218bff..837cf9b 100644 --- a/ios/chrome/browser/browser_state/chrome_browser_state_io_data.h +++ b/ios/chrome/browser/browser_state/chrome_browser_state_io_data.h @@ -15,8 +15,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/pref_member.h" #include "components/content_settings/core/common/content_settings_types.h" +#include "components/prefs/pref_member.h" #include "ios/chrome/browser/ios_chrome_io_thread.h" #include "ios/chrome/browser/net/net_types.h" #include "net/cert/ct_verifier.h" diff --git a/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.mm b/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.mm index ca91041..c5f1391 100644 --- a/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.mm +++ b/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.mm @@ -12,10 +12,10 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/mac/bind_objc_block.h" -#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/threading/worker_pool.h" #include "components/net_log/chrome_net_log.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/chrome_constants.h" #include "ios/chrome/browser/ios_chrome_io_thread.h" #include "ios/chrome/browser/net/cookie_util.h" diff --git a/ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.cc b/ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.cc index 3485939..0b43127 100644 --- a/ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.cc +++ b/ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.cc @@ -14,7 +14,6 @@ #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" -#include "base/prefs/pref_service.h" #include "components/autofill/core/browser/personal_data_manager.h" #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h" @@ -24,6 +23,7 @@ #include "components/keyed_service/core/service_access_type.h" #include "components/omnibox/browser/omnibox_pref_names.h" #include "components/password_manager/core/browser/password_store.h" +#include "components/prefs/pref_service.h" #include "components/search_engines/template_url_service.h" #include "components/sessions/core/tab_restore_service.h" #include "ios/chrome/browser/application_context.h" diff --git a/ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.h b/ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.h index aaf15d2..0d5d9a3 100644 --- a/ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.h +++ b/ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.h @@ -11,10 +11,10 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h" -#include "base/prefs/pref_member.h" #include "base/sequenced_task_runner_helpers.h" #include "base/task/cancelable_task_tracker.h" #include "base/time/time.h" +#include "components/prefs/pref_member.h" #include "components/search_engines/template_url_service.h" #include "url/gurl.h" #include "url/origin.h" diff --git a/ios/chrome/browser/content_settings/host_content_settings_map_factory.cc b/ios/chrome/browser/content_settings/host_content_settings_map_factory.cc index 980b06c..baf46ed 100644 --- a/ios/chrome/browser/content_settings/host_content_settings_map_factory.cc +++ b/ios/chrome/browser/content_settings/host_content_settings_map_factory.cc @@ -5,9 +5,9 @@ #include "ios/chrome/browser/content_settings/host_content_settings_map_factory.h" #include "base/memory/singleton.h" -#include "base/prefs/pref_service.h" #include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h" diff --git a/ios/chrome/browser/data_reduction_proxy/ios_chrome_data_reduction_proxy_io_data.cc b/ios/chrome/browser/data_reduction_proxy/ios_chrome_data_reduction_proxy_io_data.cc index 11380ce..babdeb6 100644 --- a/ios/chrome/browser/data_reduction_proxy/ios_chrome_data_reduction_proxy_io_data.cc +++ b/ios/chrome/browser/data_reduction_proxy/ios_chrome_data_reduction_proxy_io_data.cc @@ -4,11 +4,11 @@ #include "ios/chrome/browser/data_reduction_proxy/ios_chrome_data_reduction_proxy_io_data.h" -#include "base/prefs/pref_service.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config_retrieval_params.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_experiments_stats.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/data_reduction_proxy/ios_chrome_data_reduction_proxy_settings.h" #include "ios/chrome/browser/pref_names.h" #include "ios/web/public/web_client.h" diff --git a/ios/chrome/browser/data_reduction_proxy/ios_chrome_data_reduction_proxy_settings.cc b/ios/chrome/browser/data_reduction_proxy/ios_chrome_data_reduction_proxy_settings.cc index a5d348f..658baf6 100644 --- a/ios/chrome/browser/data_reduction_proxy/ios_chrome_data_reduction_proxy_settings.cc +++ b/ios/chrome/browser/data_reduction_proxy/ios_chrome_data_reduction_proxy_settings.cc @@ -11,8 +11,6 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/strings/string_util.h" #include "base/time/time.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h" @@ -22,6 +20,8 @@ #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h" #include "components/data_reduction_proxy/core/browser/data_store.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/proxy_config/proxy_config_pref_names.h" #include "components/proxy_config/proxy_prefs.h" #include "ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor.h" diff --git a/ios/chrome/browser/geolocation/omnibox_geolocation_local_state.mm b/ios/chrome/browser/geolocation/omnibox_geolocation_local_state.mm index e4daa63..c195f46 100644 --- a/ios/chrome/browser/geolocation/omnibox_geolocation_local_state.mm +++ b/ios/chrome/browser/geolocation/omnibox_geolocation_local_state.mm @@ -8,8 +8,8 @@ #include "base/logging.h" #include "base/mac/scoped_nsobject.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/application_context.h" #import "ios/chrome/browser/geolocation/location_manager.h" #import "ios/chrome/browser/pref_names.h" diff --git a/ios/chrome/browser/geolocation/omnibox_geolocation_local_state_unittest.mm b/ios/chrome/browser/geolocation/omnibox_geolocation_local_state_unittest.mm index 2a7c95a..215d9ac 100644 --- a/ios/chrome/browser/geolocation/omnibox_geolocation_local_state_unittest.mm +++ b/ios/chrome/browser/geolocation/omnibox_geolocation_local_state_unittest.mm @@ -6,7 +6,7 @@ #include "base/mac/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/testing_pref_service.h" +#include "components/prefs/testing_pref_service.h" #include "ios/chrome/browser/geolocation/location_manager.h" #include "ios/chrome/browser/geolocation/omnibox_geolocation_local_state.h" #include "ios/chrome/test/ios_chrome_scoped_testing_local_state.h" diff --git a/ios/chrome/browser/google/google_url_tracker_factory.cc b/ios/chrome/browser/google/google_url_tracker_factory.cc index a88a29b..0eef645 100644 --- a/ios/chrome/browser/google/google_url_tracker_factory.cc +++ b/ios/chrome/browser/google/google_url_tracker_factory.cc @@ -5,10 +5,10 @@ #include "ios/chrome/browser/google/google_url_tracker_factory.h" #include "base/memory/singleton.h" -#include "base/prefs/pref_service.h" #include "components/google/core/browser/google_pref_names.h" #include "components/google/core/browser/google_url_tracker.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" #include "ios/chrome/browser/google/google_url_tracker_client_impl.h" #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h" diff --git a/ios/chrome/browser/history/history_service_factory.cc b/ios/chrome/browser/history/history_service_factory.cc index cebdaf5..ea07537 100644 --- a/ios/chrome/browser/history/history_service_factory.cc +++ b/ios/chrome/browser/history/history_service_factory.cc @@ -7,13 +7,13 @@ #include <utility> #include "base/memory/singleton.h" -#include "base/prefs/pref_service.h" #include "components/history/core/browser/history_database_params.h" #include "components/history/core/browser/history_service.h" #include "components/history/core/browser/visit_delegate.h" #include "components/history/ios/browser/history_database_helper.h" #include "components/keyed_service/core/service_access_type.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h" #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" #include "ios/chrome/browser/history/history_client_impl.h" diff --git a/ios/chrome/browser/history/web_history_service_factory.cc b/ios/chrome/browser/history/web_history_service_factory.cc index 27c1ddb..322dcd5 100644 --- a/ios/chrome/browser/history/web_history_service_factory.cc +++ b/ios/chrome/browser/history/web_history_service_factory.cc @@ -5,10 +5,10 @@ #include "ios/chrome/browser/history/web_history_service_factory.h" #include "base/memory/singleton.h" -#include "base/prefs/pref_service.h" #include "components/browser_sync/browser/profile_sync_service.h" #include "components/history/core/browser/web_history_service.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" #include "components/sync_driver/sync_service.h" diff --git a/ios/chrome/browser/interstitials/ios_security_interstitial_page.mm b/ios/chrome/browser/interstitials/ios_security_interstitial_page.mm index bde510c..f441449 100644 --- a/ios/chrome/browser/interstitials/ios_security_interstitial_page.mm +++ b/ios/chrome/browser/interstitials/ios_security_interstitial_page.mm @@ -5,7 +5,7 @@ #include "ios/chrome/browser/interstitials/ios_security_interstitial_page.h" #include "base/logging.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_service.h" #include "components/security_interstitials/core/common_string_util.h" #include "components/security_interstitials/core/metrics_helper.h" #include "grit/components_resources.h" diff --git a/ios/chrome/browser/invalidation/ios_chrome_profile_invalidation_provider_factory.cc b/ios/chrome/browser/invalidation/ios_chrome_profile_invalidation_provider_factory.cc index 132d02e..d270085 100644 --- a/ios/chrome/browser/invalidation/ios_chrome_profile_invalidation_provider_factory.cc +++ b/ios/chrome/browser/invalidation/ios_chrome_profile_invalidation_provider_factory.cc @@ -9,7 +9,6 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" -#include "base/prefs/pref_registry.h" #include "components/gcm_driver/gcm_profile_service.h" #include "components/invalidation/impl/invalidator_storage.h" #include "components/invalidation/impl/profile_invalidation_provider.h" @@ -17,6 +16,7 @@ #include "components/invalidation/impl/ticl_profile_settings_provider.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_registry.h" #include "components/signin/core/browser/profile_identity_provider.h" #include "components/signin/core/browser/signin_manager.h" #include "ios/chrome/browser/services/gcm/ios_chrome_gcm_profile_service_factory.h" diff --git a/ios/chrome/browser/ios_chrome_io_thread.cc b/ios/chrome/browser/ios_chrome_io_thread.cc index 477490f..e2376f2 100644 --- a/ios/chrome/browser/ios_chrome_io_thread.cc +++ b/ios/chrome/browser/ios_chrome_io_thread.cc @@ -18,7 +18,6 @@ #include "base/logging.h" #include "base/macros.h" #include "base/metrics/field_trial.h" -#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" @@ -31,6 +30,7 @@ #include "base/trace_event/trace_event.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h" #include "components/net_log/chrome_net_log.h" +#include "components/prefs/pref_service.h" #include "components/proxy_config/pref_proxy_config_tracker.h" #include "components/variations/variations_associated_data.h" #include "components/version_info/version_info.h" diff --git a/ios/chrome/browser/ios_chrome_io_thread.h b/ios/chrome/browser/ios_chrome_io_thread.h index 878d28d..e0b481d 100644 --- a/ios/chrome/browser/ios_chrome_io_thread.h +++ b/ios/chrome/browser/ios_chrome_io_thread.h @@ -18,9 +18,9 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/pref_member.h" #include "base/strings/string_piece.h" #include "base/time/time.h" +#include "components/prefs/pref_member.h" #include "components/ssl_config/ssl_config_service_manager.h" #include "ios/web/public/web_thread_delegate.h" #include "net/base/network_change_notifier.h" diff --git a/ios/chrome/browser/ios_chrome_main_parts.mm b/ios/chrome/browser/ios_chrome_main_parts.mm index 07f054b..cab5c26 100644 --- a/ios/chrome/browser/ios_chrome_main_parts.mm +++ b/ios/chrome/browser/ios_chrome_main_parts.mm @@ -9,8 +9,6 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/prefs/json_pref_store.h" -#include "base/prefs/pref_service.h" #include "base/time/default_tick_clock.h" #include "components/content_settings/core/browser/cookie_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" @@ -21,6 +19,8 @@ #include "components/metrics/profiler/tracking_synchronizer.h" #include "components/metrics_services_manager/metrics_services_manager.h" #include "components/open_from_clipboard/clipboard_recent_content.h" +#include "components/prefs/json_pref_store.h" +#include "components/prefs/pref_service.h" #include "components/rappor/rappor_service.h" #include "components/translate/core/browser/translate_download_manager.h" #include "components/variations/service/variations_service.h" diff --git a/ios/chrome/browser/memory/memory_debugger_manager.mm b/ios/chrome/browser/memory/memory_debugger_manager.mm index e9e9acb..1c4a037 100644 --- a/ios/chrome/browser/memory/memory_debugger_manager.mm +++ b/ios/chrome/browser/memory/memory_debugger_manager.mm @@ -7,9 +7,9 @@ #include "base/ios/weak_nsobject.h" #import "base/mac/bind_objc_block.h" #include "base/mac/scoped_nsobject.h" -#include "base/prefs/pref_member.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_member.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #import "ios/chrome/browser/memory/memory_debugger.h" #import "ios/chrome/browser/pref_names.h" diff --git a/ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor.cc b/ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor.cc index 0840dea..e612332 100644 --- a/ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor.cc +++ b/ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor.cc @@ -6,7 +6,7 @@ #include <stdint.h> -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/application_context.h" // static diff --git a/ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor_unittest.cc b/ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor_unittest.cc index 279fd08..d2ac247 100644 --- a/ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor_unittest.cc +++ b/ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor_unittest.cc @@ -7,9 +7,9 @@ #include "base/base_switches.h" #include "base/command_line.h" #include "base/macros.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" #include "components/metrics/metrics_pref_names.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "ios/chrome/test/ios_chrome_scoped_testing_local_state.h" #include "ios/chrome/test/testing_application_context.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.cc b/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.cc index 49fb58a..211f259 100644 --- a/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.cc +++ b/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.cc @@ -15,8 +15,6 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/process/process_metrics.h" #include "base/rand_util.h" #include "base/strings/string16.h" @@ -35,6 +33,8 @@ #include "components/metrics/ui/screen_info_metrics_provider.h" #include "components/metrics/url_constants.h" #include "components/omnibox/browser/omnibox_metrics_provider.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/signin_status_metrics_provider.h" #include "components/variations/variations_associated_data.h" #include "components/version_info/version_info.h" diff --git a/ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.cc b/ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.cc index 76519a5..5c94899 100644 --- a/ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.cc +++ b/ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.cc @@ -6,8 +6,8 @@ #include "base/command_line.h" #include "base/logging.h" -#include "base/prefs/pref_service.h" #include "components/metrics/metrics_state_manager.h" +#include "components/prefs/pref_service.h" #include "components/rappor/rappor_service.h" #include "components/variations/service/variations_service.h" #include "ios/chrome/browser/application_context.h" diff --git a/ios/chrome/browser/metrics/ios_chrome_stability_metrics_provider_unittest.cc b/ios/chrome/browser/metrics/ios_chrome_stability_metrics_provider_unittest.cc index 767e138..2202f69 100644 --- a/ios/chrome/browser/metrics/ios_chrome_stability_metrics_provider_unittest.cc +++ b/ios/chrome/browser/metrics/ios_chrome_stability_metrics_provider_unittest.cc @@ -5,10 +5,10 @@ #include "ios/chrome/browser/metrics/ios_chrome_stability_metrics_provider.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" -#include "base/prefs/testing_pref_service.h" #include "components/metrics/proto/system_profile.pb.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/ios/chrome/browser/metrics/mobile_session_shutdown_metrics_provider_unittest.mm b/ios/chrome/browser/metrics/mobile_session_shutdown_metrics_provider_unittest.mm index 2074312..09c8d0c 100644 --- a/ios/chrome/browser/metrics/mobile_session_shutdown_metrics_provider_unittest.mm +++ b/ios/chrome/browser/metrics/mobile_session_shutdown_metrics_provider_unittest.mm @@ -7,12 +7,12 @@ #include "base/bind.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/testing_pref_service.h" #include "base/test/histogram_tester.h" #include "components/metrics/metrics_pref_names.h" #include "components/metrics/metrics_service.h" #include "components/metrics/metrics_state_manager.h" #include "components/metrics/test_metrics_service_client.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest-param-test.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ios/chrome/browser/net/http_server_properties_manager_factory.cc b/ios/chrome/browser/net/http_server_properties_manager_factory.cc index 59263a3..e0d473b 100644 --- a/ios/chrome/browser/net/http_server_properties_manager_factory.cc +++ b/ios/chrome/browser/net/http_server_properties_manager_factory.cc @@ -4,9 +4,9 @@ #include "ios/chrome/browser/net/http_server_properties_manager_factory.h" -#include "base/prefs/pref_change_registrar.h" -#include "base/prefs/pref_service.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_change_registrar.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/pref_names.h" #include "ios/web/public/web_thread.h" #include "net/http/http_server_properties_manager.h" diff --git a/ios/chrome/browser/net/ios_chrome_http_user_agent_settings.cc b/ios/chrome/browser/net/ios_chrome_http_user_agent_settings.cc index 083d297..f3093c1 100644 --- a/ios/chrome/browser/net/ios_chrome_http_user_agent_settings.cc +++ b/ios/chrome/browser/net/ios_chrome_http_user_agent_settings.cc @@ -4,7 +4,7 @@ #include "ios/chrome/browser/net/ios_chrome_http_user_agent_settings.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/pref_names.h" #include "ios/web/public/web_client.h" #include "ios/web/public/web_thread.h" diff --git a/ios/chrome/browser/net/ios_chrome_http_user_agent_settings.h b/ios/chrome/browser/net/ios_chrome_http_user_agent_settings.h index ce40131..707ea00 100644 --- a/ios/chrome/browser/net/ios_chrome_http_user_agent_settings.h +++ b/ios/chrome/browser/net/ios_chrome_http_user_agent_settings.h @@ -9,7 +9,7 @@ #include "base/compiler_specific.h" #include "base/macros.h" -#include "base/prefs/pref_member.h" +#include "components/prefs/pref_member.h" #include "net/url_request/http_user_agent_settings.h" class PrefService; diff --git a/ios/chrome/browser/net/ios_chrome_network_delegate.cc b/ios/chrome/browser/net/ios_chrome_network_delegate.cc index a375629..3adf521 100644 --- a/ios/chrome/browser/net/ios_chrome_network_delegate.cc +++ b/ios/chrome/browser/net/ios_chrome_network_delegate.cc @@ -15,10 +15,10 @@ #include "base/metrics/sparse_histogram.h" #include "base/metrics/user_metrics.h" #include "base/path_service.h" -#include "base/prefs/pref_member.h" -#include "base/prefs/pref_service.h" #include "base/profiler/scoped_tracker.h" #include "components/domain_reliability/monitor.h" +#include "components/prefs/pref_member.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/pref_names.h" #include "ios/web/public/web_thread.h" #include "net/base/load_flags.h" diff --git a/ios/chrome/browser/passwords/credential_manager.h b/ios/chrome/browser/passwords/credential_manager.h index 9a0efce..d37d63e 100644 --- a/ios/chrome/browser/passwords/credential_manager.h +++ b/ios/chrome/browser/passwords/credential_manager.h @@ -12,12 +12,12 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/pref_member.h" #include "components/password_manager/core/browser/credential_manager_password_form_manager.h" #include "components/password_manager/core/browser/credential_manager_pending_request_task.h" #include "components/password_manager/core/browser/credential_manager_pending_require_user_mediation_task.h" #include "components/password_manager/core/browser/password_manager_client.h" #include "components/password_manager/core/browser/password_store.h" +#include "components/prefs/pref_member.h" #include "ios/web/public/web_state/web_state_observer.h" @class JSCredentialManager; diff --git a/ios/chrome/browser/passwords/ios_chrome_password_manager_client.h b/ios/chrome/browser/passwords/ios_chrome_password_manager_client.h index 4af0cdb..2d7f10b 100644 --- a/ios/chrome/browser/passwords/ios_chrome_password_manager_client.h +++ b/ios/chrome/browser/passwords/ios_chrome_password_manager_client.h @@ -6,9 +6,9 @@ #define IOS_CHROME_BROWSER_PASSWORDS_IOS_CHROME_PASSWORD_MANAGER_CLIENT_H_ #include "base/macros.h" -#include "base/prefs/pref_member.h" #import "components/password_manager/core/browser/password_manager_client.h" #include "components/password_manager/sync/browser/sync_credentials_filter.h" +#include "components/prefs/pref_member.h" namespace ios { class ChromeBrowserState; diff --git a/ios/chrome/browser/prefs/browser_prefs.mm b/ios/chrome/browser/prefs/browser_prefs.mm index de59101..0ec7861 100644 --- a/ios/chrome/browser/prefs/browser_prefs.mm +++ b/ios/chrome/browser/prefs/browser_prefs.mm @@ -4,7 +4,6 @@ #include "ios/chrome/browser/prefs/browser_prefs.h" -#include "base/prefs/pref_service.h" #include "components/autofill/core/browser/autofill_manager.h" #include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.h" @@ -15,6 +14,7 @@ #include "components/omnibox/browser/zero_suggest_provider.h" #include "components/password_manager/core/browser/password_manager.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "components/proxy_config/pref_proxy_config_tracker_impl.h" #include "components/rappor/rappor_service.h" #include "components/search_engines/template_url_prepopulate_data.h" diff --git a/ios/chrome/browser/prefs/ios_chrome_pref_service_factory.cc b/ios/chrome/browser/prefs/ios_chrome_pref_service_factory.cc index 3f0b416..7fea3ee 100644 --- a/ios/chrome/browser/prefs/ios_chrome_pref_service_factory.cc +++ b/ios/chrome/browser/prefs/ios_chrome_pref_service_factory.cc @@ -8,10 +8,10 @@ #include "base/bind.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/json_pref_store.h" -#include "base/prefs/persistent_pref_store.h" -#include "base/prefs/pref_filter.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/json_pref_store.h" +#include "components/prefs/persistent_pref_store.h" +#include "components/prefs/pref_filter.h" +#include "components/prefs/pref_service.h" #include "components/proxy_config/proxy_config_pref_names.h" #include "components/search_engines/default_search_pref_migration.h" #include "components/syncable_prefs/pref_service_syncable.h" diff --git a/ios/chrome/browser/prefs/pref_observer_bridge.mm b/ios/chrome/browser/prefs/pref_observer_bridge.mm index ebd82f7..4ba85bb 100644 --- a/ios/chrome/browser/prefs/pref_observer_bridge.mm +++ b/ios/chrome/browser/prefs/pref_observer_bridge.mm @@ -5,7 +5,7 @@ #import "ios/chrome/browser/prefs/pref_observer_bridge.h" #include "base/bind.h" -#include "base/prefs/pref_change_registrar.h" +#include "components/prefs/pref_change_registrar.h" PrefObserverBridge::PrefObserverBridge(id<PrefObserverDelegate> delegate) : delegate_(delegate) { diff --git a/ios/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/ios/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc index c34f9eb..d3c8be8 100644 --- a/ios/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/ios/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc @@ -15,7 +15,6 @@ #include "base/macros.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" @@ -23,6 +22,7 @@ #include "base/time/time.h" #include "base/values.h" #include "components/google/core/browser/google_util.h" +#include "components/prefs/pref_service.h" #include "components/security_interstitials/core/controller_client.h" #include "ios/chrome/browser/application_context.h" #include "ios/chrome/browser/chrome_url_constants.h" diff --git a/ios/chrome/browser/safe_browsing/safe_browsing_service.cc b/ios/chrome/browser/safe_browsing/safe_browsing_service.cc index 073d70b..5861e12 100644 --- a/ios/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/ios/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -14,12 +14,12 @@ #include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "base/path_service.h" -#include "base/prefs/pref_change_registrar.h" -#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" +#include "components/prefs/pref_change_registrar.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/application_context.h" #include "ios/chrome/browser/chrome_paths.h" #include "ios/chrome/browser/chrome_switches.h" diff --git a/ios/chrome/browser/safe_browsing/ui_manager.cc b/ios/chrome/browser/safe_browsing/ui_manager.cc index 115d4ce..f685735 100644 --- a/ios/chrome/browser/safe_browsing/ui_manager.cc +++ b/ios/chrome/browser/safe_browsing/ui_manager.cc @@ -10,11 +10,11 @@ #include "base/debug/leak_tracker.h" #include "base/macros.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/pref_names.h" #include "ios/chrome/browser/safe_browsing/metadata.pb.h" #include "ios/chrome/browser/safe_browsing/ping_manager.h" diff --git a/ios/chrome/browser/search_engines/search_engines_util.cc b/ios/chrome/browser/search_engines/search_engines_util.cc index 7d28154..75c3537 100644 --- a/ios/chrome/browser/search_engines/search_engines_util.cc +++ b/ios/chrome/browser/search_engines/search_engines_util.cc @@ -7,7 +7,7 @@ #include <stddef.h> #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_service.h" #include "components/search_engines/search_engines_pref_names.h" #include "components/search_engines/template_url_prepopulate_data.h" #include "components/search_engines/template_url_service.h" diff --git a/ios/chrome/browser/signin/browser_state_data_remover.mm b/ios/chrome/browser/signin/browser_state_data_remover.mm index ffd3471..c9680f7 100644 --- a/ios/chrome/browser/signin/browser_state_data_remover.mm +++ b/ios/chrome/browser/signin/browser_state_data_remover.mm @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/common/signin_pref_names.h" #include "ios/chrome/browser/bookmarks/bookmarks_utils.h" #import "ios/chrome/browser/ui/commands/UIKit+ChromeExecuteCommand.h" diff --git a/ios/chrome/browser/signin/signin_client_impl.cc b/ios/chrome/browser/signin/signin_client_impl.cc index 5a18bba..352f83c 100644 --- a/ios/chrome/browser/signin/signin_client_impl.cc +++ b/ios/chrome/browser/signin/signin_client_impl.cc @@ -11,11 +11,11 @@ #include "base/command_line.h" #include "base/guid.h" #include "base/logging.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "components/content_settings/core/browser/cookie_settings.h" #include "components/keyed_service/core/service_access_type.h" #include "components/metrics/metrics_service.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_cookie_changed_subscription.h" #include "components/signin/core/browser/signin_header_helper.h" diff --git a/ios/chrome/browser/signin/signin_manager_factory.cc b/ios/chrome/browser/signin/signin_manager_factory.cc index c38756e..0449721 100644 --- a/ios/chrome/browser/signin/signin_manager_factory.cc +++ b/ios/chrome/browser/signin/signin_manager_factory.cc @@ -7,10 +7,10 @@ #include <utility> #include "base/memory/singleton.h" -#include "base/prefs/pref_registry_simple.h" #include "base/time/time.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_registry_simple.h" #include "components/signin/core/browser/signin_manager.h" #include "components/signin/core/common/signin_pref_names.h" #include "ios/chrome/browser/application_context.h" diff --git a/ios/chrome/browser/ssl/ios_ssl_blocking_page.cc b/ios/chrome/browser/ssl/ios_ssl_blocking_page.cc index 304af8d..9c412ca 100644 --- a/ios/chrome/browser/ssl/ios_ssl_blocking_page.cc +++ b/ios/chrome/browser/ssl/ios_ssl_blocking_page.cc @@ -7,9 +7,9 @@ #include <utility> #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" +#include "components/prefs/pref_service.h" #include "components/security_interstitials/core/metrics_helper.h" #include "components/security_interstitials/core/ssl_error_ui.h" #include "ios/chrome/browser/interstitials/ios_chrome_controller_client.h" diff --git a/ios/chrome/browser/sync/sync_setup_service.cc b/ios/chrome/browser/sync/sync_setup_service.cc index 083e005..42f94c7 100644 --- a/ios/chrome/browser/sync/sync_setup_service.cc +++ b/ios/chrome/browser/sync/sync_setup_service.cc @@ -8,7 +8,7 @@ #include "base/macros.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_service.h" #include "components/sync_driver/sync_prefs.h" #include "components/sync_driver/sync_service.h" #include "google_apis/gaia/google_service_auth_error.h" diff --git a/ios/chrome/browser/translate/chrome_ios_translate_client.mm b/ios/chrome/browser/translate/chrome_ios_translate_client.mm index 19fe8c0..4a43fce 100644 --- a/ios/chrome/browser/translate/chrome_ios_translate_client.mm +++ b/ios/chrome/browser/translate/chrome_ios_translate_client.mm @@ -8,8 +8,8 @@ #include <vector> #include "base/logging.h" -#include "base/prefs/pref_service.h" #include "components/infobars/core/infobar.h" +#include "components/prefs/pref_service.h" #include "components/translate/core/browser/page_translated_details.h" #include "components/translate/core/browser/translate_accept_languages.h" #include "components/translate/core/browser/translate_infobar_delegate.h" diff --git a/ios/chrome/browser/translate/translate_accept_languages_factory.cc b/ios/chrome/browser/translate/translate_accept_languages_factory.cc index ef1a7ca..b9e0c5a 100644 --- a/ios/chrome/browser/translate/translate_accept_languages_factory.cc +++ b/ios/chrome/browser/translate/translate_accept_languages_factory.cc @@ -5,9 +5,9 @@ #include "ios/chrome/browser/translate/translate_accept_languages_factory.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "components/keyed_service/core/keyed_service.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h" +#include "components/prefs/pref_service.h" #include "components/translate/core/browser/translate_accept_languages.h" #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" #include "ios/chrome/browser/pref_names.h" diff --git a/ios/chrome/browser/ui/autofill/autofill_client_ios.mm b/ios/chrome/browser/ui/autofill/autofill_client_ios.mm index f54fb29..eda7362 100644 --- a/ios/chrome/browser/ui/autofill/autofill_client_ios.mm +++ b/ios/chrome/browser/ui/autofill/autofill_client_ios.mm @@ -7,7 +7,6 @@ #include <utility> #include "base/bind.h" -#include "base/prefs/pref_service.h" #include "components/autofill/core/browser/autofill_save_card_infobar_delegate_mobile.h" #include "components/autofill/core/browser/autofill_save_card_infobar_mobile.h" #include "components/autofill/core/browser/ui/card_unmask_prompt_view.h" @@ -17,6 +16,7 @@ #include "components/infobars/core/infobar_manager.h" #include "components/keyed_service/core/service_access_type.h" #include "components/password_manager/core/browser/password_generation_manager.h" +#include "components/prefs/pref_service.h" #include "google_apis/gaia/identity_provider.h" #include "ios/chrome/browser/autofill/personal_data_manager_factory.h" #include "ios/chrome/browser/web_data_service_factory.h" diff --git a/ios/chrome/browser/ui/webui/flags_ui.cc b/ios/chrome/browser/ui/webui/flags_ui.cc index e7ab94f..148de05 100644 --- a/ios/chrome/browser/ui/webui/flags_ui.cc +++ b/ios/chrome/browser/ui/webui/flags_ui.cc @@ -11,13 +11,13 @@ #include "base/bind_helpers.h" #include "base/macros.h" #include "base/memory/ref_counted_memory.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "components/flags_ui/flags_ui_constants.h" #include "components/flags_ui/flags_ui_pref_names.h" #include "components/flags_ui/pref_service_flags_storage.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/version_info/version_info.h" #include "grit/components_chromium_strings.h" #include "grit/components_google_chrome_strings.h" diff --git a/ios/chrome/browser/ui/webui/history/browsing_history_handler.cc b/ios/chrome/browser/ui/webui/history/browsing_history_handler.cc index ac90058..1b415f9 100644 --- a/ios/chrome/browser/ui/webui/history/browsing_history_handler.cc +++ b/ios/chrome/browser/ui/webui/history/browsing_history_handler.cc @@ -13,7 +13,6 @@ #include "base/i18n/rtl.h" #include "base/i18n/time_formatting.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" @@ -27,6 +26,7 @@ #include "components/history/core/browser/top_sites.h" #include "components/history/core/browser/web_history_service.h" #include "components/keyed_service/core/service_access_type.h" +#include "components/prefs/pref_service.h" #include "components/sync_driver/device_info.h" #include "components/sync_driver/device_info_tracker.h" #include "components/url_formatter/url_formatter.h" diff --git a/ios/chrome/test/DEPS b/ios/chrome/test/DEPS index 335ddd6..b9e8796 100644 --- a/ios/chrome/test/DEPS +++ b/ios/chrome/test/DEPS @@ -1,5 +1,6 @@ include_rules = [ "+components/network_time", + "+components/prefs", "+ios/chrome/browser", "+ios/public/provider/chrome", "+ios/public/test", diff --git a/ios/chrome/test/ios_chrome_scoped_testing_local_state.h b/ios/chrome/test/ios_chrome_scoped_testing_local_state.h index 498cb92..77fe316 100644 --- a/ios/chrome/test/ios_chrome_scoped_testing_local_state.h +++ b/ios/chrome/test/ios_chrome_scoped_testing_local_state.h @@ -6,7 +6,7 @@ #define IOS_CHROME_TEST_IOS_CHROME_SCOPED_TESTING_LOCAL_STATE_H_ #include "base/macros.h" -#include "base/prefs/testing_pref_service.h" +#include "components/prefs/testing_pref_service.h" // Helper class to temporarily set up a |local_state| in the global // TestingApplicationContext. diff --git a/ios/crnet/DEPS b/ios/crnet/DEPS index 928073c..6ac78a1 100644 --- a/ios/crnet/DEPS +++ b/ios/crnet/DEPS @@ -1,4 +1,5 @@ include_rules = [ + "+components/prefs", "+components/webp_transcode", "+crypto/nss_util.h", "+ios/crnet", diff --git a/ios/crnet/crnet_environment.mm b/ios/crnet/crnet_environment.mm index 939836a..da98875 100644 --- a/ios/crnet/crnet_environment.mm +++ b/ios/crnet/crnet_environment.mm @@ -21,9 +21,9 @@ #include "base/macros.h" #include "base/metrics/statistics_recorder.h" #include "base/path_service.h" -#include "base/prefs/json_pref_store.h" -#include "base/prefs/pref_filter.h" #include "base/threading/worker_pool.h" +#include "components/prefs/json_pref_store.h" +#include "components/prefs/pref_filter.h" #import "components/webp_transcode/webp_network_client_factory.h" #include "crypto/nss_util.h" #include "ios/crnet/sdch_owner_pref_storage.h" diff --git a/ios/crnet/sdch_owner_pref_storage.cc b/ios/crnet/sdch_owner_pref_storage.cc index 8230ed0..3af81f5 100644 --- a/ios/crnet/sdch_owner_pref_storage.cc +++ b/ios/crnet/sdch_owner_pref_storage.cc @@ -4,8 +4,8 @@ #include "ios/crnet/sdch_owner_pref_storage.h" -#include "base/prefs/persistent_pref_store.h" #include "base/values.h" +#include "components/prefs/persistent_pref_store.h" namespace { diff --git a/ios/crnet/sdch_owner_pref_storage.h b/ios/crnet/sdch_owner_pref_storage.h index 16308cc..fbb177e 100644 --- a/ios/crnet/sdch_owner_pref_storage.h +++ b/ios/crnet/sdch_owner_pref_storage.h @@ -6,7 +6,7 @@ #define IOS_CRNET_SDCH_OWNER_PREF_STORAGE_H_ #include "base/macros.h" -#include "base/prefs/pref_store.h" +#include "components/prefs/pref_store.h" #include "net/sdch/sdch_owner.h" class PersistentPrefStore; diff --git a/ios/web/DEPS b/ios/web/DEPS index 658bb67..8ed91b4 100644 --- a/ios/web/DEPS +++ b/ios/web/DEPS @@ -1,4 +1,5 @@ include_rules = [ + "+components/prefs", "+components/url_formatter", "+crypto", "+ios/public/provider/web", diff --git a/ios/web/web_state/ui/crw_web_controller.mm b/ios/web/web_state/ui/crw_web_controller.mm index 4561448..8a2cccc 100644 --- a/ios/web/web_state/ui/crw_web_controller.mm +++ b/ios/web/web_state/ui/crw_web_controller.mm @@ -25,12 +25,12 @@ #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" #include "base/metrics/user_metrics_action.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "base/values.h" +#include "components/prefs/pref_service.h" #include "components/url_formatter/url_formatter.h" #import "ios/net/nsurlrequest_util.h" #include "ios/public/provider/web/web_ui_ios.h" @@ -2,6 +2,7 @@ include_rules = [ "+components/mus/common/types.h", "+components/mus/common/util.h", "+components/mus/public", + "+components/prefs", "+mojo/shell", "+mojo/common", "+mojo/converters", diff --git a/mash/wallpaper/wallpaper.cc b/mash/wallpaper/wallpaper.cc index 311c4c7..6739d10 100644 --- a/mash/wallpaper/wallpaper.cc +++ b/mash/wallpaper/wallpaper.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "base/macros.h" -#include "base/prefs/pref_registry_simple.h" #include "components/filesystem/public/cpp/prefs/pref_service_factory.h" #include "components/mus/public/cpp/property_type_converters.h" +#include "components/prefs/pref_registry_simple.h" #include "mash/wm/public/interfaces/container.mojom.h" #include "mojo/public/c/system/main.h" #include "mojo/services/tracing/public/cpp/tracing_impl.h" diff --git a/third_party/libaddressinput/chromium/DEPS b/third_party/libaddressinput/chromium/DEPS index 4f5c7cf..b55c0fa 100644 --- a/third_party/libaddressinput/chromium/DEPS +++ b/third_party/libaddressinput/chromium/DEPS @@ -1,7 +1,8 @@ include_rules = [ '+base', + "+components/prefs", '+net', '+testing', '+third_party/icu', '+url', -]
\ No newline at end of file +] diff --git a/third_party/libaddressinput/chromium/chrome_storage_impl.cc b/third_party/libaddressinput/chromium/chrome_storage_impl.cc index d85a2fd..918d3f2 100644 --- a/third_party/libaddressinput/chromium/chrome_storage_impl.cc +++ b/third_party/libaddressinput/chromium/chrome_storage_impl.cc @@ -7,8 +7,8 @@ #include <utility> #include "base/memory/scoped_ptr.h" -#include "base/prefs/writeable_pref_store.h" #include "base/values.h" +#include "components/prefs/writeable_pref_store.h" #include "third_party/libaddressinput/chromium/fallback_data_store.h" namespace autofill { diff --git a/third_party/libaddressinput/chromium/chrome_storage_impl.h b/third_party/libaddressinput/chromium/chrome_storage_impl.h index c2eac2a..6a08adc 100644 --- a/third_party/libaddressinput/chromium/chrome_storage_impl.h +++ b/third_party/libaddressinput/chromium/chrome_storage_impl.h @@ -10,8 +10,8 @@ #include "base/macros.h" #include "base/memory/scoped_vector.h" -#include "base/prefs/pref_store.h" #include "base/scoped_observer.h" +#include "components/prefs/pref_store.h" #include "third_party/libaddressinput/src/cpp/include/libaddressinput/storage.h" class WriteablePrefStore; diff --git a/third_party/libaddressinput/chromium/chrome_storage_impl_unittest.cc b/third_party/libaddressinput/chromium/chrome_storage_impl_unittest.cc index 277bfb9..629b8ff 100644 --- a/third_party/libaddressinput/chromium/chrome_storage_impl_unittest.cc +++ b/third_party/libaddressinput/chromium/chrome_storage_impl_unittest.cc @@ -6,7 +6,7 @@ #include <string> -#include "base/prefs/value_map_pref_store.h" +#include "components/prefs/value_map_pref_store.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/libaddressinput/chromium/storage_test_runner.h" #include "third_party/libaddressinput/src/cpp/include/libaddressinput/callback.h" |