Index: chrome/browser/sync/profile_sync_service_mock.cc |
diff --git a/chrome/browser/sync/profile_sync_service_mock.cc b/chrome/browser/sync/profile_sync_service_mock.cc |
index 3ab3903c8b65a8a3008dd1e736adaf415fe1f0db..001853259e6934d746c9f543fc9d8aadcb6b6c31 100644 |
--- a/chrome/browser/sync/profile_sync_service_mock.cc |
+++ b/chrome/browser/sync/profile_sync_service_mock.cc |
@@ -26,6 +26,18 @@ ProfileSyncServiceMock::ProfileSyncServiceMock(Profile* profile) |
browser_sync::MANUAL_START) { |
} |
+ProfileSyncServiceMock::ProfileSyncServiceMock( |
+ ProfileSyncComponentsFactory* factory, Profile* profile) |
+ : ProfileSyncService( |
+ factory, |
+ profile, |
+ make_scoped_ptr(new SupervisedUserSigninManagerWrapper( |
+ profile, |
+ SigninManagerFactory::GetForProfile(profile))), |
+ ProfileOAuth2TokenServiceFactory::GetForProfile(profile), |
+ browser_sync::MANUAL_START) { |
+} |
+ |
ProfileSyncServiceMock::~ProfileSyncServiceMock() { |
} |
@@ -50,8 +62,3 @@ ScopedVector<browser_sync::DeviceInfo> |
devices.get() = *device_vector; |
return devices.Pass(); |
} |
- |
-scoped_ptr<browser_sync::DeviceInfo> |
- ProfileSyncServiceMock::GetLocalDeviceInfo() const { |
- return scoped_ptr<browser_sync::DeviceInfo>(GetLocalDeviceInfoMock()).Pass(); |
-} |