Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/chromeos/audio/audio_handler.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/audio/audio_handler.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "chrome/browser/browser_process.h"
 #if defined(USE_CRAS)
 #include "chrome/browser/chromeos/audio/audio_mixer_cras.h"
 #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"
 
 using std::max;
 using std::min;
 
 namespace chromeos {
 
 namespace {
 
@@ skipping 41 matching lines @@
 }
 
 // static
 AudioHandler* AudioHandler::GetInstance() {
   VLOG_IF(1, !g_audio_handler)
       << "AudioHandler::GetInstance() called with NULL global instance.";
   return g_audio_handler;
 }
 
 // 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() {
   return mixer_->GetVolumePercent();
 }
 
 void AudioHandler::SetVolumePercent(double volume_percent) {
   volume_percent = min(max(volume_percent, 0.0), 100.0);
   if (volume_percent <= kMuteThresholdPercent)
     volume_percent = 0.0;
@@ skipping 87 matching lines @@
   mixer_->SetCaptureMuteLocked(false);
   if (local_state_->GetBoolean(prefs::kAudioCaptureAllowed)) {
     mixer_->SetCaptureMuted(false);
   } else {
     mixer_->SetCaptureMuted(true);
     mixer_->SetCaptureMuteLocked(true);
   }
 }
 
 }  // namespace chromeos