diff options
Diffstat (limited to 'components/user_prefs')
11 files changed, 18 insertions, 16 deletions
diff --git a/components/user_prefs/DEPS b/components/user_prefs/DEPS index 9ca65e3..4adeae9 100644 --- a/components/user_prefs/DEPS +++ b/components/user_prefs/DEPS @@ -3,4 +3,6 @@ include_rules = [ # platform-specific dependencies. "-content", "-ios", + + "+components/prefs", ] diff --git a/components/user_prefs/tracked/dictionary_hash_store_contents.cc b/components/user_prefs/tracked/dictionary_hash_store_contents.cc index 40494af..403437b 100644 --- a/components/user_prefs/tracked/dictionary_hash_store_contents.cc +++ b/components/user_prefs/tracked/dictionary_hash_store_contents.cc @@ -7,9 +7,9 @@ #include "base/callback.h" #include "base/logging.h" #include "base/macros.h" -#include "base/prefs/persistent_pref_store.h" #include "base/values.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/persistent_pref_store.h" namespace { diff --git a/components/user_prefs/tracked/interceptable_pref_filter.h b/components/user_prefs/tracked/interceptable_pref_filter.h index 58021df..ae39d02 100644 --- a/components/user_prefs/tracked/interceptable_pref_filter.h +++ b/components/user_prefs/tracked/interceptable_pref_filter.h @@ -7,8 +7,8 @@ #include "base/callback.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/pref_filter.h" #include "base/values.h" +#include "components/prefs/pref_filter.h" // A partial implementation of a PrefFilter whose FilterOnLoad call may be // intercepted by a FilterOnLoadInterceptor. Implementations of diff --git a/components/user_prefs/tracked/pref_hash_filter.cc b/components/user_prefs/tracked/pref_hash_filter.cc index f77aaed..6d8e628 100644 --- a/components/user_prefs/tracked/pref_hash_filter.cc +++ b/components/user_prefs/tracked/pref_hash_filter.cc @@ -11,12 +11,12 @@ #include "base/logging.h" #include "base/macros.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/pref_store.h" #include "base/strings/string_number_conversions.h" #include "base/time/time.h" #include "base/values.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/pref_store.h" #include "components/user_prefs/tracked/dictionary_hash_store_contents.h" #include "components/user_prefs/tracked/pref_hash_store.h" #include "components/user_prefs/tracked/pref_hash_store_transaction.h" diff --git a/components/user_prefs/tracked/pref_hash_filter_unittest.cc b/components/user_prefs/tracked/pref_hash_filter_unittest.cc index 9eceefc..adf2bf36 100644 --- a/components/user_prefs/tracked/pref_hash_filter_unittest.cc +++ b/components/user_prefs/tracked/pref_hash_filter_unittest.cc @@ -22,8 +22,8 @@ #include "base/metrics/histogram_base.h" #include "base/metrics/histogram_samples.h" #include "base/metrics/statistics_recorder.h" -#include "base/prefs/testing_pref_store.h" #include "base/values.h" +#include "components/prefs/testing_pref_store.h" #include "components/user_prefs/tracked/hash_store_contents.h" #include "components/user_prefs/tracked/mock_validation_delegate.h" #include "components/user_prefs/tracked/pref_hash_store.h" diff --git a/components/user_prefs/tracked/pref_service_hash_store_contents.cc b/components/user_prefs/tracked/pref_service_hash_store_contents.cc index 122fa47..8f8329e 100644 --- a/components/user_prefs/tracked/pref_service_hash_store_contents.cc +++ b/components/user_prefs/tracked/pref_service_hash_store_contents.cc @@ -4,10 +4,10 @@ #include "components/user_prefs/tracked/pref_service_hash_store_contents.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 "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/user_prefs/tracked/pref_service_hash_store_contents_unittest.cc b/components/user_prefs/tracked/pref_service_hash_store_contents_unittest.cc index 09003d9..3cfb105 100644 --- a/components/user_prefs/tracked/pref_service_hash_store_contents_unittest.cc +++ b/components/user_prefs/tracked/pref_service_hash_store_contents_unittest.cc @@ -6,9 +6,9 @@ #include <string> -#include "base/prefs/pref_service.h" -#include "base/prefs/testing_pref_service.h" #include "base/values.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" class PrefServiceHashStoreContentsTest : public testing::Test { diff --git a/components/user_prefs/tracked/segregated_pref_store.h b/components/user_prefs/tracked/segregated_pref_store.h index c1960c0..249f5f2 100644 --- a/components/user_prefs/tracked/segregated_pref_store.h +++ b/components/user_prefs/tracked/segregated_pref_store.h @@ -15,7 +15,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/prefs/persistent_pref_store.h" +#include "components/prefs/persistent_pref_store.h" // Provides a unified PersistentPrefStore implementation that splits its storage // and retrieval between two underlying PersistentPrefStore instances: a set of diff --git a/components/user_prefs/tracked/segregated_pref_store_unittest.cc b/components/user_prefs/tracked/segregated_pref_store_unittest.cc index 1986758..da8df8f 100644 --- a/components/user_prefs/tracked/segregated_pref_store_unittest.cc +++ b/components/user_prefs/tracked/segregated_pref_store_unittest.cc @@ -12,10 +12,10 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/persistent_pref_store.h" -#include "base/prefs/pref_store_observer_mock.h" -#include "base/prefs/testing_pref_store.h" #include "base/values.h" +#include "components/prefs/persistent_pref_store.h" +#include "components/prefs/pref_store_observer_mock.h" +#include "components/prefs/testing_pref_store.h" #include "components/user_prefs/tracked/segregated_pref_store.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/user_prefs/tracked/tracked_preferences_migration_unittest.cc b/components/user_prefs/tracked/tracked_preferences_migration_unittest.cc index cba3bf2..f6e380d 100644 --- a/components/user_prefs/tracked/tracked_preferences_migration_unittest.cc +++ b/components/user_prefs/tracked/tracked_preferences_migration_unittest.cc @@ -13,9 +13,9 @@ #include "base/callback.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/testing_pref_service.h" #include "base/strings/string_split.h" #include "base/values.h" +#include "components/prefs/testing_pref_service.h" #include "components/user_prefs/tracked/dictionary_hash_store_contents.h" #include "components/user_prefs/tracked/hash_store_contents.h" #include "components/user_prefs/tracked/interceptable_pref_filter.h" diff --git a/components/user_prefs/user_prefs.cc b/components/user_prefs/user_prefs.cc index 3ddff9b..493c50e 100644 --- a/components/user_prefs/user_prefs.cc +++ b/components/user_prefs/user_prefs.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/memory/singleton.h" -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_service.h" namespace user_prefs { |