Register autofill sync types on mobile

chrome/browser/sync/profile_sync_components_factory_impl.cc

Index: chrome/browser/sync/profile_sync_components_factory_impl.cc
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc
index 48207449510ab599c2173ac213821aee9461f5f3..752ebaf06a056f065b49294784e82216289daee3 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc
@@ -113,6 +113,20 @@ void ProfileSyncComponentsFactoryImpl::RegisterDataTypes(
 
 void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
     ProfileSyncService* pss) {
+  // Autofill sync is enabled by default.  Register unless explicitly
+  // disabled.
+  if (!command_line_->HasSwitch(switches::kDisableSyncAutofill)) {
+    pss->RegisterDataTypeController(
+        new AutofillDataTypeController(this, profile_, pss));
+  }
+
+  // Autofill profile sync is enabled by default.  Register unless explicitly
+  // disabled.
+  if (!command_line_->HasSwitch(switches::kDisableSyncAutofillProfile)) {
+    pss->RegisterDataTypeController(
+        new AutofillProfileDataTypeController(this, profile_, pss));
+  }
+
   // Bookmark sync is enabled by default.  Register unless explicitly
   // disabled.
   if (!command_line_->HasSwitch(switches::kDisableSyncBookmarks)) {
@@ -160,13 +174,6 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
         new ExtensionDataTypeController(syncer::APPS, this, profile_, pss));
   }
 
-  // Autofill sync is enabled by default.  Register unless explicitly
-  // disabled.
-  if (!command_line_->HasSwitch(switches::kDisableSyncAutofill)) {
-    pss->RegisterDataTypeController(
-        new AutofillDataTypeController(this, profile_, pss));
-  }
-
   // Extension sync is enabled by default.  Register unless explicitly
   // disabled.
   if (!command_line_->HasSwitch(switches::kDisableSyncExtensions)) {
@@ -213,11 +220,6 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
             syncer::APP_SETTINGS, this, profile_, pss));
   }
 
-  if (!command_line_->HasSwitch(switches::kDisableSyncAutofillProfile)) {
-    pss->RegisterDataTypeController(
-        new AutofillProfileDataTypeController(this, profile_, pss));
-  }
-
   // App notifications sync is enabled by default.  Register unless explicitly
   // disabled.
   if (!command_line_->HasSwitch(switches::kDisableSyncAppNotifications)) {