Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/chromeos/login/user_image_manager_impl.cc

 // Copyright (c) 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 "chrome/browser/chromeos/login/user_image_manager_impl.h"
 
+#include "base/bind.h"
 #include "base/debug/trace_event.h"
-#include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
 #include "base/threading/worker_pool.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/default_user_images.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/user_image.h"
 #include "chrome/browser/chromeos/login/user_manager.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_downloader.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/url_constants.h"
 #include "ui/gfx/image/image_skia.h"
@@ skipping 128 matching lines @@
   }
 }
 
 }  // namespace
 
 // static
 int UserImageManagerImpl::user_image_migration_delay_sec =
     kUserImageMigrationDelaySec;
 
 // static
-void UserImageManager::RegisterPrefs(PrefServiceSimple* local_state) {
-  local_state->RegisterDictionaryPref(kUserImages);
-  local_state->RegisterDictionaryPref(kUserImageProperties);
+void UserImageManager::RegisterPrefs(PrefRegistrySimple* registry) {
+  registry->RegisterDictionaryPref(kUserImages);
+  registry->RegisterDictionaryPref(kUserImageProperties);
 }
 
 UserImageManagerImpl::UserImageManagerImpl()
     : image_loader_(new UserImageLoader(ImageDecoder::ROBUST_JPEG_CODEC)),
       unsafe_image_loader_(new UserImageLoader(ImageDecoder::DEFAULT_CODEC)),
       last_image_set_async_(false),
       downloaded_profile_image_data_url_(chrome::kAboutBlankURL),
       downloading_profile_image_(false),
       migrate_current_user_on_load_(false) {
 }
@@ skipping 556 matching lines @@
   if (prefs_images_update->GetDictionaryWithoutPathExpansion(
           username, &image_properties)) {
     std::string image_path;
     image_properties->GetString(kImagePathNodeName, &image_path);
     prefs_images_update->RemoveWithoutPathExpansion(username, NULL);
     DeleteImageFile(image_path);
   }
 }
 
 }  // namespace chromeos