| Index: chrome/browser/sync/profile_sync_service_mock.h
|
| diff --git a/chrome/browser/sync/profile_sync_service_mock.h b/chrome/browser/sync/profile_sync_service_mock.h
|
| index c7584e1dce79c775df371314c95bee6dd6209f8a..25074e6ef95e1979bdac42992a0b2454062b600a 100644
|
| --- a/chrome/browser/sync/profile_sync_service_mock.h
|
| +++ b/chrome/browser/sync/profile_sync_service_mock.h
|
| @@ -93,13 +93,7 @@ class ProfileSyncServiceMock : public ProfileSyncService {
|
| MOCK_METHOD1(OnActionableError, void(
|
| const syncer::SyncProtocolError&));
|
| MOCK_METHOD1(SetSetupInProgress, void(bool));
|
| - MOCK_CONST_METHOD0(IsSessionsDataTypeControllerRunning, bool());
|
| -
|
| - MOCK_CONST_METHOD0(GetAllSignedInDevicesMock,
|
| - std::vector<browser_sync::DeviceInfo*>* ());
|
| - // This is to get around the fact that GMOCK does not handle Scoped*.
|
| - virtual ScopedVector<browser_sync::DeviceInfo>
|
| - GetAllSignedInDevices() const OVERRIDE;
|
| + MOCK_CONST_METHOD1(IsDataTypeControllerRunning, bool(syncer::ModelType));
|
|
|
| // DataTypeManagerObserver mocks.
|
| MOCK_METHOD0(OnConfigureBlocked, void());
|
|
|