| Index: components/sync/api/fake_sync_change_processor.h
|
| diff --git a/components/sync/api/fake_sync_change_processor.h b/components/sync/api/fake_sync_change_processor.h
|
| index efd5fc3f7f4ec61b4db836d5cb628c220c41c072..1498b2dd1876060603b02e63223aca60eedc8584 100644
|
| --- a/components/sync/api/fake_sync_change_processor.h
|
| +++ b/components/sync/api/fake_sync_change_processor.h
|
| @@ -21,35 +21,37 @@ class FakeSyncChangeProcessor : public SyncChangeProcessor {
|
| //
|
| // ProcessSyncChanges will accumulate changes in changes() until they are
|
| // cleared.
|
| - SyncError ProcessSyncChanges(const tracked_objects::Location& from_here,
|
| - const SyncChangeList& change_list) override;
|
| + syncer::SyncError ProcessSyncChanges(
|
| + const tracked_objects::Location& from_here,
|
| + const syncer::SyncChangeList& change_list) override;
|
|
|
| // SyncChangeProcessor implementation.
|
| //
|
| // Returns data().
|
| - SyncDataList GetAllSyncData(ModelType type) const override;
|
| + syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override;
|
|
|
| // SyncChangeProcessor implementation.
|
| //
|
| // Updates context().
|
| - SyncError UpdateDataTypeContext(ModelType type,
|
| - ContextRefreshStatus refresh_status,
|
| - const std::string& context) override;
|
| - void AddLocalChangeObserver(LocalChangeObserver* observer) override;
|
| - void RemoveLocalChangeObserver(LocalChangeObserver* observer) override;
|
| + syncer::SyncError UpdateDataTypeContext(ModelType type,
|
| + ContextRefreshStatus refresh_status,
|
| + const std::string& context) override;
|
| + void AddLocalChangeObserver(syncer::LocalChangeObserver* observer) override;
|
| + void RemoveLocalChangeObserver(
|
| + syncer::LocalChangeObserver* observer) override;
|
|
|
| - virtual const SyncChangeList& changes() const;
|
| - virtual SyncChangeList& changes();
|
| + virtual const syncer::SyncChangeList& changes() const;
|
| + virtual syncer::SyncChangeList& changes();
|
|
|
| - virtual const SyncDataList& data() const;
|
| - virtual SyncDataList& data();
|
| + virtual const syncer::SyncDataList& data() const;
|
| + virtual syncer::SyncDataList& data();
|
|
|
| virtual const std::string& context() const;
|
| virtual std::string& context();
|
|
|
| private:
|
| - SyncChangeList changes_;
|
| - SyncDataList data_;
|
| + syncer::SyncChangeList changes_;
|
| + syncer::SyncDataList data_;
|
| std::string context_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(FakeSyncChangeProcessor);
|
|
|