Implement CancelUserMediaRequest for the browser part

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/bind.h"
 #include "base/logging.h"
@@ skipping 244 matching lines @@
                            audio_source_vector);
   WebKit::WebVector<WebKit::WebMediaStreamSource> video_source_vector(
       video_array.size());
   CreateWebKitSourceVector(label, video_array,
                            WebKit::WebMediaStreamSource::TypeVideo,
                            video_source_vector);
 
   MediaRequestMap::iterator it = user_media_requests_.find(request_id);
   if (it == user_media_requests_.end()) {
     DVLOG(1) << "Request ID not found";
+    media_stream_dispatcher_->StopStream(label);
     return;
   }
 
   LocalNativeStreamPtr native_stream(CreateNativeLocalMediaStream(
       label, it->second.frame_, audio_source_vector, video_source_vector));
   if (!native_stream.get()) {
     DVLOG(1) << "Failed to create native stream in OnStreamGenerated.";
     media_stream_dispatcher_->StopStream(label);
     it->second.request_.requestFailed();
     user_media_requests_.erase(it);
@@ skipping 72 matching lines @@
   NOTIMPLEMENTED();
 }
 
 void MediaStreamImpl::OnDeviceOpenFailed(int request_id) {
   DVLOG(1) << "MediaStreamImpl::VideoDeviceOpenFailed("
            << request_id << ")";
   NOTIMPLEMENTED();
 }
 
 void MediaStreamImpl::FrameWillClose(WebKit::WebFrame* frame) {
+  MediaRequestMap::iterator request_it = user_media_requests_.begin();
+  while (request_it != user_media_requests_.end()) {
+    if (request_it->second.frame_ == frame) {
+      DVLOG(1) << "MediaStreamImpl::FrameWillClose: "
+               << "Cancel user media request " << request_it->first;
+      cancelUserMediaRequest(request_it->second.request_);
+      request_it = user_media_requests_.begin();
+    } else {
+      ++request_it;
+    }
+  }
   LocalNativeStreamMap::iterator it = local_media_streams_.begin();
   while (it != local_media_streams_.end()) {
     if (it->second == frame) {
       DVLOG(1) << "MediaStreamImpl::FrameWillClose: "
                << "Stopping stream " << it->first;
       media_stream_dispatcher_->StopStream(it->first);
       local_media_streams_.erase(it);
       it = local_media_streams_.begin();
     } else {
       ++it;
@@ skipping 202 matching lines @@
 MediaStreamExtraData::MediaStreamExtraData(
     webrtc::MediaStreamInterface* remote_stream)
     : remote_stream_(remote_stream) {
 }
 MediaStreamExtraData::MediaStreamExtraData(
     webrtc::LocalMediaStreamInterface* local_stream)
     : local_stream_(local_stream) {
 }
 MediaStreamExtraData::~MediaStreamExtraData() {
 }