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

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

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix double registration in Chrome Frame test. Created 7 years, 10 months 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/user_manager_unittest.cc
diff --git a/chrome/browser/chromeos/login/user_manager_unittest.cc b/chrome/browser/chromeos/login/user_manager_unittest.cc
index 475ad119ae391ce26da42b91e490cbf6ce95b67a..325f225903fe67be1c211f4f76a7d7179b999d5c 100644
--- a/chrome/browser/chromeos/login/user_manager_unittest.cc
+++ b/chrome/browser/chromeos/login/user_manager_unittest.cc
@@ -60,11 +60,11 @@ class UserManagerTest : public testing::Test {
local_state_.reset(new TestingPrefServiceSimple);
reinterpret_cast<TestingBrowserProcess*>(g_browser_process)
->SetLocalState(local_state_.get());
- UserManager::RegisterPrefs(local_state_.get());
+ UserManager::RegisterPrefs(local_state_->registry());
// Wallpaper manager and user image managers prefs will be accessed by the
// unit-test as well.
- UserImageManager::RegisterPrefs(local_state_.get());
- WallpaperManager::RegisterPrefs(local_state_.get());
+ UserImageManager::RegisterPrefs(local_state_->registry());
+ WallpaperManager::RegisterPrefs(local_state_->registry());
old_user_manager_ = UserManager::Get();
ResetUserManager();
« no previous file with comments | « chrome/browser/chromeos/login/user_manager_impl.cc ('k') | chrome/browser/chromeos/login/wallpaper_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698