From e3e43d92c57ab8524e9a847ba779d8cbc51fdd54 Mon Sep 17 00:00:00 2001 From: "skrul@chromium.org" Date: Fri, 26 Feb 2010 22:02:38 +0000 Subject: 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 --- chrome/browser/sync/profile_sync_service_mock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '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 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()); -- cgit v1.1