Clean up PrefServiceBuilder

chrome/browser/prefs/proxy_policy_unittest.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 "base/callback.h"
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/policy/external_data_fetcher.h"
 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
@@ skipping 81 matching lines @@
     policy_service_.reset(new PolicyServiceImpl(providers));
     provider_.Init();
   }
 
   virtual void TearDown() OVERRIDE {
     provider_.Shutdown();
   }
 
   PrefService* CreatePrefService(bool with_managed_policies) {
     PrefServiceMockBuilder builder;
-    builder.WithCommandLine(&command_line_);
+    builder.SetCommandLine(&command_line_);
     if (with_managed_policies)
-      builder.WithManagedPolicies(policy_service_.get());
+      builder.SetManagedPolicies(policy_service_.get());
     scoped_refptr<user_prefs::PrefRegistrySyncable> registry(
         new user_prefs::PrefRegistrySyncable);
-    PrefServiceSyncable* prefs = builder.CreateSyncable(registry.get());
+    PrefServiceSyncable* prefs = builder.CreateSyncable(registry.get()).get();
     chrome::RegisterUserProfilePrefs(registry.get());
     return prefs;
   }
 
   base::MessageLoop loop_;
   CommandLine command_line_;
   MockConfigurationPolicyProvider provider_;
   scoped_ptr<PolicyServiceImpl> policy_service_;
 };
 
@@ skipping 99 matching lines @@
 
   // Try a second time time with the managed PrefStore in place, the
   // auto-detect should be overridden. The default pref store must be
   // in place with the appropriate default value for this to work.
   prefs.reset(CreatePrefService(true));
   ProxyConfigDictionary dict2(prefs->GetDictionary(prefs::kProxy));
   assertProxyModeWithoutParams(dict2, ProxyPrefs::MODE_DIRECT);
 }
 
 }  // namespace policy