summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/profile_sync_factory_mock.h
diff options
context:
space:
mode:
authorzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-19 00:25:40 +0000
committerzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-19 00:25:40 +0000
commit0e194cc6261463902915398c3d975d4de64852ff (patch)
tree67494192dd9f87a25334d5e5ab4eeaa00b1e1d4a /chrome/browser/sync/profile_sync_factory_mock.h
parent4d9a7a854d510f9261b5a918ea1f3ac8ea73c78d (diff)
downloadchromium_src-0e194cc6261463902915398c3d975d4de64852ff.zip
chromium_src-0e194cc6261463902915398c3d975d4de64852ff.tar.gz
chromium_src-0e194cc6261463902915398c3d975d4de64852ff.tar.bz2
Revert 82028 - Reland r81454 (sync non-frontend datatype controllers) with longer timeouts.Original codereview: http://codereview.chromium.org/6811003BUG=77964TEST=unitReview URL: http://codereview.chromium.org/6869016
TBR=zea@chromium.org Review URL: http://codereview.chromium.org/6882032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82036 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.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/browser/sync/profile_sync_factory_mock.h b/chrome/browser/sync/profile_sync_factory_mock.h
index 3fa856c..2d8d8e2 100644
--- a/chrome/browser/sync/profile_sync_factory_mock.h
+++ b/chrome/browser/sync/profile_sync_factory_mock.h
@@ -26,7 +26,6 @@ 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*,