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

chrome/browser/sync/profile_sync_factory_impl.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_IMPL_H__
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_FACTORY_IMPL_H__
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "chrome/browser/sync/profile_sync_factory.h"
 
 class CommandLine;
-class ExtensionSettingsBackend;
 class Profile;
 
 class ProfileSyncFactoryImpl : public ProfileSyncFactory {
  public:
   ProfileSyncFactoryImpl(Profile* profile, CommandLine* command_line);
   virtual ~ProfileSyncFactoryImpl() {}
 
   // ProfileSyncFactory interface.
   virtual ProfileSyncService* CreateProfileSyncService(
       const std::string& cros_user);
@@ skipping 20 matching lines @@
       WebDatabase* web_database,
       browser_sync::UnrecoverableErrorHandler* error_handler);
 
   virtual base::WeakPtr<SyncableService> GetAutofillProfileSyncableService(
       WebDataService* web_data_service) const;
 
   virtual SyncComponents CreateBookmarkSyncComponents(
       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);
 
   virtual SyncComponents CreateExtensionSyncComponents(
       ProfileSyncService* profile_sync_service,
       browser_sync::UnrecoverableErrorHandler* error_handler);
 
   virtual SyncComponents CreatePasswordSyncComponents(
       ProfileSyncService* profile_sync_service,
       PasswordStore* password_store,
@@ skipping 25 matching lines @@
       browser_sync::UnrecoverableErrorHandler* error_handler);
 
  private:
   Profile* profile_;
   CommandLine* command_line_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncFactoryImpl);
 };
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_FACTORY_IMPL_H__