Enable kStopSyncInPausedState by default

None of the regressions from the previous rollout manifested so far, so
let's try to enable by default again. This has no effect on Canary/Dev
anyway since there's an ongoing experiment for the feature there.

Bug: 906995
Change-Id: I4c9ca67c0e993f09b4903bae108fe25f9cfb2294
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2335452
Commit-Queue: Victor Vianna <victorvianna@google.com>
Reviewed-by: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#797257}

chrome/browser/sync/test/integration/profile_sync_service_harness.cc

@@ -9,6 +9,7 @@
 #include <utility>
 
 #include "base/command_line.h"
+#include "base/feature_list.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
@@ -24,6 +25,7 @@
 #include "components/signin/public/identity_manager/identity_manager.h"
 #include "components/signin/public/identity_manager/identity_test_utils.h"
 #include "components/sync/driver/about_sync_util.h"
+#include "components/sync/driver/sync_driver_switches.h"
 #include "components/sync/engine/sync_string_conversions.h"
 #include "components/sync/engine_impl/net/url_translator.h"
 #include "components/sync/engine_impl/traffic_logger.h"
@@ -256,6 +258,10 @@ void ProfileSyncServiceHarness::EnterSyncPausedStateForPrimaryAccount() {
 void ProfileSyncServiceHarness::ExitSyncPausedStateForPrimaryAccount() {
   signin::SetRefreshTokenForPrimaryAccount(
       IdentityManagerFactory::GetForProfile(profile_));
+  if (base::FeatureList::IsEnabled(switches::kStopSyncInPausedState)) {
+    // The engine was off in the sync-paused state, so wait for it to start.
+    AwaitSyncSetupCompletion();
+  }
 }
 
 bool ProfileSyncServiceHarness::SetupSync() {

components/sync/driver/sync_driver_switches.cc

@@ -48,7 +48,7 @@ const base::Feature kSyncAllowWalletDataInTransportModeWithCustomPassphrase{
 
 // If enabled, the sync engine will be shut down in the "paused" state.
 const base::Feature kStopSyncInPausedState{"StopSyncInPausedState",
-                                           base::FEATURE_DISABLED_BY_DEFAULT};
+                                           base::FEATURE_ENABLED_BY_DEFAULT};
 
 // Controls whether to enable syncing of Wi-Fi configurations.
 const base::Feature kSyncWifiConfigurations{"SyncWifiConfigurations",