chrome/browser/sync/test/integration/single_client_password_manager_setting_migrator_service_sync_test.cc - Issue 1658793002: Update chrome for new prefs location.

Side by Side Diff: chrome/browser/sync/test/integration/single_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

« no previous file with comments | « chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc ('k') | chrome/browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 "base/prefs/pref_service.h"

8 #include "chrome/browser/prefs/pref_service_syncable_util.h"	7 #include "chrome/browser/prefs/pref_service_syncable_util.h"

9 #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"

10 #include "chrome/browser/sync/test/integration/preferences_helper.h"	9 #include "chrome/browser/sync/test/integration/preferences_helper.h"

11 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"	10 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"

12 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"	11 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"

13 #include "chrome/browser/sync/test/integration/sync_test.h"	12 #include "chrome/browser/sync/test/integration/sync_test.h"

14 #include "chrome/common/pref_names.h"	13 #include "chrome/common/pref_names.h"

15 #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/prefs/pref_service.h"

16 #include "components/syncable_prefs/pref_service_syncable.h"	16 #include "components/syncable_prefs/pref_service_syncable.h"

17 #include "components/syncable_prefs/pref_service_syncable_observer.h"	17 #include "components/syncable_prefs/pref_service_syncable_observer.h"

18 #include "content/public/browser/notification_details.h"	18 #include "content/public/browser/notification_details.h"

19 #include "content/public/browser/notification_service.h"	19 #include "content/public/browser/notification_service.h"

20 #include "content/public/browser/notification_source.h"	20 #include "content/public/browser/notification_source.h"

21 #include "content/public/test/test_browser_thread_bundle.h"	21 #include "content/public/test/test_browser_thread_bundle.h"

22 #include "sync/internal_api/public/base/model_type.h"	22 #include "sync/internal_api/public/base/model_type.h"

23 #include "sync/protocol/preference_specifics.pb.h"	23 #include "sync/protocol/preference_specifics.pb.h"

24 #include "sync/protocol/priority_preference_specifics.pb.h"	24 #include "sync/protocol/priority_preference_specifics.pb.h"

25 #include "sync/protocol/sync.pb.h"	25 #include "sync/protocol/sync.pb.h"

(...skipping 267 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
293 true /* kPasswordManagerSavingEnabled */);	293 true /* kPasswordManagerSavingEnabled */);

294 InjectNewValues(true /* kCredentialsEnableService */,	294 InjectNewValues(true /* kCredentialsEnableService */,

295 true /* kPasswordManagerSavingEnabled */);	295 true /* kPasswordManagerSavingEnabled */);

296 InitMigrationService();	296 InitMigrationService();

297 ASSERT_TRUE(SetupSync());	297 ASSERT_TRUE(SetupSync());

298 ASSERT_TRUE(sync_integration_test_util::AwaitCommitActivityCompletion(	298 ASSERT_TRUE(sync_integration_test_util::AwaitCommitActivityCompletion(

299 GetSyncService((0))));	299 GetSyncService((0))));

300 AssertPrefValues(true /* kCredentialsEnableService */,	300 AssertPrefValues(true /* kCredentialsEnableService */,

301 true /* kPasswordManagerSavingEnabled */);	301 true /* kPasswordManagerSavingEnabled */);

302 }	302 }

OLD	NEW