Clean up PrefServiceBuilder

chrome/browser/extensions/test_extension_prefs.cc

Index: chrome/browser/extensions/test_extension_prefs.cc
diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc
index d525c0701800b20da35527aea4d6cc6ea8e8144b..73441e7eff461bb7df2aa075d88f0eeaa2add6b3 100644
--- a/chrome/browser/extensions/test_extension_prefs.cc
+++ b/chrome/browser/extensions/test_extension_prefs.cc
@@ -104,10 +104,10 @@ void TestExtensionPrefs::RecreateExtensionPrefs() {
 
   extension_pref_value_map_.reset(new ExtensionPrefValueMap);
   PrefServiceMockBuilder builder;
-  builder.WithUserFilePrefs(preferences_file_, task_runner_.get());
-  builder.WithExtensionPrefs(
+  builder.SetUserPrefsFile(preferences_file_, task_runner_.get());
+  builder.set_extension_prefs(
       new ExtensionPrefStore(extension_pref_value_map_.get(), false));
-  pref_service_.reset(builder.CreateSyncable(pref_registry_.get()));
+  pref_service_ = builder.CreateSyncable(pref_registry_.get()).Pass();

[Nico, 2013/11/14 14:41:40]

Why the With -> set_ change? I thought builders are usually used like

  pref_service_ = PrefServiceMockBuilder()
                    .WithUserFilePrefs(...)
                    .WithExtensionsPrefs(...)
                    .CreateSyncable(...)
                    .Pass();

With the set_ change, that's no longer possible.

[Ilya Sherman, 2013/11/14 22:34:50]

In practice, these builders were almost never used that way.  Instead, the
WithFoo methods were being called just like set_foo methods (as you can see in
this file, for example).  So, I updated the method names to match how they were
predominantly being used.

 
   prefs_.reset(ExtensionPrefs::Create(
       pref_service_.get(),