[sync] skeleton implementation of AutocompleteSyncBridge

components/browser_sync/profile_sync_components_factory_impl.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 "components/browser_sync/profile_sync_components_factory_impl.h"
 
 #include <utility>
 
 #include "base/debug/dump_without_crashing.h"
 #include "base/feature_list.h"
@@ skipping 135 matching lines @@
         base::MakeUnique<ModelTypeController>(
             syncer::DEVICE_INFO, base::Bind(&base::debug::DumpWithoutCrashing),
             sync_client_, base::ThreadTaskRunnerHandle::Get()));
   } else {
     sync_service->RegisterDataTypeController(
         base::MakeUnique<DeviceInfoDataTypeController>(
             error_callback, sync_client_,
             sync_service->GetLocalDeviceInfoProvider()));
   }
 
+  // Autocomplete sync is enabled by default.  Register unless explicitly
+  // disabled.
+  if (!disabled_types.Has(syncer::AUTOFILL)) {
+    if (base::FeatureList::IsEnabled(switches::kSyncUSSAutocomplete)) {
+      sync_service->RegisterDataTypeController(
+          base::MakeUnique<ModelTypeController>(
+              syncer::AUTOFILL, base::Bind(&base::debug::DumpWithoutCrashing),
+              sync_client_, db_thread_));
+    } else {
+      sync_service->RegisterDataTypeController(
+          base::MakeUnique<AutofillDataTypeController>(
+              db_thread_, error_callback, sync_client_, web_data_service_));
+    }
+  }
+
   // Autofill sync is enabled by default.  Register unless explicitly
   // disabled.
-  if (!disabled_types.Has(syncer::AUTOFILL)) {
-    sync_service->RegisterDataTypeController(
-        base::MakeUnique<AutofillDataTypeController>(
-            db_thread_, error_callback, sync_client_, web_data_service_));
-  }
-
-  // Autofill profile sync is enabled by default.  Register unless explicitly
-  // disabled.
   if (!disabled_types.Has(syncer::AUTOFILL_PROFILE)) {
     sync_service->RegisterDataTypeController(
         base::MakeUnique<AutofillProfileDataTypeController>(
             db_thread_, error_callback, sync_client_, web_data_service_));
   }
 
   // Wallet data sync is enabled by default, but behind a syncer experiment
   // enforced by the datatype controller. Register unless explicitly disabled.
   bool wallet_disabled = disabled_types.Has(syncer::AUTOFILL_WALLET_DATA);
   if (!wallet_disabled) {
@@ skipping 245 matching lines @@
 
 // static
 void ProfileSyncComponentsFactoryImpl::OverridePrefsForUssTest(bool use_uss) {
   override_prefs_controller_to_uss_for_test_ = use_uss;
 }
 
 bool ProfileSyncComponentsFactoryImpl::
     override_prefs_controller_to_uss_for_test_ = false;
 
 }  // namespace browser_sync