commit e3e43d92c57ab8524e9a847ba779d8cbc51fdd54
author skrul@chromium.org <skrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Feb 26 22:02:38 2010
committer skrul@chromium.org <skrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Feb 26 22:02:38 2010
tree 49933ab2440ed0ed6ca5a2ee08d7b5675ae25613
parent eafc0b45422fd004cbe5ca652eb5dd36a86b1c31

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/test_profile_sync_service.h

diff --git a/chrome/browser/sync/test_profile_sync_service.h b/chrome/browser/sync/test_profile_sync_service.h
index cb86c49..9efd5d2 100644
--- a/chrome/browser/sync/test_profile_sync_service.h
+++ b/chrome/browser/sync/test_profile_sync_service.h
@@ -9,14 +9,16 @@
 
 #include "base/message_loop.h"
 #include "chrome/browser/profile.h"
+#include "chrome/browser/sync/profile_sync_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/test/sync/test_http_bridge_factory.h"
 
 class TestProfileSyncService : public ProfileSyncService {
  public:
-  explicit TestProfileSyncService(Profile* profile,
+  explicit TestProfileSyncService(ProfileSyncFactory* factory,
+                                  Profile* profile,
                                   bool bootstrap_sync_authentication)
-      : ProfileSyncService(profile, bootstrap_sync_authentication) {
+      : ProfileSyncService(factory, profile, bootstrap_sync_authentication) {
     RegisterPreferences();
     SetSyncSetupCompleted();
   }