Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/chromeos/login/user_manager_impl.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 "chrome/browser/chromeos/login/user_manager_impl.h"
 
 #include <cstddef>
 #include <set>
 #include <vector>
 
@@ skipping 11 matching lines @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cert_library.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/login/login_display.h"
 #include "chrome/browser/chromeos/login/remove_user_delegate.h"
 #include "chrome/browser/chromeos/login/user_image_manager_impl.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/power/session_length_limiter.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
+#include "chrome/browser/prefs/pref_registry_simple.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/cryptohome/async_method_caller.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 100 matching lines @@
     }
     users_vector->push_back(email);
   }
   users_set->erase(logged_in_user);
   return logged_in_user_on_list;
 }
 
 }  // namespace
 
 // static
-void UserManager::RegisterPrefs(PrefServiceSimple* local_state) {
+void UserManager::RegisterPrefs(PrefRegistrySimple* local_state) {
   local_state->RegisterListPref(kRegularUsers);
   local_state->RegisterListPref(kPublicAccounts);
   local_state->RegisterStringPref(kPublicAccountPendingDataRemoval, "");
   local_state->RegisterDictionaryPref(kUserOAuthTokenStatus);
   local_state->RegisterDictionaryPref(kUserDisplayName);
   local_state->RegisterDictionaryPref(kUserDisplayEmail);
   SessionLengthLimiter::RegisterPrefs(local_state);
 }
 
 UserManagerImpl::UserManagerImpl()
@@ skipping 848 matching lines @@
         device_local_account_policy_service_->GetBrokerForAccount(username);
     if (broker)
       display_name = broker->GetDisplayName();
   }
 
   // Set or clear the display name.
   SaveUserDisplayName(username, UTF8ToUTF16(display_name));
 }
 
 }  // namespace chromeos