Re-added OnChannelClosing in MediaStreamDispatcherHost to close open media devices.

content/browser/renderer_host/media/media_stream_dispatcher_host.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_dispatcher_host.h"
 
 #include "content/public/browser/resource_context.h"
 #include "content/common/media/media_stream_messages.h"
 #include "content/common/media/media_stream_options.h"
 
@@ skipping 39 matching lines @@
                         OnOpenDevice)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP_EX()
   return handled;
 }
 
 void MediaStreamDispatcherHost::OnChannelClosing() {
   BrowserMessageFilter::OnChannelClosing();
   DVLOG(1) << "MediaStreamDispatcherHost::OnChannelClosing";
 
-  // TODO(mflodman) Remove this temporary solution when shut-down issue is
-  // resolved, i.e. uncomment the code below.
-  // Since the IPC channel is gone, close all requested VideCaptureDevices and
-  // cancel pending requests.
-//  manager()->CancelRequests(this);
-//  for (StreamMap::iterator it = streams_.begin();
-//       it != streams_.end();
-//       it++) {
-//    std::string label = it->first;
-//    manager()->StopGeneratedStream(label);
-//  }
+  // Since the IPC channel is gone, cancel pending requests and close all
+  // requested VideCaptureDevices.
+  manager()->CancelRequests(this);
+  for (StreamMap::iterator it = streams_.begin();
+       it != streams_.end();
+       it++) {
+    std::string label = it->first;

[tommi (sloooow) - chröme, 2012/02/23 10:03:22]

no need to create an extra string copy. should just be:
manager()->StopGeneratedStream(it->first);

+    manager()->StopGeneratedStream(label);
+  }
 }
 
 void MediaStreamDispatcherHost::OnGenerateStream(
     int render_view_id,
     int page_request_id,
     const media_stream::StreamOptions& components,
     const std::string& security_origin) {
   DVLOG(1) << "MediaStreamDispatcherHost::OnGenerateStream("
            << render_view_id << ", "
            << page_request_id << ", [ "
@@ skipping 178 matching lines @@
   StreamMap::iterator it = streams_.find(label);
   DCHECK(it != streams_.end());
   StreamRequest request = it->second;
   streams_.erase(it);
 
   Send(new MediaStreamMsg_DeviceOpenFailed(request.render_view_id,
                                            request.page_request_id));
 }
 
 }  // namespace media_stream