Revert 232766 "Refactor MediaStreamManager to never output real ..."

content/public/common/media_stream_request.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/public/common/media_stream_request.h"
 
 #include "base/logging.h"
 
 namespace content {
 
@@ skipping 44 matching lines @@
       name(name),
       input(sample_rate, channel_layout, frames_per_buffer) {
 }
 
 MediaStreamDevice::~MediaStreamDevice() {}
 
 MediaStreamRequest::MediaStreamRequest(
     int render_process_id,
     int render_view_id,
     int page_request_id,
+    const std::string& tab_capture_device_id,
     const GURL& security_origin,
     MediaStreamRequestType request_type,
     const std::string& requested_audio_device_id,
     const std::string& requested_video_device_id,
     MediaStreamType audio_type,
     MediaStreamType video_type)
     : render_process_id(render_process_id),
       render_view_id(render_view_id),
       page_request_id(page_request_id),
+      tab_capture_device_id(tab_capture_device_id),
       security_origin(security_origin),
       request_type(request_type),
       requested_audio_device_id(requested_audio_device_id),
       requested_video_device_id(requested_video_device_id),
       audio_type(audio_type),
       video_type(video_type) {
 }
 
 MediaStreamRequest::~MediaStreamRequest() {}
 
 }  // namespace content