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

content/browser/renderer_host/media/media_stream_manager.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 "content/browser/renderer_host/media/media_stream_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 787 matching lines @@
     StopDevice(stream_type, session_id);
 
   AddLogMessageOnIOThread(
       base::StringPrintf(
           "Media input device removed: type=%s, id=%s, name=%s ",
           (stream_type == MEDIA_DEVICE_AUDIO_CAPTURE ? "audio" : "video"),
           device.device_id.c_str(), device.label.c_str())
           .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)) {
     LOG(WARNING) << "Invalid device ID = " << controls.device_id;
     return false;
   }
   return true;
 }
 
 bool MediaStreamManager::GetRequestedDeviceCaptureId(
     const DeviceRequest* request,
     MediaStreamType type,
     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();
   }
   return false;
 }
 
 void MediaStreamManager::TranslateDeviceIdToSourceId(
     DeviceRequest* request,
     MediaStreamDevice* device) {
@@ skipping 931 matching lines @@
     request->ui_proxy->OnStarted(
         base::Bind(&MediaStreamManager::StopMediaStreamFromBrowser,
                    base::Unretained(this), label),
         base::Bind(&MediaStreamManager::OnMediaStreamUIWindowId,
                    base::Unretained(this), request->video_type(),
                    request->devices));
   }
 }
 
 }  // namespace content