Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(57)

Unified Diff: content/renderer/media/mock_media_stream_dispatcher.cc

Issue 10928043: Media Related changes for TabCapture API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rename REQUEST_*->MEDIA_REQUEST_* Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/mock_media_stream_dispatcher.cc
diff --git a/content/renderer/media/mock_media_stream_dispatcher.cc b/content/renderer/media/mock_media_stream_dispatcher.cc
index 288bcef80943875c0dc8269db0cdac01c113f643..5eb18d1f2500cbf12099e14235673695421026d0 100644
--- a/content/renderer/media/mock_media_stream_dispatcher.cc
+++ b/content/renderer/media/mock_media_stream_dispatcher.cc
@@ -18,7 +18,7 @@ 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;
@@ -44,36 +44,6 @@ void MockMediaStreamDispatcher::GenerateStream(
}
}
-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_;
}

Powered by Google App Engine
This is Rietveld 408576698