Revert of Sync: Refactoring of DEVICE_INFO syncable type - Part 1

chrome/browser/sync/profile_sync_service_mock.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/profile_sync_service_mock.h"
 
 #include "base/prefs/pref_service.h"
 #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/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"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 
 ProfileSyncServiceMock::ProfileSyncServiceMock(Profile* profile)
     : ProfileSyncService(
-          scoped_ptr<ProfileSyncComponentsFactory>(
-              new ProfileSyncComponentsFactoryMock()),
+          NULL,
           profile,
           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),
           browser_sync::MANUAL_START) {
 }
 
 ProfileSyncServiceMock::~ProfileSyncServiceMock() {
 }
 
 // static
 TestingProfile* ProfileSyncServiceMock::MakeSignedInTestingProfile() {
   TestingProfile* profile = new TestingProfile();
   profile->GetPrefs()->SetString(prefs::kGoogleServicesUsername, "foo");
   return profile;
 }
 
 // static
 KeyedService* ProfileSyncServiceMock::BuildMockProfileSyncService(
     content::BrowserContext* profile) {
   return new ProfileSyncServiceMock(static_cast<Profile*>(profile));
 }
 
 ScopedVector<browser_sync::DeviceInfo>
     ProfileSyncServiceMock::GetAllSignedInDevices() const {
   ScopedVector<browser_sync::DeviceInfo> devices;
   std::vector<browser_sync::DeviceInfo*>* device_vector =
       GetAllSignedInDevicesMock();
   devices.get() = *device_vector;
   return devices.Pass();
 }
+
+scoped_ptr<browser_sync::DeviceInfo>
+    ProfileSyncServiceMock::GetLocalDeviceInfo() const {
+  return scoped_ptr<browser_sync::DeviceInfo>(GetLocalDeviceInfoMock()).Pass();
+}