[Sync] Add support for immediately enabling wallet datatype

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

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_vector.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
@@ skipping 82 matching lines @@
     DCHECK(GetSyncService((0)));
     syncer::ModelTypeSet preferred_data_types =
         GetSyncService((0))->GetPreferredDataTypes();
     preferred_data_types.RemoveAll(syncer::ProxyTypes());
 
     // Supervised user data types will be "unready" during this test, so we
     // should not request that they be migrated.
     preferred_data_types.Remove(syncer::SUPERVISED_USER_SETTINGS);
     preferred_data_types.Remove(syncer::SUPERVISED_USER_WHITELISTS);
 
+    // Autofill wallet will be unready during this test, so we should not
+    // request that it be migrated.
+    preferred_data_types.Remove(syncer::AUTOFILL_WALLET_DATA);
+
     // Make sure all clients have the same preferred data types.
     for (int i = 1; i < num_clients(); ++i) {
       const syncer::ModelTypeSet other_preferred_data_types =
           GetSyncService((i))->GetPreferredDataTypes();
       EXPECT_TRUE(preferred_data_types.Equals(other_preferred_data_types));
     }
     return preferred_data_types;
   }
 
   // Returns a MigrationList with every enabled data type in its own
@@ skipping 176 matching lines @@
 #else
 #define MAYBE_AllTypesIndividually AllTypesIndividually
 #endif
 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, MAYBE_AllTypesIndividually) {
   ASSERT_TRUE(SetupClients());
   RunSingleClientMigrationTest(GetPreferredDataTypesList(), MODIFY_BOOKMARK);
 }
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
 // http://crbug.com/403778
-#define MAYBE_AllTypesIndividuallyTriggerNotification DISABLED_AllTypesIndividuallyTriggerNotification
+#define MAYBE_AllTypesIndividuallyTriggerNotification \
+    DISABLED_AllTypesIndividuallyTriggerNotification
 #else
-#define MAYBE_AllTypesIndividuallyTriggerNotification AllTypesIndividuallyTriggerNotification
+#define MAYBE_AllTypesIndividuallyTriggerNotification \
+    AllTypesIndividuallyTriggerNotification
 #endif
 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest,
                        MAYBE_AllTypesIndividuallyTriggerNotification) {
   ASSERT_TRUE(SetupClients());
   RunSingleClientMigrationTest(GetPreferredDataTypesList(),
                                TRIGGER_NOTIFICATION);
 }
 
 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, AllTypesAtOnce) {
   ASSERT_TRUE(SetupClients());
@@ skipping 114 matching lines @@
     // Do not add optional datatypes.
   }
 
   ~MigrationReconfigureTest() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MigrationReconfigureTest);
 };
 
 }  // namespace