Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync / profile_sync_service_mock.cc

diff --git a/src/chrome/browser/sync/profile_sync_service_mock.cc b/src/chrome/browser/sync/profile_sync_service_mock.cc
index 8470bca..7364111 100644 (file)
--- a/src/chrome/browser/sync/profile_sync_service_mock.cc
+++ b/src/chrome/browser/sync/profile_sync_service_mock.cc
@@ -8,7 +8,8 @@
 #include "base/prefs/testing_pref_store.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
-#include "chrome/browser/sync/managed_user_signin_manager_wrapper.h"
+#include "chrome/browser/sync/profile_sync_components_factory_mock.h"
+#include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/testing_profile.h"
@@ -17,9 +18,22 @@
 
 ProfileSyncServiceMock::ProfileSyncServiceMock(Profile* profile)
     : ProfileSyncService(
-          NULL,
+          scoped_ptr<ProfileSyncComponentsFactory>(
+              new ProfileSyncComponentsFactoryMock()),
           profile,
-          make_scoped_ptr(new ManagedUserSigninManagerWrapper(
+          make_scoped_ptr(new SupervisedUserSigninManagerWrapper(
+              profile,
+              SigninManagerFactory::GetForProfile(profile))),
+          ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
+          browser_sync::MANUAL_START) {
+}
+
+ProfileSyncServiceMock::ProfileSyncServiceMock(
+    scoped_ptr<ProfileSyncComponentsFactory> factory, Profile* profile)
+    : ProfileSyncService(
+          factory.Pass(),
+          profile,
+          make_scoped_ptr(new SupervisedUserSigninManagerWrapper(
               profile,
               SigninManagerFactory::GetForProfile(profile))),
           ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
@@ -50,8 +64,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();
-}