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

chrome/browser/sync/profile_sync_factory.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_FACTORY_H__
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_FACTORY_H__
 #pragma once
 
 #include <string>
 #include <utility>
 
 #include "base/task.h"
 #include "chrome/browser/sync/glue/change_processor.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/model_associator.h"
 #include "chrome/browser/sync/unrecoverable_error_handler.h"
 
-class ExtensionSettingsBackend;
 class PasswordStore;
 class PersonalDataManager;
 class ProfileSyncService;
 class SyncableService;
 class WebDatabase;
 class WebDataService;
 
 namespace browser_sync {
 class DataTypeManager;
 class GenericChangeProcessor;
@@ skipping 79 matching lines @@
       WebDataService* web_data_service) const = 0;
 
   // Instantiates both a model associator and change processor for the
   // bookmark data type.  The pointers in the return struct are owned
   // by the caller.
   virtual SyncComponents CreateBookmarkSyncComponents(
       ProfileSyncService* profile_sync_service,
       browser_sync::UnrecoverableErrorHandler* error_handler) = 0;
 
   // Instantiates both a model associator and change processor for the
-  // extension setting data type.  The pointers in the return struct are
+  // extension or app setting data type.  The pointers in the return struct are
   // owned by the caller.
-  virtual SyncComponents CreateExtensionSettingSyncComponents(
-      ExtensionSettingsBackend* extension_settings_backend_,
+  virtual SyncComponents CreateExtensionOrAppSettingSyncComponents(
+      // Either EXTENSION_SETTINGS or APP_SETTINGS.
+      syncable::ModelType type,
+      SyncableService* settings_service,
       ProfileSyncService* profile_sync_service,
       browser_sync::UnrecoverableErrorHandler* error_handler) = 0;
 
   // Instantiates both a model associator and change processor for the
   // extension data type.  The pointers in the return struct are
   // owned by the caller.
   virtual SyncComponents CreateExtensionSyncComponents(
       ProfileSyncService* profile_sync_service,
       browser_sync::UnrecoverableErrorHandler* error_handler) = 0;
 
@@ skipping 43 matching lines @@
 
   // Instantiates both a model associator and change processor for the app
   // notification data type.  The pointers in the return struct are owned by the
   // caller.
   virtual SyncComponents CreateAppNotificationSyncComponents(
       ProfileSyncService* profile_sync_service,
       browser_sync::UnrecoverableErrorHandler* error_handler) = 0;
 };
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_FACTORY_H__