Clean up PrefServiceBuilder

chrome/browser/prefs/chrome_pref_service_unittest.cc

Index: chrome/browser/prefs/chrome_pref_service_unittest.cc
diff --git a/chrome/browser/prefs/chrome_pref_service_unittest.cc b/chrome/browser/prefs/chrome_pref_service_unittest.cc
index 437379209bc1e362e1e7df88721130646c6ed01e..4a453fd4db750ccac398fc9ed1e558376e84975f 100644
--- a/chrome/browser/prefs/chrome_pref_service_unittest.cc
+++ b/chrome/browser/prefs/chrome_pref_service_unittest.cc
@@ -15,7 +15,7 @@
 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/command_line_pref_store.h"
-#include "chrome/browser/prefs/pref_service_mock_builder.h"
+#include "chrome/browser/prefs/pref_service_mock_factory.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
@@ -97,12 +97,12 @@ TEST_F(ChromePrefServiceUserFilePrefsTest, PreserveEmptyValue) {
       data_dir_.AppendASCII("read.need_empty_value.json"),
       pref_file));
 
-  PrefServiceMockBuilder builder;
-  builder.WithUserFilePrefs(pref_file,
-                            message_loop_.message_loop_proxy().get());
+  PrefServiceMockFactory factory;
+  factory.SetUserPrefsFile(pref_file,
+                          message_loop_.message_loop_proxy().get());
   scoped_refptr<user_prefs::PrefRegistrySyncable> registry(
       new user_prefs::PrefRegistrySyncable);
-  scoped_ptr<PrefServiceSyncable> prefs(builder.CreateSyncable(registry.get()));
+  scoped_ptr<PrefServiceSyncable> prefs(factory.CreateSyncable(registry.get()));
 
   // Register testing prefs.
   registry->RegisterListPref("list",