Add support for loading user cloud policy on desktop.

chrome/browser/sync/profile_sync_service_mock.cc

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 694753a93e8c9971fa6c7c1d82339bcc2b576401..d00aca0ae77da0b37ff5830843e1ba6e663c581d 100644
--- a/chrome/browser/sync/profile_sync_service_mock.cc
+++ b/chrome/browser/sync/profile_sync_service_mock.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/pref_service_mock_builder.h"

[Mattias Nissler (ping if slow), 2012/08/03 12:19:08]

not needed any longer?

[Andrew T Wilson (Slow), 2012/08/04 00:54:41]

Done.

 #include "chrome/browser/prefs/testing_pref_store.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
@@ -31,14 +32,7 @@ ProfileSyncServiceMock::~ProfileSyncServiceMock() {
 // static
 TestingProfile* ProfileSyncServiceMock::MakeSignedInTestingProfile() {
   TestingProfile* profile = new TestingProfile();
-  TestingPrefStore* user_prefs = new TestingPrefStore();
-  PrefService* prefs = PrefServiceMockBuilder()
-      .WithUserPrefs(user_prefs)
-      .Create();
-  profile->SetPrefService(prefs);
-  // We just blew away our prefs, so reregister them.
-  SigninManagerFactory::GetInstance()->RegisterUserPrefs(prefs);
-  user_prefs->SetString(prefs::kGoogleServicesUsername, "foo");
+  profile->GetPrefs()->SetString(prefs::kGoogleServicesUsername, "foo");
   return profile;
 }