OLD | NEW |
1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/json/json_writer.h" | 5 #include "base/json/json_writer.h" |
6 #include "base/macros.h" | 6 #include "base/macros.h" |
7 #include "chrome/browser/prefs/pref_service_syncable_util.h" | 7 #include "chrome/browser/prefs/pref_service_syncable_util.h" |
8 #include "chrome/browser/sync/test/integration/password_manager_setting_migrator
_helper.h" | 8 #include "chrome/browser/sync/test/integration/password_manager_setting_migrator
_helper.h" |
9 #include "chrome/browser/sync/test/integration/preferences_helper.h" | 9 #include "chrome/browser/sync/test/integration/preferences_helper.h" |
10 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" | 10 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" |
11 #include "chrome/browser/sync/test/integration/sync_test.h" | 11 #include "chrome/browser/sync/test/integration/sync_test.h" |
12 #include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h
" | 12 #include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h
" |
13 #include "chrome/common/pref_names.h" | 13 #include "chrome/common/pref_names.h" |
14 #include "components/password_manager/core/common/password_manager_pref_names.h" | 14 #include "components/password_manager/core/common/password_manager_pref_names.h" |
15 #include "components/password_manager/sync/browser/password_manager_setting_migr
ator_service.h" | 15 #include "components/password_manager/sync/browser/password_manager_setting_migr
ator_service.h" |
16 #include "components/prefs/pref_service.h" | 16 #include "components/prefs/pref_service.h" |
17 #include "components/sync/base/model_type.h" | 17 #include "components/sync/base/model_type.h" |
18 #include "components/sync/protocol/preference_specifics.pb.h" | 18 #include "components/sync/protocol/preference_specifics.pb.h" |
19 #include "components/sync/protocol/priority_preference_specifics.pb.h" | 19 #include "components/sync/protocol/priority_preference_specifics.pb.h" |
20 #include "components/sync/protocol/sync.pb.h" | 20 #include "components/sync/protocol/sync.pb.h" |
21 #include "components/sync/test/fake_server/unique_client_entity.h" | 21 #include "components/sync/test/fake_server/unique_client_entity.h" |
22 #include "components/syncable_prefs/pref_service_syncable.h" | 22 #include "components/sync_preferences/pref_service_syncable.h" |
23 #include "components/syncable_prefs/pref_service_syncable_observer.h" | 23 #include "components/sync_preferences/pref_service_syncable_observer.h" |
24 #include "content/public/browser/notification_details.h" | 24 #include "content/public/browser/notification_details.h" |
25 #include "content/public/browser/notification_service.h" | 25 #include "content/public/browser/notification_service.h" |
26 #include "content/public/browser/notification_source.h" | 26 #include "content/public/browser/notification_source.h" |
27 #include "content/public/test/test_browser_thread_bundle.h" | 27 #include "content/public/test/test_browser_thread_bundle.h" |
28 | 28 |
29 using password_manager_setting_migrater_helper::ExpectPrefValuesOnClient; | 29 using password_manager_setting_migrater_helper::ExpectPrefValuesOnClient; |
30 using preferences_helper::GetPrefs; | 30 using preferences_helper::GetPrefs; |
31 using password_manager::prefs::kCredentialsEnableService; | 31 using password_manager::prefs::kCredentialsEnableService; |
32 using password_manager::prefs::kPasswordManagerSavingEnabled; | 32 using password_manager::prefs::kPasswordManagerSavingEnabled; |
33 | 33 |
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
251 ASSERT_TRUE(SetupClients()); | 251 ASSERT_TRUE(SetupClients()); |
252 SetLocalPrefValues(true /* kCredentialsEnableService */, | 252 SetLocalPrefValues(true /* kCredentialsEnableService */, |
253 true /* kPasswordManagerSavingEnabled */); | 253 true /* kPasswordManagerSavingEnabled */); |
254 InjectNewValues(true /* kCredentialsEnableService */, | 254 InjectNewValues(true /* kCredentialsEnableService */, |
255 true /* kPasswordManagerSavingEnabled */); | 255 true /* kPasswordManagerSavingEnabled */); |
256 InitMigrationServiceAndSync(); | 256 InitMigrationServiceAndSync(); |
257 ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait()); | 257 ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait()); |
258 AssertPrefValues(true /* kCredentialsEnableService */, | 258 AssertPrefValues(true /* kCredentialsEnableService */, |
259 true /* kPasswordManagerSavingEnabled */); | 259 true /* kPasswordManagerSavingEnabled */); |
260 } | 260 } |
OLD | NEW |