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

chrome/browser/sync/profile_sync_factory_impl.h

Index: chrome/browser/sync/profile_sync_factory_impl.h
diff --git a/chrome/browser/sync/profile_sync_factory_impl.h b/chrome/browser/sync/profile_sync_factory_impl.h
index f7e7494c93bd55ea6de670a876134a387bdfff17..8d962f1f36cd7ed53944002a63f80f561dbcde0d 100644
--- a/chrome/browser/sync/profile_sync_factory_impl.h
+++ b/chrome/browser/sync/profile_sync_factory_impl.h
@@ -12,7 +12,6 @@
 #include "chrome/browser/sync/profile_sync_factory.h"
 
 class CommandLine;
-class ExtensionSettingsBackend;
 class Profile;
 
 class ProfileSyncFactoryImpl : public ProfileSyncFactory {
@@ -53,8 +52,10 @@ class ProfileSyncFactoryImpl : public ProfileSyncFactory {
       ProfileSyncService* profile_sync_service,
       browser_sync::UnrecoverableErrorHandler* error_handler);
 
-  virtual SyncComponents CreateExtensionSettingSyncComponents(
-      ExtensionSettingsBackend* extension_settings_backend,
+  virtual SyncComponents CreateExtensionOrAppSettingSyncComponents(
+      // Either EXTENSION_SETTING or APP_SETTING.
+      syncable::ModelType type,
+      SyncableService* settings_service,
       ProfileSyncService* profile_sync_service,
       browser_sync::UnrecoverableErrorHandler* error_handler);