cros: Remove system-level policy for audio capture allowed

chromeos/audio/audio_devices_pref_handler_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 "chromeos/audio/audio_devices_pref_handler_impl.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 67 matching lines @@
   return (mute == kPrefMuteOn);
 }
 
 void AudioDevicesPrefHandlerImpl::SetMuteValue(const AudioDevice& device,
                                                bool mute) {
   device_mute_settings_->SetInteger(GetDeviceIdString(device),
                                     mute ? kPrefMuteOn : kPrefMuteOff);
   SaveDevicesMutePref();
 }
 
-
-bool AudioDevicesPrefHandlerImpl::GetAudioCaptureAllowedValue() {
-  if (audio_capture_allowed_pref_.empty())
-    return true;
-
-  return local_state_->GetBoolean(audio_capture_allowed_pref_);
-}
-
 bool AudioDevicesPrefHandlerImpl::GetAudioOutputAllowedValue() {
   return local_state_->GetBoolean(prefs::kAudioOutputAllowed);
 }
 
 void AudioDevicesPrefHandlerImpl::AddAudioPrefObserver(
     AudioPrefObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void AudioDevicesPrefHandlerImpl::RemoveAudioPrefObserver(
@@ skipping 22 matching lines @@
 
 double AudioDevicesPrefHandlerImpl::GetDeviceDefaultOutputVolume(
     const AudioDevice& device) {
   if (device.type == AUDIO_TYPE_HDMI)
     return kDefaultHdmiOutputVolumePercent;
   else
     return kDefaultOutputVolumePercent;
 }
 
 AudioDevicesPrefHandlerImpl::AudioDevicesPrefHandlerImpl(
-    PrefService* local_state,
-    const std::string& audio_capture_allowed_pref)
+    PrefService* local_state)
     : device_mute_settings_(new base::DictionaryValue()),
       device_volume_settings_(new base::DictionaryValue()),
-      local_state_(local_state),
-      audio_capture_allowed_pref_(audio_capture_allowed_pref) {
+      local_state_(local_state) {
   InitializePrefObservers();
 
   UpdateDevicesMutePref();
   UpdateDevicesVolumePref();
 }
 
 AudioDevicesPrefHandlerImpl::~AudioDevicesPrefHandlerImpl() {
 }
 
 void AudioDevicesPrefHandlerImpl::InitializePrefObservers() {
   pref_change_registrar_.Init(local_state_);
   base::Closure callback =
       base::Bind(&AudioDevicesPrefHandlerImpl::NotifyAudioPolicyChange,
                  base::Unretained(this));
   pref_change_registrar_.Add(prefs::kAudioOutputAllowed, callback);
-
-  if (!audio_capture_allowed_pref_.empty())
-    pref_change_registrar_.Add(audio_capture_allowed_pref_, callback);
 }
 
 void AudioDevicesPrefHandlerImpl::UpdateDevicesMutePref() {
   const base::DictionaryValue* mute_prefs =
       local_state_->GetDictionary(prefs::kAudioDevicesMute);
   if (mute_prefs)
     device_mute_settings_.reset(mute_prefs->DeepCopy());
 }
 
 void AudioDevicesPrefHandlerImpl::SaveDevicesMutePref() {
@@ skipping 41 matching lines @@
   SaveDevicesVolumePref();
 }
 
 void AudioDevicesPrefHandlerImpl::NotifyAudioPolicyChange() {
   FOR_EACH_OBSERVER(AudioPrefObserver,
                     observers_,
                     OnAudioPolicyPrefChanged());
 }
 
 // static
-void AudioDevicesPrefHandlerImpl::RegisterPrefs(
-    PrefRegistrySimple* registry,
-    const std::string& audio_capture_allowed_pref) {
+void AudioDevicesPrefHandlerImpl::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterDictionaryPref(prefs::kAudioDevicesVolumePercent);
   registry->RegisterDictionaryPref(prefs::kAudioDevicesMute);
 
   // Register the prefs backing the audio muting policies.
+  // Policy for audio input is handled by kAudioCaptureAllowed in the Chrome
+  // media system.
   registry->RegisterBooleanPref(prefs::kAudioOutputAllowed, true);
 
-  // This pref has moved to the media subsystem but we should verify it is there
-  // before we use it.
-  // NOTE: This registers the pref in the device-wide local state pref registry.
-  // In Chrome the media subsystem also registers kAudioCaptureAllowed in the
-  // per-user profile pref registry.
-  if (!audio_capture_allowed_pref.empty())
-    registry->RegisterBooleanPref(audio_capture_allowed_pref, true);
-
   // Register the legacy audio prefs for migration.
   registry->RegisterDoublePref(prefs::kAudioVolumePercent,
                                kDefaultOutputVolumePercent);
   registry->RegisterIntegerPref(prefs::kAudioMute, kPrefMuteOff);
 }
 
 }  // namespace chromeos