Disable SyncTriggerFullKeystoreMigration

In order to perform more careful rollout this CL disables
SyncTriggerFullKeystoreMigration, that was enabled by default.

Bug: 1094326
Change-Id: I981a4ae364d8f2b807e251e679bc781f9e990c4b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2359084Reviewed-by: Marc Treib <treib@chromium.org>
Commit-Queue: Maksim Moskvitin <mmoskvitin@google.com>
Cr-Commit-Position: refs/heads/master@{#798812}

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

@@ -202,6 +202,20 @@ class SingleClientNigoriSyncTestWithNotAwaitQuiescence
   DISALLOW_COPY_AND_ASSIGN(SingleClientNigoriSyncTestWithNotAwaitQuiescence);
 };
 
+class SingleClientNigoriSyncTestWithFullKeystoreMigration
+    : public SingleClientNigoriSyncTest {
+ public:
+  SingleClientNigoriSyncTestWithFullKeystoreMigration() {
+    override_features_.InitAndEnableFeature(
+        switches::kSyncTriggerFullKeystoreMigration);
+  }
+
+  ~SingleClientNigoriSyncTestWithFullKeystoreMigration() override = default;
+
+ private:
+  base::test::ScopedFeatureList override_features_;
+};
+
 IN_PROC_BROWSER_TEST_F(SingleClientNigoriSyncTest,
                        ShouldCommitKeystoreNigoriWhenReceivedDefault) {
   // SetupSync() should make FakeServer send default NigoriSpecifics.
@@ -321,7 +335,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientNigoriSyncTest, ShouldRotateKeystoreKey) {
 }
 
 // Performs initial sync with backward compatible keystore Nigori.
-IN_PROC_BROWSER_TEST_F(SingleClientNigoriSyncTest,
+IN_PROC_BROWSER_TEST_F(SingleClientNigoriSyncTestWithFullKeystoreMigration,
                        PRE_ShouldCompleteKeystoreMigrationAfterRestart) {
   const std::vector<std::vector<uint8_t>>& keystore_keys =
       GetFakeServer()->GetKeystoreKeys();
@@ -344,7 +358,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientNigoriSyncTest,
 
 // After browser restart the client should commit full keystore Nigori (e.g. it
 // should use keystore key as encryption key).
-IN_PROC_BROWSER_TEST_F(SingleClientNigoriSyncTest,
+IN_PROC_BROWSER_TEST_F(SingleClientNigoriSyncTestWithFullKeystoreMigration,
                        ShouldCompleteKeystoreMigrationAfterRestart) {
   ASSERT_TRUE(SetupClients());
   const std::string expected_key_bag_key_name =

components/sync/engine/sync_engine_switches.cc

@@ -25,6 +25,6 @@ const base::Feature kSyncSupportTrustedVaultPassphraseRecovery{
     base::FEATURE_DISABLED_BY_DEFAULT};
 
 const base::Feature kSyncTriggerFullKeystoreMigration{
-    "SyncTriggerFullKeystoreMigration", base::FEATURE_ENABLED_BY_DEFAULT};
+    "SyncTriggerFullKeystoreMigration", base::FEATURE_DISABLED_BY_DEFAULT};
 
 }  // namespace switches

components/sync/nigori/nigori_sync_bridge_impl_unittest.cc

@@ -1727,6 +1727,9 @@ TEST_F(NigoriSyncBridgeImplTest,
 // Tests that upon startup bridge migrates the Nigori from backward compatible
 // keystore mode to full keystore mode.
 TEST(NigoriSyncBridgeImplPersistenceTest, ShouldCompleteKeystoreMigration) {
+  base::test::ScopedFeatureList override_features;
+  override_features.InitAndEnableFeature(
+      switches::kSyncTriggerFullKeystoreMigration);
   // Emulate storing on disc.
   auto storage1 = std::make_unique<testing::NiceMock<MockNigoriStorage>>();
   sync_pb::NigoriLocalData nigori_local_data;