Commit 9948a689 authored by Marc Treib's avatar Marc Treib Committed by Commit Bot

Migrate extensions tests to SyncUserSettings

SyncUserSettings is a new class that encapsulates all the
user-configurable knobs for Sync. It replaces a bunch of setters
and getters directly on the SyncService.

Bug: 884159
Change-Id: Ic69d65e6f4a2f6e74f8ca0fd3954aaf78b0992fa
Reviewed-on: https://chromium-review.googlesource.com/c/1338100Reviewed-by: default avatarKaran Bhatia <karandeepb@chromium.org>
Commit-Queue: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609623}
parent 493db4b2
...@@ -426,7 +426,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, Syncing) { ...@@ -426,7 +426,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, Syncing) {
// Sync is running. // Sync is running.
browser_sync::ProfileSyncService* sync_service = browser_sync::ProfileSyncService* sync_service =
ProfileSyncServiceFactory::GetForProfile(profile); ProfileSyncServiceFactory::GetForProfile(profile);
sync_service->SetFirstSetupComplete(); sync_service->GetUserSettings()->SetFirstSetupComplete();
sync_ui_util::MessageType sync_status = sync_ui_util::MessageType sync_status =
sync_ui_util::GetStatus(profile, sync_service, *signin_manager); sync_ui_util::GetStatus(profile, sync_service, *signin_manager);
ASSERT_EQ(sync_ui_util::SYNCED, sync_status); ASSERT_EQ(sync_ui_util::SYNCED, sync_status);
......
...@@ -346,7 +346,7 @@ TEST_F(ExtensionServiceSyncTest, DisableExtensionFromSync) { ...@@ -346,7 +346,7 @@ TEST_F(ExtensionServiceSyncTest, DisableExtensionFromSync) {
// The user has enabled sync. // The user has enabled sync.
browser_sync::ProfileSyncService* sync_service = browser_sync::ProfileSyncService* sync_service =
ProfileSyncServiceFactory::GetForProfile(profile()); ProfileSyncServiceFactory::GetForProfile(profile());
sync_service->SetFirstSetupComplete(); sync_service->GetUserSettings()->SetFirstSetupComplete();
service()->Init(); service()->Init();
ASSERT_TRUE(service()->is_ready()); ASSERT_TRUE(service()->is_ready());
...@@ -382,7 +382,7 @@ TEST_F(ExtensionServiceSyncTest, ReenableDisabledExtensionFromSync) { ...@@ -382,7 +382,7 @@ TEST_F(ExtensionServiceSyncTest, ReenableDisabledExtensionFromSync) {
// Enable sync. // Enable sync.
browser_sync::ProfileSyncService* sync_service = browser_sync::ProfileSyncService* sync_service =
ProfileSyncServiceFactory::GetForProfile(profile()); ProfileSyncServiceFactory::GetForProfile(profile());
sync_service->SetFirstSetupComplete(); sync_service->GetUserSettings()->SetFirstSetupComplete();
service()->Init(); service()->Init();
...@@ -464,7 +464,7 @@ TEST_F(ExtensionServiceSyncTest, ...@@ -464,7 +464,7 @@ TEST_F(ExtensionServiceSyncTest,
// Enable sync. // Enable sync.
browser_sync::ProfileSyncService* sync_service = browser_sync::ProfileSyncService* sync_service =
ProfileSyncServiceFactory::GetForProfile(profile()); ProfileSyncServiceFactory::GetForProfile(profile());
sync_service->SetFirstSetupComplete(); sync_service->GetUserSettings()->SetFirstSetupComplete();
service()->Init(); service()->Init();
...@@ -530,7 +530,7 @@ TEST_F(ExtensionServiceSyncTest, IgnoreSyncChangesWhenLocalStateIsMoreRecent) { ...@@ -530,7 +530,7 @@ TEST_F(ExtensionServiceSyncTest, IgnoreSyncChangesWhenLocalStateIsMoreRecent) {
// The user has enabled sync. // The user has enabled sync.
browser_sync::ProfileSyncService* sync_service = browser_sync::ProfileSyncService* sync_service =
ProfileSyncServiceFactory::GetForProfile(profile()); ProfileSyncServiceFactory::GetForProfile(profile());
sync_service->SetFirstSetupComplete(); sync_service->GetUserSettings()->SetFirstSetupComplete();
// Make sure ExtensionSyncService is created, so it'll be notified of changes. // Make sure ExtensionSyncService is created, so it'll be notified of changes.
extension_sync_service(); extension_sync_service();
...@@ -589,7 +589,9 @@ TEST_F(ExtensionServiceSyncTest, DontSelfNotify) { ...@@ -589,7 +589,9 @@ TEST_F(ExtensionServiceSyncTest, DontSelfNotify) {
InitializeInstalledExtensionService(pref_path, source_install_dir); InitializeInstalledExtensionService(pref_path, source_install_dir);
// The user has enabled sync. // The user has enabled sync.
ProfileSyncServiceFactory::GetForProfile(profile())->SetFirstSetupComplete(); ProfileSyncServiceFactory::GetForProfile(profile())
->GetUserSettings()
->SetFirstSetupComplete();
// Make sure ExtensionSyncService is created, so it'll be notified of changes. // Make sure ExtensionSyncService is created, so it'll be notified of changes.
extension_sync_service(); extension_sync_service();
...@@ -1706,7 +1708,9 @@ TEST_F(ExtensionServiceSyncTest, DontSyncThemes) { ...@@ -1706,7 +1708,9 @@ TEST_F(ExtensionServiceSyncTest, DontSyncThemes) {
InitializeEmptyExtensionService(); InitializeEmptyExtensionService();
// The user has enabled sync. // The user has enabled sync.
ProfileSyncServiceFactory::GetForProfile(profile())->SetFirstSetupComplete(); ProfileSyncServiceFactory::GetForProfile(profile())
->GetUserSettings()
->SetFirstSetupComplete();
// Make sure ExtensionSyncService is created, so it'll be notified of changes. // Make sure ExtensionSyncService is created, so it'll be notified of changes.
extension_sync_service(); extension_sync_service();
...@@ -2629,7 +2633,7 @@ class BlacklistedExtensionSyncServiceTest : public ExtensionServiceSyncTest { ...@@ -2629,7 +2633,7 @@ class BlacklistedExtensionSyncServiceTest : public ExtensionServiceSyncTest {
// Enable sync. // Enable sync.
browser_sync::ProfileSyncService* sync_service = browser_sync::ProfileSyncService* sync_service =
ProfileSyncServiceFactory::GetForProfile(profile()); ProfileSyncServiceFactory::GetForProfile(profile());
sync_service->SetFirstSetupComplete(); sync_service->GetUserSettings()->SetFirstSetupComplete();
test_blacklist_.Attach(service()->blacklist_); test_blacklist_.Attach(service()->blacklist_);
service()->Init(); service()->Init();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment