Clean up PrefServiceBuilder

chrome/browser/chromeos/login/wizard_controller_browsertest.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/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
@@ skipping 400 matching lines @@
     FakeDBusThreadManager* fake_dbus_thread_manager =
         new FakeDBusThreadManager();
     fake_dbus_thread_manager->SetFakeClients();
     fake_session_manager_client_ = new FakeSessionManagerClient;
     fake_dbus_thread_manager->SetSessionManagerClient(
         scoped_ptr<SessionManagerClient>(fake_session_manager_client_));
     DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager);
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
-    PrefServiceBuilder builder;
-    local_state_.reset(builder
-                       .WithUserPrefs(new PrefStoreStub())
-                       .Create(new PrefRegistrySimple()));
+    base::PrefServiceBuilder builder;
+    builder.set_user_prefs(make_scoped_refptr(new PrefStoreStub()));
+    local_state_ = builder.Create(new PrefRegistrySimple()).Pass();
     WizardController::set_local_state_for_testing(local_state_.get());
 
     WizardControllerTest::SetUpOnMainThread();
 
     // Make sure that OOBE is run as an "official" build.
     WizardController::default_controller()->is_official_build_ = true;
   }
 
   virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
     WizardControllerTest::TearDownInProcessBrowserTestFixture();
@@ skipping 232 matching lines @@
 }
 
 // TODO(dzhioev): Add test emaulating device with wrong HWID.
 
 // TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571
 
 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 19,
                add_tests_for_new_control_flow_you_just_introduced);
 
 }  // namespace chromeos