Register autofill sync types on mobile

chrome/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 "base/command_line.h"
 #include "build/build_config.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/extensions/api/storage/settings_frontend.h"
 #include "chrome/browser/extensions/app_notification_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 95 matching lines @@
 void ProfileSyncComponentsFactoryImpl::RegisterDataTypes(
     ProfileSyncService* pss) {
   RegisterCommonDataTypes(pss);
 #if !defined(OS_ANDROID)
   RegisterDesktopDataTypes(pss);
 #endif
 }
 
 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)) {
     pss->RegisterDataTypeController(
         new BookmarkDataTypeController(this, profile_, pss));
   }
 
   // TypedUrl sync is enabled by default.  Register unless explicitly disabled,
   // or if saving history is disabled.
   if (!profile_->GetPrefs()->GetBoolean(prefs::kSavingBrowserHistoryDisabled) &&
@@ skipping 27 matching lines @@
 
 void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
     ProfileSyncService* pss) {
   // App sync is enabled by default.  Register unless explicitly
   // disabled.
   if (!command_line_->HasSwitch(switches::kDisableSyncApps)) {
     pss->RegisterDataTypeController(
         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)) {
     pss->RegisterDataTypeController(
         new ExtensionDataTypeController(syncer::EXTENSIONS,
                                         this, profile_, pss));
   }
 
   // Preference sync is enabled by default.  Register unless explicitly
   // disabled.
@@ skipping 26 matching lines @@
   }
 
   // App setting sync is enabled by default.  Register unless explicitly
   // disabled.
   if (!command_line_->HasSwitch(switches::kDisableSyncAppSettings)) {
     pss->RegisterDataTypeController(
         new ExtensionSettingDataTypeController(
             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)) {
     pss->RegisterDataTypeController(
         new AppNotificationDataTypeController(this, profile_, pss));
   }
 
   // Unless it is explicitly disabled, history delete directive sync is
   // enabled whenever full history sync is enabled.
   if (command_line_->HasSwitch(switches::kHistoryEnableFullHistorySync) &&
@@ skipping 161 matching lines @@
 ProfileSyncComponentsFactory::SyncComponents
     ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents(
        ProfileSyncService* profile_sync_service,
         DataTypeErrorHandler* error_handler) {
   SessionModelAssociator* model_associator =
       new SessionModelAssociator(profile_sync_service, error_handler);
   SessionChangeProcessor* change_processor =
       new SessionChangeProcessor(error_handler, model_associator);
   return SyncComponents(model_associator, change_processor);
 }