Resolve the problems where we can leak the system tray UI

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/browser/browser_main_loop.h"
 #include "content/common/media/media_stream_messages.h"
 #include "content/common/media/media_stream_options.h"
 #include "googleurl/src/gurl.h"
@@ skipping 125 matching lines @@
                         OnOpenDevice)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP_EX()
   return handled;
 }
 
 void MediaStreamDispatcherHost::OnChannelClosing() {
   BrowserMessageFilter::OnChannelClosing();
   DVLOG(1) << "MediaStreamDispatcherHost::OnChannelClosing";
 
-  // Since the IPC channel is gone, cancel pending requests and close all
-  // requested VideoCaptureDevices.
-  GetManager()->CancelRequests(this);
+  // Since the IPC channel is gone, close all requesting/requested streams.
   for (StreamMap::iterator it = streams_.begin();
        it != streams_.end();
-       it++) {
+       ++it) {
     std::string label = it->first;
     GetManager()->StopGeneratedStream(label);
   }
+  // Clear the map after we have stopped all the streams.
+  streams_.clear();
 }
 
-MediaStreamDispatcherHost::~MediaStreamDispatcherHost() {}
+MediaStreamDispatcherHost::~MediaStreamDispatcherHost() {
+  DCHECK(streams_.empty());
+}
 
 void MediaStreamDispatcherHost::OnGenerateStream(
     int render_view_id,
     int page_request_id,
     const media_stream::StreamOptions& components,
     const GURL& security_origin) {
   DVLOG(1) << "MediaStreamDispatcherHost::OnGenerateStream("
            << render_view_id << ", "
            << page_request_id << ", [ "
            << (components.audio ? "audio " : "")
            << (components.video ? "video " : "")
            << "], "
            << security_origin.spec() << ")";
 
   std::string label;
   GetManager()->GenerateStream(this, render_process_id_, render_view_id,
-                            components, security_origin, &label);
+                               components, security_origin, &label);
   DCHECK(!label.empty());
   streams_[label] = StreamRequest(render_view_id, page_request_id);
 }
 
 void MediaStreamDispatcherHost::OnCancelGenerateStream(int render_view_id,
                                                        int page_request_id) {
   DVLOG(1) << "MediaStreamDispatcherHost::OnCancelGenerateStream("
            << render_view_id << ", "
            << page_request_id << ")";
 
@@ skipping 52 matching lines @@
                         device_id, type, security_origin, &label);
   DCHECK(!label.empty());
   streams_[label] = StreamRequest(render_view_id, page_request_id);
 }
 
 MediaStreamManager* MediaStreamDispatcherHost::GetManager() {
   return BrowserMainLoop::GetMediaStreamManager();
 }
 
 }  // namespace media_stream