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 116185aa93bb86e7eed92c7eee8e8c58c7b80609..1d2311daba1138fc59aafc84b847bf9adbadc16a 100644 |
--- a/chrome/browser/sync/profile_sync_service_mock.h |
+++ b/chrome/browser/sync/profile_sync_service_mock.h |
@@ -20,6 +20,8 @@ |
#include "sync/protocol/sync_protocol_error.h" |
#include "testing/gmock/include/gmock/gmock.h" |
+using ::testing::Invoke; |
+ |
class ProfileSyncServiceMock : public ProfileSyncService { |
public: |
// no-arg constructor provided so TestingProfile can use NiceMock. |
@@ -96,11 +98,11 @@ class ProfileSyncServiceMock : public ProfileSyncService { |
const syncer::SyncProtocolError&)); |
MOCK_METHOD1(SetSetupInProgress, void(bool)); |
- MOCK_CONST_METHOD0(GetAllSignedInDevicesMock, |
+ 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; |
+ GetAllSignedinDevices() const OVERRIDE; |
// DataTypeManagerObserver mocks. |
MOCK_METHOD0(OnConfigureBlocked, void()); |