[sync] Refactor how default sync datatypes are set.

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/extensions/app_notification_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
@@ skipping 80 matching lines @@
           extensions::ExtensionSystemFactory::GetForProfile(profile)),
       web_data_service_(WebDataServiceFactory::GetForProfile(
           profile_, Profile::IMPLICIT_ACCESS)) {
 }
 
 ProfileSyncComponentsFactoryImpl::~ProfileSyncComponentsFactoryImpl() {
 }
 
 void ProfileSyncComponentsFactoryImpl::RegisterDataTypes(
     ProfileSyncService* pss) {
+  RegisterCommonDataTypes(pss);
+#if !defined(OS_ANDROID)
+  RegisterDesktopDataTypes(pss);
+#endif
+}
+
+void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
+    ProfileSyncService* 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) &&
+      !command_line_->HasSwitch(switches::kDisableSyncTypedUrls)) {
+    pss->RegisterDataTypeController(
+        new TypedUrlDataTypeController(this, profile_, pss));
+  }
+
+  // Session sync is enabled by default.  Register unless explicitly disabled.
+  if (!command_line_->HasSwitch(switches::kDisableSyncTabs)) {
+    pss->RegisterDataTypeController(
+        new SessionDataTypeController(this, profile_, pss));
+  }
+}
+
+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));
   }
 
-  // Bookmark sync is enabled by default.  Register unless explicitly
-  // disabled.
-  if (!command_line_->HasSwitch(switches::kDisableSyncBookmarks)) {
-    pss->RegisterDataTypeController(
-        new BookmarkDataTypeController(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));
   }
 
   // Password sync is enabled by default.  Register unless explicitly
   // disabled.
@@ skipping 10 matching lines @@
   }
 
 #if defined(ENABLE_THEMES)
   // Theme sync is enabled by default.  Register unless explicitly disabled.
   if (!command_line_->HasSwitch(switches::kDisableSyncThemes)) {
     pss->RegisterDataTypeController(
         new ThemeDataTypeController(this, profile_, pss));
   }
 #endif
 
-  // TypedUrl sync is enabled by default.  Register unless explicitly disabled,
-  // or if saving history is disabled.
-  if (!profile_->GetPrefs()->GetBoolean(prefs::kSavingBrowserHistoryDisabled) &&
-      !command_line_->HasSwitch(switches::kDisableSyncTypedUrls)) {
-    pss->RegisterDataTypeController(
-        new TypedUrlDataTypeController(this, profile_, pss));
-  }
-
   // Search Engine sync is enabled by default.  Register only if explicitly
   // disabled.
   if (!command_line_->HasSwitch(switches::kDisableSyncSearchEngines)) {
     pss->RegisterDataTypeController(
         new SearchEngineDataTypeController(this, profile_, pss));
   }
 
-  // Session sync is enabled by default.  Register unless explicitly disabled.
-  if (!command_line_->HasSwitch(switches::kDisableSyncTabs)) {
-    pss->RegisterDataTypeController(
-        new SessionDataTypeController(this, profile_, pss));
-  }
-
   // Extension setting sync is enabled by default.  Register unless explicitly
   // disabled.
   if (!command_line_->HasSwitch(switches::kDisableSyncExtensionSettings)) {
     pss->RegisterDataTypeController(
         new ExtensionSettingDataTypeController(
             syncer::EXTENSION_SETTINGS, this, profile_, pss));
   }
 
   // App setting sync is enabled by default.  Register unless explicitly
   // disabled.
@@ skipping 57 matching lines @@
                    GetAutofillProfileSyncableService()->AsWeakPtr();
       }
     }
     case syncer::APPS:
     case syncer::EXTENSIONS:
       return extension_system_->extension_service()->AsWeakPtr();
     case syncer::SEARCH_ENGINES:
       return TemplateURLServiceFactory::GetForProfile(profile_)->AsWeakPtr();
     case syncer::APP_SETTINGS:
     case syncer::EXTENSION_SETTINGS:
+#if defined(OS_ANDROID)
+      // Android does not sync application or extension settings.
+      NOTREACHED();
+      return base::WeakPtr<syncer::SyncableService>();

[nilesh, 2012/08/01 16:43:20]

Now that we are initializing extension system, I think we don't need this ifdef
either.

[nyquist, 2012/08/02 18:28:17]

Verified that it still builds and you can sign in to sync without this
downstream.

+#else
       return extension_system_->extension_service()->settings_frontend()->
           GetBackendForSync(type)->AsWeakPtr();
+#endif
     case syncer::APP_NOTIFICATIONS:
       return extension_system_->extension_service()->
           app_notification_manager()->AsWeakPtr();
     default:
       // The following datatypes still need to be transitioned to the
       // syncer::SyncableService API:
       // Bookmarks
       // Passwords
       // Sessions
       // Themes
@@ skipping 76 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);
 }