Clean up PrefServiceBuilder

chrome/browser/ui/app_list/app_list_service_unittest.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 "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_registry_simple.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 "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/app_list/app_list_service_impl.h"
 #include "chrome/browser/ui/app_list/test/fake_keep_alive_service.h"
 #include "chrome/browser/ui/app_list/test/fake_profile.h"
 #include "chrome/browser/ui/app_list/test/fake_profile_store.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 64 matching lines @@
     user_data_dir_ = base::FilePath(FILE_PATH_LITERAL("udd"));
     profile1_.reset(
         new FakeProfile("p1", user_data_dir_.AppendASCII("profile1")));
     profile2_.reset(
         new FakeProfile("p2", user_data_dir_.AppendASCII("profile2")));
     PrefRegistrySimple* pref_registry = new PrefRegistrySimple;
 
     AppListService::RegisterPrefs(pref_registry);
     profiles::RegisterPrefs(pref_registry);
 
-    PrefServiceBuilder builder;
-    builder.WithUserPrefs(new TestingPrefStore);
-    local_state_.reset(builder.Create(pref_registry));
+    base::PrefServiceFactory factory;
+    factory.set_user_prefs(make_scoped_refptr(new TestingPrefStore));
+    local_state_ = factory.Create(pref_registry).Pass();
 
     keep_alive_service_ = new FakeKeepAliveService;
     profile_store_ = new FakeProfileStore(user_data_dir_);
     service_.reset(new TestingAppListServiceImpl(
         command_line,
         local_state_.get(),
         scoped_ptr<ProfileStore>(profile_store_),
         scoped_ptr<KeepAliveService>(keep_alive_service_)));
   }
 
@@ skipping 64 matching lines @@
   EXPECT_TRUE(local_state_->GetBoolean(prefs::kAppLauncherHasBeenEnabled));
 }
 
 TEST_F(AppListServiceUnitTest, DisableViaCommandLineFlag) {
   CommandLine command_line(CommandLine::NO_PROGRAM);
   command_line.AppendSwitch(switches::kResetAppListInstallState);
   SetupWithCommandLine(command_line);
   service_->HandleCommandLineFlags(profile1_.get());
   EXPECT_FALSE(local_state_->GetBoolean(prefs::kAppLauncherHasBeenEnabled));
 }