Commit 3ea08bec authored by Maksim Moskvitin's avatar Maksim Moskvitin Committed by Commit Bot

[StopSyncInPausedState] Enable kStopSyncInPausedState by default

Bug: 938819, 906995
Change-Id: I41287062e67b4bac4b6eda3158a529b527e0c1bb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2083531
Commit-Queue: Maksim Moskvitin <mmoskvitin@google.com>
Reviewed-by: default avatarMarc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748235}
parent c6847418
...@@ -225,6 +225,8 @@ IN_PROC_BROWSER_TEST_F(SingleClientUserEventsSyncTest, ...@@ -225,6 +225,8 @@ IN_PROC_BROWSER_TEST_F(SingleClientUserEventsSyncTest,
// Clear the "Sync paused" state again. // Clear the "Sync paused" state again.
GetClient(0)->ExitSyncPausedStateForPrimaryAccount(); GetClient(0)->ExitSyncPausedStateForPrimaryAccount();
// Once the auth error is gone, wait for Sync to start up again.
GetClient(0)->AwaitSyncSetupCompletion();
ASSERT_TRUE(GetSyncService(0)->IsSyncFeatureActive()); ASSERT_TRUE(GetSyncService(0)->IsSyncFeatureActive());
// Just checking that we don't see test_event isn't very convincing yet, // Just checking that we don't see test_event isn't very convincing yet,
......
...@@ -514,7 +514,7 @@ PROFILE_MENU_CLICK_TEST(kActionableItems_SyncPaused, ...@@ -514,7 +514,7 @@ PROFILE_MENU_CLICK_TEST(kActionableItems_SyncPaused,
sync_harness()->EnterSyncPausedStateForPrimaryAccount(); sync_harness()->EnterSyncPausedStateForPrimaryAccount();
// Check that the setup was successful. // Check that the setup was successful.
ASSERT_TRUE(identity_manager()->HasPrimaryAccount()); ASSERT_TRUE(identity_manager()->HasPrimaryAccount());
ASSERT_FALSE(sync_service()->HasDisableReason( ASSERT_TRUE(sync_service()->HasDisableReason(
syncer::SyncService::DISABLE_REASON_PAUSED)); syncer::SyncService::DISABLE_REASON_PAUSED));
RunTest(); RunTest();
......
...@@ -51,7 +51,7 @@ const base::Feature kSyncAllowWalletDataInTransportModeWithCustomPassphrase{ ...@@ -51,7 +51,7 @@ const base::Feature kSyncAllowWalletDataInTransportModeWithCustomPassphrase{
// If enabled, the sync engine will be shut down in the "paused" state. // If enabled, the sync engine will be shut down in the "paused" state.
const base::Feature kStopSyncInPausedState{"StopSyncInPausedState", const base::Feature kStopSyncInPausedState{"StopSyncInPausedState",
base::FEATURE_DISABLED_BY_DEFAULT}; base::FEATURE_ENABLED_BY_DEFAULT};
// Enable USS implementation of Passwords datatype. // Enable USS implementation of Passwords datatype.
const base::Feature kSyncUSSPasswords{"SyncUSSPasswords", const base::Feature kSyncUSSPasswords{"SyncUSSPasswords",
......
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