Media Related changes for TabCapture API

content/renderer/media/mock_media_stream_dispatcher.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/renderer/media/mock_media_stream_dispatcher.h"
 
 #include "base/stringprintf.h"
 #include "content/public/common/media_stream_request.h"
 
 MockMediaStreamDispatcher::MockMediaStreamDispatcher()
     : MediaStreamDispatcher(NULL),
       request_id_(-1),
       stop_stream_counter_(0) {
 }
 
 MockMediaStreamDispatcher::~MockMediaStreamDispatcher() {}
 
 void MockMediaStreamDispatcher::GenerateStream(
     int request_id,
     const base::WeakPtr<MediaStreamDispatcherEventHandler>&,
-    media_stream::StreamOptions components,
+    const media_stream::StreamOptions& components,
     const GURL&) {
   request_id_ = request_id;
 
   stream_label_ = StringPrintf("%s%d","local_stream",request_id);
   audio_array_.clear();
   video_array_.clear();
 
   if (content::IsAudioMediaType(components.audio_type)) {
     media_stream::StreamDeviceInfo audio;
     audio.device_id = "audio_device_id";
     audio.name = "microphone";
     audio.stream_type = components.audio_type;
     audio.session_id = request_id;
     audio_array_.push_back(audio);
   }
   if (content::IsVideoMediaType(components.video_type)) {
     media_stream::StreamDeviceInfo video;
     video.device_id = "video_device_id";
     video.name = "usb video camera";
     video.stream_type = components.video_type;
     video.session_id = request_id;
     video_array_.push_back(video);
   }
 }
 
-void MockMediaStreamDispatcher::GenerateStreamForDevice(
-    int request_id,
-    const base::WeakPtr<MediaStreamDispatcherEventHandler>&,
-    media_stream::StreamOptions components,
-    const std::string& device_id,
-    const GURL&) {
-  request_id_ = request_id;
-
-  stream_label_ = StringPrintf("%s%d","local_stream",request_id);
-  audio_array_.clear();
-  video_array_.clear();
-
-  if (content::IsAudioMediaType(components.audio_type)) {
-    media_stream::StreamDeviceInfo audio;
-    audio.device_id = device_id;
-    audio.name = "Tab Audio Capture";
-    audio.stream_type = components.audio_type;
-    audio.session_id = request_id;
-    audio_array_.push_back(audio);
-  }
-  if (content::IsVideoMediaType(components.video_type)) {
-    media_stream::StreamDeviceInfo video;
-    video.device_id = device_id;
-    video.name = "Tab Video Capture";
-    video.stream_type = components.video_type;
-    video.session_id = request_id;
-    video_array_.push_back(video);
-  }
-}
-
 void MockMediaStreamDispatcher::StopStream(const std::string& label) {
   ++stop_stream_counter_;
 }
 
 bool MockMediaStreamDispatcher::IsStream(const std::string& label) {
   return true;
 }
 
 int MockMediaStreamDispatcher::video_session_id(const std::string& label,
                                                 int index) {
   return -1;
 }
 
 int MockMediaStreamDispatcher::audio_session_id(const std::string& label,
                                                 int index) {
   return -1;
 }