| Index: chrome/browser/extensions/test_extension_service.h
|
| diff --git a/chrome/browser/extensions/test_extension_service.h b/chrome/browser/extensions/test_extension_service.h
|
| index 72a012a8bed9f9a42ae17bc8eb4f707ece76a3e8..af9e7a0b5f3ec75a5990e8b17ffd888c3f301806 100644
|
| --- a/chrome/browser/extensions/test_extension_service.h
|
| +++ b/chrome/browser/extensions/test_extension_service.h
|
| @@ -53,13 +53,13 @@ class TestExtensionService : public ExtensionServiceInterface {
|
| virtual void CheckForUpdatesSoon() OVERRIDE;
|
|
|
| virtual syncer::SyncError MergeDataAndStartSyncing(
|
| - syncable::ModelType type,
|
| + syncer::ModelType type,
|
| const syncer::SyncDataList& initial_sync_data,
|
| scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
|
| scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) OVERRIDE;
|
| - virtual void StopSyncing(syncable::ModelType type) OVERRIDE;
|
| + virtual void StopSyncing(syncer::ModelType type) OVERRIDE;
|
| virtual syncer::SyncDataList GetAllSyncData(
|
| - syncable::ModelType type) const OVERRIDE;
|
| + syncer::ModelType type) const OVERRIDE;
|
| virtual syncer::SyncError ProcessSyncChanges(
|
| const tracked_objects::Location& from_here,
|
| const syncer::SyncChangeList& change_list) OVERRIDE;
|
|
|