| Index: chrome/browser/sync_file_system/mock_remote_file_sync_service.h
|
| diff --git a/chrome/browser/sync_file_system/mock_remote_file_sync_service.h b/chrome/browser/sync_file_system/mock_remote_file_sync_service.h
|
| index a8f84ad641713268f2b4fd008ecae0b21dbd6a3d..92c274a05c101b8b695f27c819892ef384d53933 100644
|
| --- a/chrome/browser/sync_file_system/mock_remote_file_sync_service.h
|
| +++ b/chrome/browser/sync_file_system/mock_remote_file_sync_service.h
|
| @@ -54,9 +54,8 @@ class MockRemoteFileSyncService : public RemoteFileSyncService {
|
| MOCK_METHOD1(SetSyncEnabled, void(bool enabled));
|
| MOCK_METHOD1(PromoteDemotedChanges, void(const base::Closure& callback));
|
|
|
| - virtual void DumpFiles(const GURL& origin,
|
| - const ListCallback& callback) override;
|
| - virtual void DumpDatabase(const ListCallback& callback) override;
|
| + void DumpFiles(const GURL& origin, const ListCallback& callback) override;
|
| + void DumpDatabase(const ListCallback& callback) override;
|
|
|
| void SetServiceState(RemoteServiceState state);
|
|
|
| @@ -89,8 +88,6 @@ class MockRemoteFileSyncService : public RemoteFileSyncService {
|
| ObserverList<Observer> service_observers_;
|
| ObserverList<FileStatusObserver> file_status_observers_;
|
|
|
| - ConflictResolutionPolicy conflict_resolution_policy_;
|
| -
|
| RemoteServiceState state_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MockRemoteFileSyncService);
|
|
|