| Index: chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc
|
| diff --git a/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc b/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc
|
| index 4579566c6d3a93a9e0335c94561ecd419b1582c9..fd3f6ec8fdd2d3240fdbfd20d3e2fa64b5acd949 100644
|
| --- a/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc
|
| +++ b/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc
|
| @@ -15,6 +15,7 @@
|
| #include "chrome/test/base/testing_pref_service_syncable.h"
|
| #include "chrome/test/base/testing_profile.h"
|
| #include "content/public/test/test_utils.h"
|
| +#include "sync/api/fake_sync_change_processor.h"
|
| #include "sync/api/sync_change.h"
|
| #include "sync/api/sync_error_factory.h"
|
| #include "sync/api/sync_error_factory_mock.h"
|
| @@ -33,19 +34,6 @@ namespace {
|
| using testing::Return;
|
| using testing::_;
|
|
|
| -class TestSyncProcessorStub : public syncer::SyncChangeProcessor {
|
| - 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();
|
| - }
|
| -};
|
| -
|
| class SyncedPrefChangeRegistrarTest : public InProcessBrowserTest {
|
| public:
|
| SyncedPrefChangeRegistrarTest() : next_sync_data_id_(0) {}
|
| @@ -114,7 +102,8 @@ class SyncedPrefChangeRegistrarTest : public InProcessBrowserTest {
|
| syncer_->MergeDataAndStartSyncing(
|
| syncer::PREFERENCES,
|
| syncer::SyncDataList(),
|
| - scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
|
| + scoped_ptr<syncer::SyncChangeProcessor>(
|
| + new syncer::FakeSyncChangeProcessor),
|
| scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock));
|
| registrar_.reset(new SyncedPrefChangeRegistrar(prefs_));
|
| }
|
|
|