Reverting this as it causes browser tests on the Linux ChromiumOS builder to fail.

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/prefs/pref_service.h"
+#include "chrome/browser/prefs/pref_service_mock_builder.h"
 #include "chrome/browser/prefs/testing_pref_store.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service_mock.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.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,
                          ProfileSyncService::MANUAL_START) {
 }
 
 ProfileSyncServiceMock::ProfileSyncServiceMock(
     Profile* profile) : ProfileSyncService(NULL,
                                            profile,
                                            NULL,
                                            ProfileSyncService::MANUAL_START) {
 }
 
 ProfileSyncServiceMock::~ProfileSyncServiceMock() {
 }
 
 // static
 TestingProfile* ProfileSyncServiceMock::MakeSignedInTestingProfile() {
   TestingProfile* profile = new TestingProfile();
-  profile->GetPrefs()->SetString(prefs::kGoogleServicesUsername, "foo");
+  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");
   return profile;
 }
 
 // static
 ProfileKeyedService* ProfileSyncServiceMock::BuildMockProfileSyncService(
     Profile* profile) {
   return new ProfileSyncServiceMock(profile);
 }