Revert 150491 - refactor EnumerateDevices to make it a persistent request.

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 82 matching lines @@
 void MediaStreamDispatcherHost::DevicesEnumerated(
     const std::string& label,
     const StreamDeviceInfoArray& devices) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DVLOG(1) << "MediaStreamDispatcherHost::DevicesEnumerated("
            << ", {label = " << label <<  "})";
 
   StreamMap::iterator it = streams_.find(label);
   DCHECK(it != streams_.end());
   StreamRequest request = it->second;
+  streams_.erase(it);
 
   Send(new MediaStreamMsg_DevicesEnumerated(
-      request.render_view_id, request.page_request_id, label, devices));
+      request.render_view_id, request.page_request_id, devices));
 }
 
 void MediaStreamDispatcherHost::DeviceOpened(
     const std::string& label,
     const StreamDeviceInfo& video_device) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DVLOG(1) << "MediaStreamDispatcherHost::DeviceOpened("
            << ", {label = " << label <<  "})";
 
   StreamMap::iterator it = streams_.find(label);
@@ skipping 72 matching lines @@
     }
   }
 }
 
 void MediaStreamDispatcherHost::OnStopGeneratedStream(
     int render_view_id, const std::string& label) {
   DVLOG(1) << "MediaStreamDispatcherHost::OnStopGeneratedStream("
            << ", {label = " << label <<  "})";
 
   StreamMap::iterator it = streams_.find(label);
+  DCHECK(it != streams_.end());
   GetManager()->StopGeneratedStream(label);
   streams_.erase(it);
 }
 
 void MediaStreamDispatcherHost::OnEnumerateDevices(
     int render_view_id,
     int page_request_id,
     media_stream::MediaStreamType type,
     const GURL& security_origin) {
   DVLOG(1) << "MediaStreamDispatcherHost::OnEnumerateDevices("
@@ skipping 27 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