Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/chromeos/audio/audio_handler.cc

Index: chrome/browser/chromeos/audio/audio_handler.cc
diff --git a/chrome/browser/chromeos/audio/audio_handler.cc b/chrome/browser/chromeos/audio/audio_handler.cc
index d5093192284afd179e236b9e170e132e56d09e4d..e6ff5bb2a961d7d6a926f824ecb2cd36a78aef2a 100644
--- a/chrome/browser/chromeos/audio/audio_handler.cc
+++ b/chrome/browser/chromeos/audio/audio_handler.cc
@@ -17,6 +17,7 @@
 #else
 #include "chrome/browser/chromeos/audio/audio_mixer_alsa.h"
 #endif
+#include "chrome/browser/prefs/pref_registry_simple.h"
 #include "chrome/browser/prefs/pref_service.h"

[Mattias Nissler (ping if slow), 2013/01/31 13:06:25]

required?

[Jói, 2013/01/31 13:43:42]

Removed.

 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
@@ -79,27 +80,18 @@ AudioHandler* AudioHandler::GetInstance() {
 }
 
 // static
-void AudioHandler::RegisterPrefs(PrefServiceSimple* local_state) {
-  if (!local_state->FindPreference(prefs::kAudioVolumePercent)) {
-    local_state->RegisterDoublePref(prefs::kAudioVolumePercent,
-                                    kDefaultVolumePercent);
-  }
-  if (!local_state->FindPreference(prefs::kAudioMute)) {
-    local_state->RegisterIntegerPref(prefs::kAudioMute,
-                                     kPrefMuteOff);
-  }
-
-  if (!local_state->FindPreference(prefs::kAudioOutputAllowed)) {
-    // Register the prefs backing the audio muting policies.
-    local_state->RegisterBooleanPref(prefs::kAudioOutputAllowed,
-                                     true);
-  }
+void AudioHandler::RegisterPrefs(PrefRegistrySimple* local_state) {
+  local_state->RegisterDoublePref(prefs::kAudioVolumePercent,
+                                  kDefaultVolumePercent);
+  local_state->RegisterIntegerPref(prefs::kAudioMute,
+                                   kPrefMuteOff);
+  // Register the prefs backing the audio muting policies.
+  local_state->RegisterBooleanPref(prefs::kAudioOutputAllowed,
+                                   true);
   // This pref has moved to the media subsystem but we should verify it is there
   // before we use it.
-  if (!local_state->FindPreference(prefs::kAudioCaptureAllowed)) {
-    local_state->RegisterBooleanPref(prefs::kAudioCaptureAllowed,
-                                     true);
-  }
+  local_state->RegisterBooleanPref(prefs::kAudioCaptureAllowed,
+                                   true);
 }
 
 double AudioHandler::GetVolumePercent() {