Re-land: Add localized default audio device names.

media/audio/audio_manager_base.h

 // 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.
 
 #ifndef MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_
 #define MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_
 
 #include <string>
 #include <utility>
 
@@ skipping 10 matching lines @@
 #include "base/win/scoped_com_initializer.h"
 #endif
 
 namespace media {
 
 class AudioOutputDispatcher;
 
 // AudioManagerBase provides AudioManager functions common for all platforms.
 class MEDIA_EXPORT AudioManagerBase : public AudioManager {
  public:
-  // TODO(sergeyu): The constants below belong to AudioManager interface, not
-  // to the base implementation.
+  // TODO(ajm): Move these strings to AudioManager.
+  // Unique Id of the generic "default" device. Associated with the localized
+  // name returned from GetDefaultDeviceName().
+  static const char kDefaultDeviceId[];
 
-  // Name of the generic "default" device.
-  static const char kDefaultDeviceName[];
-  // Unique Id of the generic "default" device.
-  static const char kDefaultDeviceId[];
-  // Unique Id of the generic default communications device (where supported).
+  // Unique Id of the generic default communications device. Associated with
+  // the localized name returned from GetCommunicationsDeviceName().
   static const char kCommunicationsDeviceId[];
-  // Name of the generic default communications device (where supported).
-  static const char kCommunicationsDeviceName[];
 
   // Input device ID used to capture the default system playback stream. When
   // this device ID is passed to MakeAudioInputStream() the returned
   // AudioInputStream will be capturing audio currently being played on the
   // default playback device. At the moment this feature is supported only on
   // some platforms. AudioInputStream::Intialize() will return an error on
   // platforms that don't support it. GetInputStreamParameters() must be used
   // to get the parameters of the loopback device before creating a loopback
   // stream, otherwise stream initialization may fail.
   static const char kLoopbackInputDeviceId[];
@@ skipping 134 matching lines @@
 
   // Proxy for creating AudioLog objects.
   AudioLogFactory* const audio_log_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioManagerBase);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_