Not for check-in. Manually reviewable parts of https://codereview.chromium.org/11570009/

chrome/browser/prefs/pref_service_mock_builder.cc

Index: chrome/browser/prefs/pref_service_mock_builder.cc
diff --git a/chrome/browser/prefs/pref_service_mock_builder.cc b/chrome/browser/prefs/pref_service_mock_builder.cc
index 9867ed4ea6b9275a16cc0b8496c21d8a6eef7eab..2209c96c66b265cef75ecffdb143d2d666c2dcd3 100644
--- a/chrome/browser/prefs/pref_service_mock_builder.cc
+++ b/chrome/browser/prefs/pref_service_mock_builder.cc
@@ -15,7 +15,6 @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/pref_value_store.h"
 #include "content/public/browser/browser_thread.h"
-#include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
 
@@ -47,13 +46,20 @@ PrefServiceMockBuilder::WithCommandLine(CommandLine* command_line) {
   return *this;
 }
 
-PrefService* PrefServiceMockBuilder::Create() {
-  PrefService* pref_service = PrefServiceBuilder::Create();
+PrefServiceSimple* PrefServiceMockBuilder::CreateSimple() {
+  PrefServiceSimple* service = new PrefServiceSimple;
+  PrefServiceBuilder::Build(service);
   ResetTestingState();
-  return pref_service;
+  return service;
+}
+
+PrefServiceSyncable* PrefServiceMockBuilder::CreateSyncable() {
+  PrefServiceSyncable* service = new PrefServiceSyncable;
+  PrefServiceBuilder::Build(service);
+  ResetTestingState();
+  return service;
 }
 
 void PrefServiceMockBuilder::ResetTestingState() {
   user_prefs_ = new TestingPrefStore;
-  get_localized_string_method_ = base::Bind(l10n_util::GetStringUTF8);
 }