Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1083)

Unified Diff: chrome/browser/chromeos/login/wizard_controller_browsertest.cc

Issue 64193003: Clean up PrefServiceBuilder (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix memory ownership bug in ProxyPolicyTest Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/wizard_controller_browsertest.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
index c6de7c44bab0954403c2cda9cf45ed28aec61e94..c20afe2af07c03b823a24caffb2c14be037000e4 100644
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -8,7 +8,7 @@
#include "base/path_service.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 "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
@@ -458,10 +458,9 @@ class WizardControllerBrokenLocalStateTest : public WizardControllerTest {
}
virtual void SetUpOnMainThread() OVERRIDE {
- PrefServiceBuilder builder;
- local_state_.reset(builder
- .WithUserPrefs(new PrefStoreStub())
- .Create(new PrefRegistrySimple()));
+ base::PrefServiceFactory factory;
+ factory.set_user_prefs(make_scoped_refptr(new PrefStoreStub()));
+ local_state_ = factory.Create(new PrefRegistrySimple()).Pass();
WizardController::set_local_state_for_testing(local_state_.get());
WizardControllerTest::SetUpOnMainThread();
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/content_settings/content_settings_pref_provider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698