Reland review 34393006: Refactor MediaStreamManager to not output real device id.

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/browser/renderer_host/media/web_contents_capture_util.h"
 #include "content/common/media/media_stream_messages.h"
 #include "content/common/media/media_stream_options.h"
@@ skipping 119 matching lines @@
            << render_view_id << ", "
            << page_request_id << ", ["
            << " audio:" << components.audio_type
            << " video:" << components.video_type
            << " ], "
            << security_origin.spec() << ")";
 
   const std::string& label = media_stream_manager_->GenerateStream(
       this, render_process_id_, render_view_id, page_request_id,
       components, security_origin);
-  if (label.empty()) {
-    Send(new MediaStreamMsg_StreamGenerationFailed(render_view_id,
-                                                   page_request_id));
-  } else {
-    StoreRequest(render_view_id, page_request_id, label);
-  }
+  CHECK(!label.empty());
+  StoreRequest(render_view_id, page_request_id, label);
 }
 
 void MediaStreamDispatcherHost::OnCancelGenerateStream(int render_view_id,
                                                        int page_request_id) {
   DVLOG(1) << "MediaStreamDispatcherHost::OnCancelGenerateStream("
            << render_view_id << ", "
            << page_request_id << ")";
 
   for (StreamMap::iterator it = streams_.begin(); it != streams_.end(); ++it) {
     if (it->second.render_view_id == render_view_id &&
@@ skipping 92 matching lines @@
 MediaStreamDispatcherHost::StreamRequest
 MediaStreamDispatcherHost::PopRequest(const std::string& label) {
   StreamMap::iterator it = streams_.find(label);
   CHECK(it != streams_.end());
   StreamRequest request = it->second;
   streams_.erase(it);
   return request;
 }
 
 }  // namespace content