Separate the syncing of extension settings and app settings into separate data

chrome/browser/sync/profile_sync_factory_impl.cc

 // Copyright (c) 2011 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 "chrome/browser/extensions/app_notification_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_settings_backend.h"
 #include "chrome/browser/prefs/pref_model_associator.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 148 matching lines @@
   // enabled.
   if (command_line_->HasSwitch(switches::kEnableSyncTabs)) {
     pss->RegisterDataTypeController(
         new SessionDataTypeController(this, profile_, pss));
   }
 
   // Extension setting sync is disabled by default.  Register only if
   // explicitly enabled.
   if (command_line_->HasSwitch(switches::kEnableSyncExtensionSettings)) {
     pss->RegisterDataTypeController(
-        new ExtensionSettingDataTypeController(this, profile_, pss));
+        new ExtensionSettingDataTypeController(
+            syncable::EXTENSION_SETTINGS, this, profile_, pss));
+    pss->RegisterDataTypeController(
+        new ExtensionSettingDataTypeController(
+            syncable::APP_SETTINGS, this, profile_, pss));
   }
 
   if (!command_line_->HasSwitch(switches::kDisableSyncAutofillProfile)) {
     pss->RegisterDataTypeController(
         new AutofillProfileDataTypeController(this, profile_));
   }
 
   // Search Engine sync is disabled by default.  Register only if explicitly
   // enabled.
   if (command_line_->HasSwitch(switches::kEnableSyncSearchEngines)) {
@@ skipping 82 matching lines @@
       new BookmarkModelAssociator(bookmark_model,
                                   user_share,
                                   error_handler);
   BookmarkChangeProcessor* change_processor =
       new BookmarkChangeProcessor(model_associator,
                                   error_handler);
   return SyncComponents(model_associator, change_processor);
 }
 
 ProfileSyncFactory::SyncComponents
-ProfileSyncFactoryImpl::CreateExtensionSettingSyncComponents(
-    ExtensionSettingsBackend* extension_settings_backend,
+ProfileSyncFactoryImpl::CreateExtensionOrAppSettingSyncComponents(
+    syncable::ModelType type,
+    SyncableService* settings_service,
     ProfileSyncService* profile_sync_service,
     UnrecoverableErrorHandler* error_handler) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  DCHECK(type == syncable::EXTENSION_SETTINGS ||
+         type == syncable::APP_SETTINGS);
   sync_api::UserShare* user_share = profile_sync_service->GetUserShare();
   GenericChangeProcessor* change_processor =
       new GenericChangeProcessor(error_handler,
-                                 extension_settings_backend->AsWeakPtr(),
+                                 settings_service->AsWeakPtr(),
                                  user_share);
   browser_sync::SyncableServiceAdapter* sync_service_adapter =
-      new browser_sync::SyncableServiceAdapter(syncable::EXTENSION_SETTINGS,
-                                               extension_settings_backend,
+      new browser_sync::SyncableServiceAdapter(type,
+                                               settings_service,
                                                change_processor);
   return SyncComponents(sync_service_adapter, change_processor);
 }
 
 ProfileSyncFactory::SyncComponents
 ProfileSyncFactoryImpl::CreateExtensionSyncComponents(
     ProfileSyncService* profile_sync_service,
     UnrecoverableErrorHandler* error_handler) {
   base::WeakPtr<SyncableService> extension_sync_service =
       profile_sync_service->profile()->GetExtensionService()->AsWeakPtr();
@@ skipping 110 matching lines @@
   GenericChangeProcessor* change_processor =
       new GenericChangeProcessor(error_handler,
                                  notif_sync_service,
                                  user_share);
   SyncableServiceAdapter* sync_service_adapter =
       new SyncableServiceAdapter(syncable::APP_NOTIFICATIONS,
                                  notif_sync_service,
                                  change_processor);
   return SyncComponents(sync_service_adapter, change_processor);
 }