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/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
7 #include "chrome/browser/prefs/pref_service_syncable_util.h" | 8 #include "chrome/browser/prefs/pref_service_syncable_util.h" |
8 #include "chrome/browser/sync/test/integration/password_manager_setting_migrator
_helper.h" | 9 #include "chrome/browser/sync/test/integration/password_manager_setting_migrator
_helper.h" |
9 #include "chrome/browser/sync/test/integration/preferences_helper.h" | 10 #include "chrome/browser/sync/test/integration/preferences_helper.h" |
10 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" | 11 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" |
11 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" | 12 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" |
12 #include "chrome/browser/sync/test/integration/sync_test.h" | 13 #include "chrome/browser/sync/test/integration/sync_test.h" |
13 #include "chrome/common/pref_names.h" | 14 #include "chrome/common/pref_names.h" |
14 #include "components/password_manager/core/common/password_manager_pref_names.h" | 15 #include "components/password_manager/core/common/password_manager_pref_names.h" |
15 #include "components/syncable_prefs/pref_service_syncable.h" | 16 #include "components/syncable_prefs/pref_service_syncable.h" |
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
292 true /* kPasswordManagerSavingEnabled */); | 293 true /* kPasswordManagerSavingEnabled */); |
293 InjectNewValues(true /* kCredentialsEnableService */, | 294 InjectNewValues(true /* kCredentialsEnableService */, |
294 true /* kPasswordManagerSavingEnabled */); | 295 true /* kPasswordManagerSavingEnabled */); |
295 InitMigrationService(); | 296 InitMigrationService(); |
296 ASSERT_TRUE(SetupSync()); | 297 ASSERT_TRUE(SetupSync()); |
297 ASSERT_TRUE(sync_integration_test_util::AwaitCommitActivityCompletion( | 298 ASSERT_TRUE(sync_integration_test_util::AwaitCommitActivityCompletion( |
298 GetSyncService((0)))); | 299 GetSyncService((0)))); |
299 AssertPrefValues(true /* kCredentialsEnableService */, | 300 AssertPrefValues(true /* kCredentialsEnableService */, |
300 true /* kPasswordManagerSavingEnabled */); | 301 true /* kPasswordManagerSavingEnabled */); |
301 } | 302 } |
OLD | NEW |