Revert of Initialize default audio device ID with explicit device ID.

content/browser/renderer_host/media/media_stream_manager.cc

Index: content/browser/renderer_host/media/media_stream_manager.cc
diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc
index f4d75f0a66f5e11f4afb499029ccdb0b35c74666..2711aac7ce99c23aed5401e5a251fea86f556e35 100644
--- a/content/browser/renderer_host/media/media_stream_manager.cc
+++ b/content/browser/renderer_host/media/media_stream_manager.cc
@@ -805,18 +805,13 @@
           .c_str());
 }
 
-bool MediaStreamManager::PickDeviceId(MediaStreamType type,
-                                      const std::string& salt,
+bool MediaStreamManager::PickDeviceId(const std::string& salt,
                                       const url::Origin& security_origin,
                                       const TrackControls& controls,
                                       const MediaDeviceInfoArray& devices,
                                       std::string* device_id) const {
   if (controls.device_id.empty())
     return true;
-  if (type == MEDIA_DEVICE_AUDIO_CAPTURE &&
-      media::AudioDeviceDescription::IsDefaultDevice(controls.device_id)) {
-    return true;
-  }
 
   if (!GetDeviceIDFromHMAC(salt, security_origin, controls.device_id, devices,
                            device_id)) {
@@ -832,10 +827,10 @@
     const MediaDeviceInfoArray& devices,
     std::string* device_id) const {
   if (type == MEDIA_DEVICE_AUDIO_CAPTURE) {
-    return PickDeviceId(type, request->salt, request->security_origin,
+    return PickDeviceId(request->salt, request->security_origin,
                         request->controls.audio, devices, device_id);
   } else if (type == MEDIA_DEVICE_VIDEO_CAPTURE) {
-    return PickDeviceId(type, request->salt, request->security_origin,
+    return PickDeviceId(request->salt, request->security_origin,
                         request->controls.video, devices, device_id);
   } else {
     NOTREACHED();