diff options
Diffstat (limited to 'chrome/browser/sync')
13 files changed, 16 insertions, 16 deletions
diff --git a/chrome/browser/sync/profile_sync_service_android.cc b/chrome/browser/sync/profile_sync_service_android.cc index 5889c34..cb7b4a2 100644 --- a/chrome/browser/sync/profile_sync_service_android.cc +++ b/chrome/browser/sync/profile_sync_service_android.cc @@ -15,7 +15,6 @@ #include "base/json/json_writer.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "chrome/browser/browser_process.h" @@ -26,6 +25,7 @@ #include "chrome/common/channel_info.h" #include "chrome/grit/generated_resources.h" #include "components/browser_sync/browser/profile_sync_service.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/signin_manager.h" #include "components/sync_driver/about_sync_util.h" #include "components/sync_driver/pref_names.h" diff --git a/chrome/browser/sync/profile_sync_service_startup_unittest.cc b/chrome/browser/sync/profile_sync_service_startup_unittest.cc index 0752f8e..122fb32 100644 --- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc @@ -6,12 +6,12 @@ #include "base/files/file_util.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" #include "build/build_config.h" #include "components/browser_sync/browser/profile_sync_service.h" #include "components/browser_sync/browser/profile_sync_test_util.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/account_tracker_service.h" #include "components/signin/core/browser/fake_profile_oauth2_token_service.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc index 8a38e6c..966ce9f 100644 --- a/chrome/browser/sync/sync_ui_util.cc +++ b/chrome/browser/sync/sync_ui_util.cc @@ -9,7 +9,6 @@ #include "base/i18n/number_formatting.h" #include "base/i18n/time_formatting.h" #include "base/metrics/field_trial.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" @@ -28,6 +27,7 @@ #include "chrome/grit/generated_resources.h" #include "chrome/grit/locale_settings.h" #include "components/browser_sync/browser/profile_sync_service.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/signin_error_controller.h" #include "components/signin/core/browser/signin_manager_base.h" #include "google_apis/gaia/google_service_auth_error.h" diff --git a/chrome/browser/sync/test/integration/migration_test.cc b/chrome/browser/sync/test/integration/migration_test.cc index 9c1d9e3..97b3129 100644 --- a/chrome/browser/sync/test/integration/migration_test.cc +++ b/chrome/browser/sync/test/integration/migration_test.cc @@ -5,7 +5,6 @@ #include "base/compiler_specific.h" #include "base/macros.h" #include "base/memory/scoped_vector.h" -#include "base/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/test/integration/bookmarks_helper.h" #include "chrome/browser/sync/test/integration/migration_waiter.h" @@ -15,6 +14,7 @@ #include "chrome/browser/sync/test/integration/sync_test.h" #include "chrome/common/pref_names.h" #include "components/browser_sync/browser/profile_sync_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/translate/core/browser/translate_prefs.h" using bookmarks_helper::AddURL; diff --git a/chrome/browser/sync/test/integration/password_manager_setting_migrator_helper.cc b/chrome/browser/sync/test/integration/password_manager_setting_migrator_helper.cc index 2c3f1fb..1f606e0 100644 --- a/chrome/browser/sync/test/integration/password_manager_setting_migrator_helper.cc +++ b/chrome/browser/sync/test/integration/password_manager_setting_migrator_helper.cc @@ -5,7 +5,6 @@ #include "chrome/browser/sync/test/integration/password_manager_setting_migrator_helper.h" #include "base/metrics/field_trial.h" -#include "base/prefs/pref_service.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/password_manager/password_manager_setting_migrator_service_factory.h" #include "chrome/browser/profiles/profile.h" @@ -14,6 +13,7 @@ #include "components/browser_sync/browser/profile_sync_service.h" #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/password_manager/sync/browser/password_manager_setting_migrator_service.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/sync/test/integration/preferences_helper.cc b/chrome/browser/sync/test/integration/preferences_helper.cc index 7cd12fb..5e76c09 100644 --- a/chrome/browser/sync/test/integration/preferences_helper.cc +++ b/chrome/browser/sync/test/integration/preferences_helper.cc @@ -4,15 +4,15 @@ #include "chrome/browser/sync/test/integration/preferences_helper.h" -#include "base/prefs/pref_change_registrar.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/strings/stringprintf.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/test/integration/multi_client_status_change_checker.h" #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" #include "chrome/browser/sync/test/integration/sync_test.h" +#include "components/prefs/pref_change_registrar.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" using sync_datatype_helper::test; diff --git a/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc b/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc index 5c8c856..90f7841 100644 --- a/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc +++ b/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc @@ -6,7 +6,6 @@ #include "base/files/file_util.h" #include "base/location.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/test/test_timeouts.h" @@ -20,6 +19,7 @@ #include "chrome/browser/sync/test/integration/sync_test.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/browser_sync/browser/profile_sync_service.h" +#include "components/prefs/pref_service.h" #include "components/sync_driver/sync_driver_features.h" #include "components/sync_driver/sync_driver_switches.h" #include "sync/internal_api/public/util/sync_db_util.h" diff --git a/chrome/browser/sync/test/integration/single_client_password_manager_setting_migrator_service_sync_test.cc b/chrome/browser/sync/test/integration/single_client_password_manager_setting_migrator_service_sync_test.cc index 290ce9f..833cb5d 100644 --- a/chrome/browser/sync/test/integration/single_client_password_manager_setting_migrator_service_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_password_manager_setting_migrator_service_sync_test.cc @@ -4,7 +4,6 @@ #include "base/json/json_writer.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "chrome/browser/prefs/pref_service_syncable_util.h" #include "chrome/browser/sync/test/integration/password_manager_setting_migrator_helper.h" #include "chrome/browser/sync/test/integration/preferences_helper.h" @@ -13,6 +12,7 @@ #include "chrome/browser/sync/test/integration/sync_test.h" #include "chrome/common/pref_names.h" #include "components/password_manager/core/common/password_manager_pref_names.h" +#include "components/prefs/pref_service.h" #include "components/syncable_prefs/pref_service_syncable.h" #include "components/syncable_prefs/pref_service_syncable_observer.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc b/chrome/browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc index 8b66ebb..83bc498 100644 --- a/chrome/browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc @@ -3,7 +3,6 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/supervised_user/supervised_user_constants.h" @@ -17,6 +16,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_switches.h" #include "components/browser_sync/browser/profile_sync_service.h" +#include "components/prefs/pref_service.h" class SingleClientSupervisedUserSettingsSyncTest : public SyncTest { public: diff --git a/chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc b/chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc index 4461ad6..98836ee 100644 --- a/chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc @@ -5,7 +5,6 @@ #include "base/command_line.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/sync/test/integration/autofill_helper.h" @@ -19,6 +18,7 @@ #include "components/autofill/core/browser/personal_data_manager.h" #include "components/autofill/core/common/autofill_pref_names.h" #include "components/browser_sync/browser/profile_sync_service.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/notification_service.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/test/fake_server/fake_server_entity.h" diff --git a/chrome/browser/sync/test/integration/sync_errors_test.cc b/chrome/browser/sync/test/integration/sync_errors_test.cc index fa204fc..e8ed768 100644 --- a/chrome/browser/sync/test/integration/sync_errors_test.cc +++ b/chrome/browser/sync/test/integration/sync_errors_test.cc @@ -3,8 +3,6 @@ // found in the LICENSE file. #include "base/macros.h" -#include "base/prefs/pref_member.h" -#include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "build/build_config.h" #include "chrome/browser/sync/test/integration/bookmarks_helper.h" @@ -15,6 +13,8 @@ #include "chrome/browser/sync/test/integration/sync_test.h" #include "chrome/common/pref_names.h" #include "components/browser_sync/browser/profile_sync_service.h" +#include "components/prefs/pref_member.h" +#include "components/prefs/pref_service.h" #include "google_apis/gaia/google_service_auth_error.h" #include "sync/protocol/sync_protocol_error.h" diff --git a/chrome/browser/sync/test/integration/two_client_password_manager_setting_migrator_service_sync_test.cc b/chrome/browser/sync/test/integration/two_client_password_manager_setting_migrator_service_sync_test.cc index 2ddba1d..232e112 100644 --- a/chrome/browser/sync/test/integration/two_client_password_manager_setting_migrator_service_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_password_manager_setting_migrator_service_sync_test.cc @@ -3,7 +3,6 @@ // found in the LICENSE file. #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "chrome/browser/sync/test/integration/password_manager_setting_migrator_helper.h" #include "chrome/browser/sync/test/integration/preferences_helper.h" #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" @@ -11,6 +10,7 @@ #include "chrome/browser/sync/test/integration/sync_test.h" #include "chrome/common/pref_names.h" #include "components/password_manager/core/common/password_manager_pref_names.h" +#include "components/prefs/pref_service.h" #include "components/syncable_prefs/pref_service_syncable.h" #include "content/public/test/test_browser_thread_bundle.h" diff --git a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc index cd69ae9..6c84479 100644 --- a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc @@ -6,13 +6,13 @@ #include "base/guid.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/strings/stringprintf.h" #include "chrome/browser/sync/test/integration/preferences_helper.h" #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" #include "chrome/browser/sync/test/integration/sync_test.h" #include "chrome/common/pref_names.h" +#include "components/prefs/pref_service.h" using preferences_helper::AwaitBooleanPrefMatches; using preferences_helper::AwaitIntegerPrefMatches; |