diff options
Diffstat (limited to 'components/syncable_prefs')
11 files changed, 18 insertions, 17 deletions
diff --git a/components/syncable_prefs/DEPS b/components/syncable_prefs/DEPS index 2d2851d..3bfaed6 100644 --- a/components/syncable_prefs/DEPS +++ b/components/syncable_prefs/DEPS @@ -2,6 +2,7 @@ include_rules = [ "+components/policy/core/browser", "+components/policy/core/common", "+components/pref_registry", + "+components/prefs", "+sync", # syncable_prefs can be used on all platforms, including iOS. Do not allow diff --git a/components/syncable_prefs/pref_model_associator.cc b/components/syncable_prefs/pref_model_associator.cc index dc7251f..64251f1 100644 --- a/components/syncable_prefs/pref_model_associator.cc +++ b/components/syncable_prefs/pref_model_associator.cc @@ -11,10 +11,10 @@ #include "base/json/json_string_value_serializer.h" #include "base/location.h" #include "base/logging.h" -#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "components/prefs/pref_service.h" #include "components/syncable_prefs/pref_model_associator_client.h" #include "components/syncable_prefs/pref_service_syncable.h" #include "sync/api/sync_change.h" diff --git a/components/syncable_prefs/pref_model_associator_unittest.cc b/components/syncable_prefs/pref_model_associator_unittest.cc index aceba18..41e4389 100644 --- a/components/syncable_prefs/pref_model_associator_unittest.cc +++ b/components/syncable_prefs/pref_model_associator_unittest.cc @@ -5,8 +5,8 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/values.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/syncable_prefs/pref_model_associator.h" #include "components/syncable_prefs/pref_model_associator_client.h" #include "components/syncable_prefs/pref_service_mock_factory.h" diff --git a/components/syncable_prefs/pref_service_mock_factory.cc b/components/syncable_prefs/pref_service_mock_factory.cc index 8468d05..eee180b 100644 --- a/components/syncable_prefs/pref_service_mock_factory.cc +++ b/components/syncable_prefs/pref_service_mock_factory.cc @@ -4,7 +4,7 @@ #include "components/syncable_prefs/pref_service_mock_factory.h" -#include "base/prefs/testing_pref_store.h" +#include "components/prefs/testing_pref_store.h" namespace syncable_prefs { diff --git a/components/syncable_prefs/pref_service_syncable.cc b/components/syncable_prefs/pref_service_syncable.cc index 3384fb9..c656381 100644 --- a/components/syncable_prefs/pref_service_syncable.cc +++ b/components/syncable_prefs/pref_service_syncable.cc @@ -7,14 +7,14 @@ #include "base/bind.h" #include "base/callback.h" #include "base/files/file_path.h" -#include "base/prefs/default_pref_store.h" -#include "base/prefs/overlay_user_pref_store.h" -#include "base/prefs/pref_notifier_impl.h" -#include "base/prefs/pref_registry.h" -#include "base/prefs/pref_value_store.h" #include "base/strings/string_number_conversions.h" #include "base/value_conversions.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/default_pref_store.h" +#include "components/prefs/overlay_user_pref_store.h" +#include "components/prefs/pref_notifier_impl.h" +#include "components/prefs/pref_registry.h" +#include "components/prefs/pref_value_store.h" #include "components/syncable_prefs/pref_model_associator.h" #include "components/syncable_prefs/pref_service_syncable_observer.h" diff --git a/components/syncable_prefs/pref_service_syncable.h b/components/syncable_prefs/pref_service_syncable.h index be719aa..2aa7d7f 100644 --- a/components/syncable_prefs/pref_service_syncable.h +++ b/components/syncable_prefs/pref_service_syncable.h @@ -11,8 +11,8 @@ #include "base/callback_forward.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "components/syncable_prefs/pref_model_associator.h" #include "components/syncable_prefs/synced_pref_observer.h" diff --git a/components/syncable_prefs/pref_service_syncable_factory.cc b/components/syncable_prefs/pref_service_syncable_factory.cc index 381c612..88eb338 100644 --- a/components/syncable_prefs/pref_service_syncable_factory.cc +++ b/components/syncable_prefs/pref_service_syncable_factory.cc @@ -4,11 +4,11 @@ #include "components/syncable_prefs/pref_service_syncable_factory.h" -#include "base/prefs/default_pref_store.h" -#include "base/prefs/pref_notifier_impl.h" -#include "base/prefs/pref_value_store.h" #include "base/trace_event/trace_event.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/default_pref_store.h" +#include "components/prefs/pref_notifier_impl.h" +#include "components/prefs/pref_value_store.h" #include "components/syncable_prefs/pref_service_syncable.h" #if defined(ENABLE_CONFIGURATION_POLICY) diff --git a/components/syncable_prefs/pref_service_syncable_factory.h b/components/syncable_prefs/pref_service_syncable_factory.h index 184ef09..28970a7 100644 --- a/components/syncable_prefs/pref_service_syncable_factory.h +++ b/components/syncable_prefs/pref_service_syncable_factory.h @@ -6,7 +6,7 @@ #define COMPONENTS_SYNCABLE_PREFS_PREF_SERVICE_SYNCABLE_FACTORY_H_ #include "base/macros.h" -#include "base/prefs/pref_service_factory.h" +#include "components/prefs/pref_service_factory.h" namespace base { class CommandLine; diff --git a/components/syncable_prefs/pref_service_syncable_unittest.cc b/components/syncable_prefs/pref_service_syncable_unittest.cc index 6cde739..1d72a48 100644 --- a/components/syncable_prefs/pref_service_syncable_unittest.cc +++ b/components/syncable_prefs/pref_service_syncable_unittest.cc @@ -11,9 +11,9 @@ #include "base/json/json_writer.h" #include "base/macros.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/strings/utf_string_conversions.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/syncable_prefs/pref_model_associator.h" #include "components/syncable_prefs/pref_model_associator_client.h" #include "components/syncable_prefs/testing_pref_service_syncable.h" diff --git a/components/syncable_prefs/testing_pref_service_syncable.cc b/components/syncable_prefs/testing_pref_service_syncable.cc index 7c61f51..f05485a 100644 --- a/components/syncable_prefs/testing_pref_service_syncable.cc +++ b/components/syncable_prefs/testing_pref_service_syncable.cc @@ -5,9 +5,9 @@ #include "components/syncable_prefs/testing_pref_service_syncable.h" #include "base/bind.h" -#include "base/prefs/pref_notifier_impl.h" -#include "base/prefs/pref_value_store.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_notifier_impl.h" +#include "components/prefs/pref_value_store.h" #include "testing/gtest/include/gtest/gtest.h" template <> diff --git a/components/syncable_prefs/testing_pref_service_syncable.h b/components/syncable_prefs/testing_pref_service_syncable.h index e55ce55..3be14f8 100644 --- a/components/syncable_prefs/testing_pref_service_syncable.h +++ b/components/syncable_prefs/testing_pref_service_syncable.h @@ -6,7 +6,7 @@ #define COMPONENTS_SYNCABLE_PREFS_TESTING_PREF_SERVICE_SYNCABLE_H_ #include "base/macros.h" -#include "base/prefs/testing_pref_service.h" +#include "components/prefs/testing_pref_service.h" #include "components/syncable_prefs/pref_service_syncable.h" namespace user_prefs { |