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

chrome/browser/sync/profile_sync_factory_mock.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_MOCK_H__
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_FACTORY_MOCK_H__
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
-class ExtensionSettingsBackend;
-
 namespace browser_sync {
 class AssociatorInterface;
 class ChangeProcessor;
 }
 
 class ProfileSyncFactoryMock : public ProfileSyncFactory {
  public:
   ProfileSyncFactoryMock();
   ProfileSyncFactoryMock(
       browser_sync::AssociatorInterface* model_associator,
@@ skipping 24 matching lines @@
                    browser_sync::UnrecoverableErrorHandler* error_handler));
   MOCK_CONST_METHOD1(GetAutofillProfileSyncableService,
                      base::WeakPtr<SyncableService>(
                          WebDataService* web_data_service));
   MOCK_METHOD2(CreateBookmarkSyncComponents,
       SyncComponents(ProfileSyncService* profile_sync_service,
                      browser_sync::UnrecoverableErrorHandler* error_handler));
   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,
                SyncComponents(
                    ProfileSyncService* profile_sync_service,
                    PasswordStore* password_store,
                    browser_sync::UnrecoverableErrorHandler* error_handler));
   MOCK_METHOD2(CreatePreferenceSyncComponents,
       SyncComponents(ProfileSyncService* profile_sync_service,
                      browser_sync::UnrecoverableErrorHandler* error_handler));
@@ skipping 18 matching lines @@
                    browser_sync::UnrecoverableErrorHandler* error_handler));
 
  private:
   SyncComponents MakeSyncComponents();
 
   scoped_ptr<browser_sync::AssociatorInterface> model_associator_;
   scoped_ptr<browser_sync::ChangeProcessor> change_processor_;
 };
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_FACTORY_MOCK_H__