Upstream version 5.34.104.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 e9f9eb7..8fafca4 100644 (file)
--- a/src/chrome/browser/sync/profile_sync_service_mock.cc
+++ b/src/chrome/browser/sync/profile_sync_service_mock.cc
@@ -4,27 +4,22 @@
 
 #include "base/prefs/pref_service.h"
 #include "base/prefs/testing_pref_store.h"
+#include "chrome/browser/managed_mode/managed_user_signin_manager_wrapper.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
+#include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service_mock.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/testing_profile.h"
 
-ProfileSyncServiceMock::ProfileSyncServiceMock()
-    : ProfileSyncService(
-          NULL,
-          NULL,
-          NULL,
-          NULL,
-          ProfileSyncService::MANUAL_START) {}
-
 ProfileSyncServiceMock::ProfileSyncServiceMock(Profile* profile)
     : ProfileSyncService(
           NULL,
           profile,
-          NULL,
+          new ManagedUserSigninManagerWrapper(
+              SigninManagerFactory::GetForProfile(profile)),
           ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
           ProfileSyncService::MANUAL_START) {}
 
@@ -53,3 +48,7 @@ ScopedVector<browser_sync::DeviceInfo>
   return devices.Pass();
 }
 
+scoped_ptr<browser_sync::DeviceInfo>
+    ProfileSyncServiceMock::GetLocalDeviceInfo() const {
+  return scoped_ptr<browser_sync::DeviceInfo>(GetLocalDeviceInfoMock()).Pass();
+}