diff options
author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-18 23:28:43 +0000 |
---|---|---|
committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-18 23:28:43 +0000 |
commit | 4e70191dc2dd52cf2f85617e916592d638203c92 (patch) | |
tree | 2a87dfe339cf153c43f072902baac9432de55585 /chrome/browser/sync/profile_sync_factory_mock.h | |
parent | 1be4c6fa13ecc5e68a4f576728e518ba2255bb9a (diff) | |
download | chromium_src-4e70191dc2dd52cf2f85617e916592d638203c92.zip chromium_src-4e70191dc2dd52cf2f85617e916592d638203c92.tar.gz chromium_src-4e70191dc2dd52cf2f85617e916592d638203c92.tar.bz2 |
Reland r81454 (sync non-frontend datatype controllers) with longer timeouts.
Original codereview: http://codereview.chromium.org/6811003
BUG=77964
TEST=unit
Review URL: http://codereview.chromium.org/6869016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82028 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/profile_sync_factory_mock.h')
-rw-r--r-- | chrome/browser/sync/profile_sync_factory_mock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/sync/profile_sync_factory_mock.h b/chrome/browser/sync/profile_sync_factory_mock.h index 2d8d8e2..3fa856c 100644 --- a/chrome/browser/sync/profile_sync_factory_mock.h +++ b/chrome/browser/sync/profile_sync_factory_mock.h @@ -26,6 +26,7 @@ class ProfileSyncFactoryMock : public ProfileSyncFactory { MOCK_METHOD1(CreateProfileSyncService, ProfileSyncService*(const std::string&)); + MOCK_METHOD1(RegisterDataTypes, void(ProfileSyncService*)); MOCK_METHOD2(CreateDataTypeManager, browser_sync::DataTypeManager*( browser_sync::SyncBackendHost*, |