Clean up PrefServiceBuilder

components/autofill/core/browser/autofill_test_utils.cc

 // Copyright 2013 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 "components/autofill/core/browser/autofill_test_utils.h"
 
 #include "base/guid.h"
 #include "base/prefs/pref_service.h"
-#include "base/prefs/pref_service_builder.h"
+#include "base/prefs/pref_service_factory.h"
 #include "base/prefs/testing_pref_store.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "components/user_prefs/user_prefs.h"
 #include "components/webdata/encryptor/encryptor.h"
 #include "content/public/browser/browser_context.h"
 
 namespace autofill {
 namespace test {
 
 namespace {
 
 const char kSettingsOrigin[] = "Chrome settings";
 
 }  // namespace
 
 scoped_ptr<PrefService> PrefServiceForTesting() {
   scoped_refptr<user_prefs::PrefRegistrySyncable> registry(
       new user_prefs::PrefRegistrySyncable());
   AutofillManager::RegisterProfilePrefs(registry.get());
-  PrefServiceBuilder builder;
-  builder.WithUserPrefs(new TestingPrefStore());
-  return scoped_ptr<PrefService>(builder.Create(registry.get()));
+  base::PrefServiceFactory factory;
+  factory.set_user_prefs(make_scoped_refptr(new TestingPrefStore()));
+  return factory.Create(registry.get());
 }
 
 void CreateTestFormField(const char* label,
                          const char* name,
                          const char* value,
                          const char* type,
                          FormFieldData* field) {
   field->label = ASCIIToUTF16(label);
   field->name = ASCIIToUTF16(name);
   field->value = ASCIIToUTF16(value);
@@ skipping 161 matching lines @@
   // Disable auxiliary profiles for unit testing.  These reach out to system
   // services on the Mac.
   if (browser_context) {
     user_prefs::UserPrefs::Get(browser_context)->SetBoolean(
         prefs::kAutofillAuxiliaryProfilesEnabled, false);
   }
 }
 
 }  // namespace test
 }  // namespace autofill