[Sync] Switch bots to run integ tests for autofill as USS.

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

 // Copyright (c) 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/macros.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/base/sync_prefs.h"
@@ skipping 38 matching lines @@
   return data_type_status_table.GetUnreadyErrorTypes().Has(type);
 }
 
 // The current approach this test class takes is to examine the Directory and
 // check for root nodes to see if a type is currently enabled. While this works
 // for things in the directory, it does not work for USS types. USS does not
 // have any general data access mechanism, at least yet. Until that exists,
 // simply omit types that may be USS from these cases.
 ModelTypeSet UnifiedSyncServiceTypes() {
   ModelTypeSet set;
+  if (FeatureList::IsEnabled(switches::kSyncUSSAutocomplete)) {
+    set.Put(syncer::AUTOFILL);
+  }
   if (FeatureList::IsEnabled(switches::kSyncUSSDeviceInfo)) {
     set.Put(syncer::DEVICE_INFO);
   }
   // PRINTERS was the first USS type, and should precede all other USS types.
   // All new types should be USS. This logic is fragile to reordering ModelType.
   for (int typeInt = syncer::PRINTERS; typeInt < syncer::FIRST_PROXY_TYPE;
        typeInt++) {
     set.Put(static_cast<ModelType>(typeInt));
   }
   return set;
@@ skipping 139 matching lines @@
 
   // Lastly make sure that all the multi grouped times are all gone, since we
   // did not check these after disabling inside the above loop.
   for (ModelTypeSet::Iterator mgi = multi_grouped_types_.First(); mgi.Good();
        mgi.Inc()) {
     VerifyExistence(user_share_, false, mgi.Get());
   }
 }
 
 }  // namespace