Do not pass the string device_id via IPC message to create an audio input stream

content/renderer/media/media_stream_impl.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/renderer/media/media_stream_impl.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
@@ skipping 110 matching lines @@
 
 MediaStreamImpl::~MediaStreamImpl() {
 }
 
 void MediaStreamImpl::OnLocalMediaStreamStop(
     const std::string& label) {
   DVLOG(1) << "MediaStreamImpl::OnLocalMediaStreamStop(" << label << ")";
 
   UserMediaRequestInfo* user_media_request = FindUserMediaRequestInfo(label);
   if (user_media_request) {
-    if (dependency_factory_->GetWebRtcAudioDevice()) {
-      scoped_refptr<WebRtcAudioCapturer> capturer =
-          dependency_factory_->GetWebRtcAudioDevice()->capturer();
-      if (capturer)
-        capturer->Stop();
-    }
+    dependency_factory_->StopLocalAudioSource(user_media_request->descriptor);
 
     media_stream_dispatcher_->StopStream(label);
     DeleteUserMediaRequestInfo(user_media_request);
   } else {
     DVLOG(1) << "MediaStreamImpl::OnLocalMediaStreamStop: the stream has "
              << "already been stopped.";
   }
 }
 
 void MediaStreamImpl::requestUserMedia(
@@ skipping 341 matching lines @@
 
   while (request_it != user_media_requests_.end()) {
     if ((*request_it)->frame == frame) {
       DVLOG(1) << "MediaStreamImpl::FrameWillClose: "
                << "Cancel user media request " << (*request_it)->request_id;
       // If the request is generated, it means that the MediaStreamDispatcher
       // has generated a stream for us and we need to let the
       // MediaStreamDispatcher know that the stream is no longer wanted.
       // If not, we cancel the request and delete the request object.
       if ((*request_it)->generated) {
+        // Stop the local audio track before closing the device in the browser.
+        dependency_factory_->StopLocalAudioSource((*request_it)->descriptor);
+
         media_stream_dispatcher_->StopStream(
             UTF16ToUTF8((*request_it)->descriptor.label()));
       } else {
         media_stream_dispatcher_->CancelGenerateStream(
             (*request_it)->request_id);
       }
       request_it = user_media_requests_.erase(request_it);
     } else {
       ++request_it;
     }
@@ skipping 81 matching lines @@
     const StreamStopCallback& stop_callback) {
   stream_stop_callback_ = stop_callback;
 }
 
 void MediaStreamExtraData::OnLocalStreamStop() {
   if (!stream_stop_callback_.is_null())
     stream_stop_callback_.Run(stream_->label());
 }
 
 }  // namespace content