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

chrome/browser/sync/profile_sync_factory_mock.h

Index: chrome/browser/sync/profile_sync_factory_mock.h
diff --git a/chrome/browser/sync/profile_sync_factory_mock.h b/chrome/browser/sync/profile_sync_factory_mock.h
index 0d184d1f19ef2cfe1d603262842333cf8a2dded5..8a19131c5b0a657cfccc86ca16da17c7a210366f 100644
--- a/chrome/browser/sync/profile_sync_factory_mock.h
+++ b/chrome/browser/sync/profile_sync_factory_mock.h
@@ -57,8 +57,9 @@ class ProfileSyncFactoryMock : public ProfileSyncFactory {
   MOCK_METHOD2(CreateExtensionSyncComponents,
       SyncComponents(ProfileSyncService* profile_sync_service,
                      browser_sync::UnrecoverableErrorHandler* error_handler));
-  MOCK_METHOD3(CreateExtensionSettingSyncComponents,
-      SyncComponents(ExtensionSettingsBackend* extension_settings_backend,
+  MOCK_METHOD4(CreateExtensionOrAppSettingSyncComponents,
+      SyncComponents(syncable::ModelType model_type,
+                     SyncableService* settings_service,
                      ProfileSyncService* profile_sync_service,
                      browser_sync::UnrecoverableErrorHandler* error_handler));
   MOCK_METHOD3(CreatePasswordSyncComponents,