diff options
| author | lipalani@chromium.org <lipalani@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-20 00:35:21 +0000 |
|---|---|---|
| committer | lipalani@chromium.org <lipalani@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-20 00:35:21 +0000 |
| commit | 4063490236117b7a4c1012115d329e159bdc7df4 (patch) | |
| tree | 71a3aa60194b6d2b5a4784d5fe31b989408afb5c /chrome/browser/sync/profile_sync_service_mock.h | |
| parent | e07b6ac7fd771a2bfd9c340c6fcf399de5db34fe (diff) | |
| download | chromium_src-4063490236117b7a4c1012115d329e159bdc7df4.zip chromium_src-4063490236117b7a4c1012115d329e159bdc7df4.tar.gz chromium_src-4063490236117b7a4c1012115d329e159bdc7df4.tar.bz2 | |
Implementation of DeviceInfo API (get). The API is not yet exposed the dev channel(the permission and manifest entries are missing)
Nicolas - would you mind reviewing the device_info.cc and pss_mock changes. In DeviceInfo the changes are to make the tovalue method consistent with the API docs. However there still remains some work particularly for ios devices which are marked as todo and if you are OK with it we will do it as a seperate review.
Matt - Please review the rest.
BUG=170375
R=mpcomplete@chromium.org, zea@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=218087
Review URL: https://codereview.chromium.org/22706006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218374 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/profile_sync_service_mock.h')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service_mock.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/sync/profile_sync_service_mock.h b/chrome/browser/sync/profile_sync_service_mock.h index 116185a..1d2311d 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()); |