diff options
Diffstat (limited to 'components/invalidation/impl')
5 files changed, 6 insertions, 6 deletions
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" |