diff options
| author | skrul@chromium.org <skrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-26 22:02:38 +0000 |
|---|---|---|
| committer | skrul@chromium.org <skrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-26 22:02:38 +0000 |
| commit | e3e43d92c57ab8524e9a847ba779d8cbc51fdd54 (patch) | |
| tree | 49933ab2440ed0ed6ca5a2ee08d7b5675ae25613 /chrome/browser/sync/profile_sync_service_mock.h | |
| parent | eafc0b45422fd004cbe5ca652eb5dd36a86b1c31 (diff) | |
| download | chromium_src-e3e43d92c57ab8524e9a847ba779d8cbc51fdd54.zip chromium_src-e3e43d92c57ab8524e9a847ba779d8cbc51fdd54.tar.gz chromium_src-e3e43d92c57ab8524e9a847ba779d8cbc51fdd54.tar.bz2 | |
Un-reverting 33964 - turns out the problem here was that I used DCHECKs with mocked methods in it, and in release mode my expectations no longer matched. See added #ifdef in data_type_manager_impl_unittest.cc.
Review URL: http://codereview.chromium.org/661111
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40164 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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sync/profile_sync_service_mock.h b/chrome/browser/sync/profile_sync_service_mock.h index 661ada8..22e7f9e 100644 --- a/chrome/browser/sync/profile_sync_service_mock.h +++ b/chrome/browser/sync/profile_sync_service_mock.h @@ -15,7 +15,7 @@ class ProfileSyncServiceMock : public ProfileSyncService { public: - ProfileSyncServiceMock() : ProfileSyncService(NULL, false) {} + ProfileSyncServiceMock() : ProfileSyncService(NULL, NULL, false) {} virtual ~ProfileSyncServiceMock() {} MOCK_METHOD0(EnableForUser, void()); |