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

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

Issue 2130453004: [Sync] Move //sync to //components/sync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 4 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/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_integration_test_util.h" 11 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
12 #include "chrome/browser/sync/test/integration/sync_test.h" 12 #include "chrome/browser/sync/test/integration/sync_test.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"
18 #include "components/sync/protocol/preference_specifics.pb.h"
19 #include "components/sync/protocol/priority_preference_specifics.pb.h"
20 #include "components/sync/protocol/sync.pb.h"
21 #include "components/sync/test/fake_server/unique_client_entity.h"
17 #include "components/syncable_prefs/pref_service_syncable.h" 22 #include "components/syncable_prefs/pref_service_syncable.h"
18 #include "components/syncable_prefs/pref_service_syncable_observer.h" 23 #include "components/syncable_prefs/pref_service_syncable_observer.h"
19 #include "content/public/browser/notification_details.h" 24 #include "content/public/browser/notification_details.h"
20 #include "content/public/browser/notification_service.h" 25 #include "content/public/browser/notification_service.h"
21 #include "content/public/browser/notification_source.h" 26 #include "content/public/browser/notification_source.h"
22 #include "content/public/test/test_browser_thread_bundle.h" 27 #include "content/public/test/test_browser_thread_bundle.h"
23 #include "sync/internal_api/public/base/model_type.h"
24 #include "sync/protocol/preference_specifics.pb.h"
25 #include "sync/protocol/priority_preference_specifics.pb.h"
26 #include "sync/protocol/sync.pb.h"
27 #include "sync/test/fake_server/unique_client_entity.h"
28 28
29 using password_manager_setting_migrater_helper::ExpectPrefValuesOnClient; 29 using password_manager_setting_migrater_helper::ExpectPrefValuesOnClient;
30 using preferences_helper::AwaitBooleanPrefMatches; 30 using preferences_helper::AwaitBooleanPrefMatches;
31 using preferences_helper::BooleanPrefMatches; 31 using preferences_helper::BooleanPrefMatches;
32 using preferences_helper::ChangeBooleanPref; 32 using preferences_helper::ChangeBooleanPref;
33 using preferences_helper::GetPrefs; 33 using preferences_helper::GetPrefs;
34 34
35 namespace { 35 namespace {
36 36
37 void InjectPreferenceValueToFakeServer(fake_server::FakeServer* fake_server, 37 void InjectPreferenceValueToFakeServer(fake_server::FakeServer* fake_server,
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 SetLocalPrefValues(true /* kCredentialsEnableService */, 266 SetLocalPrefValues(true /* kCredentialsEnableService */,
267 true /* kPasswordManagerSavingEnabled */); 267 true /* kPasswordManagerSavingEnabled */);
268 InjectNewValues(true /* kCredentialsEnableService */, 268 InjectNewValues(true /* kCredentialsEnableService */,
269 true /* kPasswordManagerSavingEnabled */); 269 true /* kPasswordManagerSavingEnabled */);
270 InitMigrationServiceAndSync(); 270 InitMigrationServiceAndSync();
271 ASSERT_TRUE(sync_integration_test_util::AwaitCommitActivityCompletion( 271 ASSERT_TRUE(sync_integration_test_util::AwaitCommitActivityCompletion(
272 GetSyncService((0)))); 272 GetSyncService((0))));
273 AssertPrefValues(true /* kCredentialsEnableService */, 273 AssertPrefValues(true /* kCredentialsEnableService */,
274 true /* kPasswordManagerSavingEnabled */); 274 true /* kPasswordManagerSavingEnabled */);
275 } 275 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698