Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(848)

Side by Side Diff: chrome/browser/sync/test/integration/two_client_password_manager_setting_migrator_service_sync_test.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/macros.h" 5 #include "base/macros.h"
6 #include "base/prefs/pref_service.h"
7 #include "chrome/browser/sync/test/integration/password_manager_setting_migrator _helper.h" 6 #include "chrome/browser/sync/test/integration/password_manager_setting_migrator _helper.h"
8 #include "chrome/browser/sync/test/integration/preferences_helper.h" 7 #include "chrome/browser/sync/test/integration/preferences_helper.h"
9 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" 8 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
10 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" 9 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
11 #include "chrome/browser/sync/test/integration/sync_test.h" 10 #include "chrome/browser/sync/test/integration/sync_test.h"
12 #include "chrome/common/pref_names.h" 11 #include "chrome/common/pref_names.h"
13 #include "components/password_manager/core/common/password_manager_pref_names.h" 12 #include "components/password_manager/core/common/password_manager_pref_names.h"
13 #include "components/prefs/pref_service.h"
14 #include "components/syncable_prefs/pref_service_syncable.h" 14 #include "components/syncable_prefs/pref_service_syncable.h"
15 #include "content/public/test/test_browser_thread_bundle.h" 15 #include "content/public/test/test_browser_thread_bundle.h"
16 16
17 using password_manager_setting_migrater_helper::ExpectPrefValuesOnClient; 17 using password_manager_setting_migrater_helper::ExpectPrefValuesOnClient;
18 using preferences_helper::AwaitBooleanPrefMatches; 18 using preferences_helper::AwaitBooleanPrefMatches;
19 using preferences_helper::GetPrefs; 19 using preferences_helper::GetPrefs;
20 using password_manager::prefs::kPasswordManagerSavingEnabled; 20 using password_manager::prefs::kPasswordManagerSavingEnabled;
21 using password_manager::prefs::kCredentialsEnableService; 21 using password_manager::prefs::kCredentialsEnableService;
22 22
23 class TwoClientsPasswordManagerSettingMigratorServiceSyncTest 23 class TwoClientsPasswordManagerSettingMigratorServiceSyncTest
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 112
113 IN_PROC_BROWSER_TEST_F( 113 IN_PROC_BROWSER_TEST_F(
114 TwoClientsPasswordManagerSettingMigratorServiceSyncTest, 114 TwoClientsPasswordManagerSettingMigratorServiceSyncTest,
115 ChangeNewPrefOnNonMigratedClientOneClientsWithMigration) { 115 ChangeNewPrefOnNonMigratedClientOneClientsWithMigration) {
116 ASSERT_TRUE(SetupSync()); 116 ASSERT_TRUE(SetupSync());
117 EnsureMigrationStartsForClient(0); 117 EnsureMigrationStartsForClient(0);
118 TestPrefChangeOnClient(1, kCredentialsEnableService); 118 TestPrefChangeOnClient(1, kCredentialsEnableService);
119 ASSERT_TRUE(AwaitBooleanPrefMatches(kPasswordManagerSavingEnabled)); 119 ASSERT_TRUE(AwaitBooleanPrefMatches(kPasswordManagerSavingEnabled));
120 ExpectValueOnBothClientsForBothPreference(false); 120 ExpectValueOnBothClientsForBothPreference(false);
121 } 121 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698