| Index: chrome/browser/extensions/api/storage/settings_apitest.cc
|
| diff --git a/chrome/browser/extensions/api/storage/settings_apitest.cc b/chrome/browser/extensions/api/storage/settings_apitest.cc
|
| index 28095434511bdc03b82fd8895d15820f6f39b520..e279a1132df0deceb70bfe336cb62b0b96ffdfc9 100644
|
| --- a/chrome/browser/extensions/api/storage/settings_apitest.cc
|
| +++ b/chrome/browser/extensions/api/storage/settings_apitest.cc
|
| @@ -19,8 +19,10 @@
|
| #include "chrome/test/base/ui_test_utils.h"
|
| #include "extensions/browser/extension_system.h"
|
| #include "extensions/common/value_builder.h"
|
| +#include "sync/api/fake_sync_change_processor.h"
|
| #include "sync/api/sync_change.h"
|
| #include "sync/api/sync_change_processor.h"
|
| +#include "sync/api/sync_change_processor_delegator.h"
|
| #include "sync/api/sync_error_factory.h"
|
| #include "sync/api/sync_error_factory_mock.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| @@ -59,49 +61,6 @@ const syncer::ModelType kModelType = syncer::EXTENSION_SETTINGS;
|
| // the extension.
|
| const char kManagedStorageExtensionId[] = "kjmkgkdkpedkejedfhmfcenooemhbpbo";
|
|
|
| -class NoopSyncChangeProcessor : public syncer::SyncChangeProcessor {
|
| - public:
|
| - virtual syncer::SyncError ProcessSyncChanges(
|
| - const tracked_objects::Location& from_here,
|
| - const syncer::SyncChangeList& change_list) OVERRIDE {
|
| - return syncer::SyncError();
|
| - }
|
| -
|
| - virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const
|
| - OVERRIDE {
|
| - return syncer::SyncDataList();
|
| - }
|
| -
|
| - virtual ~NoopSyncChangeProcessor() {};
|
| -};
|
| -
|
| -class SyncChangeProcessorDelegate : public syncer::SyncChangeProcessor {
|
| - public:
|
| - explicit SyncChangeProcessorDelegate(syncer::SyncChangeProcessor* recipient)
|
| - : recipient_(recipient) {
|
| - DCHECK(recipient_);
|
| - }
|
| - virtual ~SyncChangeProcessorDelegate() {}
|
| -
|
| - // syncer::SyncChangeProcessor implementation.
|
| - virtual syncer::SyncError ProcessSyncChanges(
|
| - const tracked_objects::Location& from_here,
|
| - const syncer::SyncChangeList& change_list) OVERRIDE {
|
| - return recipient_->ProcessSyncChanges(from_here, change_list);
|
| - }
|
| -
|
| - virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const
|
| - OVERRIDE {
|
| - return recipient_->GetAllSyncData(type);
|
| - }
|
| -
|
| - private:
|
| - // The recipient of all sync changes.
|
| - syncer::SyncChangeProcessor* recipient_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(SyncChangeProcessorDelegate);
|
| -};
|
| -
|
| class MockSchemaRegistryObserver : public policy::SchemaRegistry::Observer {
|
| public:
|
| MockSchemaRegistryObserver() {}
|
| @@ -229,13 +188,17 @@ class ExtensionSettingsApiTest : public ExtensionApiTest {
|
| void InitSyncWithSyncableService(
|
| syncer::SyncChangeProcessor* sync_processor,
|
| syncer::SyncableService* settings_service) {
|
| - EXPECT_FALSE(settings_service->MergeDataAndStartSyncing(
|
| - kModelType,
|
| - syncer::SyncDataList(),
|
| - scoped_ptr<syncer::SyncChangeProcessor>(
|
| - new SyncChangeProcessorDelegate(sync_processor)),
|
| - scoped_ptr<syncer::SyncErrorFactory>(
|
| - new syncer::SyncErrorFactoryMock())).error().IsSet());
|
| + EXPECT_FALSE(
|
| + settings_service->MergeDataAndStartSyncing(
|
| + kModelType,
|
| + syncer::SyncDataList(),
|
| + scoped_ptr<syncer::SyncChangeProcessor>(
|
| + new syncer::SyncChangeProcessorDelegator(
|
| + sync_processor)),
|
| + scoped_ptr<syncer::SyncErrorFactory>(
|
| + new syncer::SyncErrorFactoryMock()))
|
| + .error()
|
| + .IsSet());
|
| }
|
|
|
| void SendChangesToSyncableService(
|
| @@ -370,7 +333,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionSettingsApiTest,
|
| "assertNoNotifications", "assertNoNotifications", "split_incognito");
|
| const std::string& extension_id = extension->id();
|
|
|
| - NoopSyncChangeProcessor sync_processor;
|
| + syncer::FakeSyncChangeProcessor sync_processor;
|
| InitSync(&sync_processor);
|
|
|
| // Set "foo" to "bar" via sync.
|
| @@ -415,7 +378,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionSettingsApiTest,
|
| "assertNoNotifications", "assertNoNotifications", "split_incognito");
|
| const std::string& extension_id = extension->id();
|
|
|
| - NoopSyncChangeProcessor sync_processor;
|
| + syncer::FakeSyncChangeProcessor sync_processor;
|
| InitSync(&sync_processor);
|
|
|
| // Set "foo" to "bar" via sync.
|
|
|