Fix special character handling in audio preferences.

chrome/browser/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 "chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 15 matching lines @@
 const int kPrefMuteOn = 1;
 
 // Gets the device id string for storing audio preference. The format of
 // device string is a string consisting of 3 parts.
 // |device_name| : |integer from lower 32 bit of device id| :
 // |0(output device) or 1(input device)|
 // If an audio device has both integrated input and output devices, the first 2
 // parts of the string could be identical, only the last part will differentiate
 // them.
 std::string GetDeviceIdString(const chromeos::AudioDevice& device) {
-  return device.device_name + " : " +
-         base::Uint64ToString(device.id & static_cast<uint64>(0xffffffff)) +
-         " : " + (device.is_input ? "1" : "0");
+  std::string device_id_string =
+      device.device_name + " : " +
+      base::Uint64ToString(device.id & static_cast<uint64>(0xffffffff)) +
+      " : " + (device.is_input ? "1" : "0");
+  // Replace any periods from the device id string with a space, since setting
+  // names cannot contain periods.
+  std::replace(device_id_string.begin(), device_id_string.end(), '.', ' ');
+  return device_id_string;
 }
 
 }  // namespace
 
 namespace chromeos {
 
 double AudioDevicesPrefHandlerImpl::GetOutputVolumeValue(
     const AudioDevice* device) {
   if (!device)
     return kDefaultOutputVolume;
@@ skipping 58 matching lines @@
   UpdateDevicesVolumePref();
 
   std::string device_id_str = GetDeviceIdString(device);
   if (!device_volume_settings_->HasKey(device_id_str))
     MigrateDeviceVolumeSettings(device_id_str);
 
   // TODO(jennyz, rkc): Return a meaningful input gain default value, when
   // cras has added support for normalizing input gain range.
   double value = device.is_input ?
       0.0 : GetDeviceDefaultOutputVolume(device);
+  // TODO(rkc): The above code is completely ignored since we 'always' have a
+  // default pref value. Fix this. http://crbug.com/442489
   device_volume_settings_->GetDouble(device_id_str, &value);
 
   return value;
 }
 
 double AudioDevicesPrefHandlerImpl::GetDeviceDefaultOutputVolume(
     const AudioDevice& device) {
   if (device.type == AUDIO_TYPE_HDMI)
     return kDefaultHDMIOutputVolume;
   else
     return kDefaultOutputVolume;
 }
 
 AudioDevicesPrefHandlerImpl::AudioDevicesPrefHandlerImpl(
     PrefService* local_state)
     : device_mute_settings_(new base::DictionaryValue()),
       device_volume_settings_(new base::DictionaryValue()),
       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);
   pref_change_registrar_.Add(prefs::kAudioCaptureAllowed, callback);
 }
 
@@ skipping 72 matching lines @@
   registry->RegisterIntegerPref(prefs::kAudioMute, kPrefMuteOff);
 }
 
 // static
 AudioDevicesPrefHandler* AudioDevicesPrefHandler::Create(
     PrefService* local_state) {
   return new AudioDevicesPrefHandlerImpl(local_state);
 }
 
 }  // namespace chromeos