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

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

Issue 11339014: Move content\browser\renderer_host\media to content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: 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
===================================================================
--- content/renderer/media/mock_media_stream_dispatcher.cc (revision 164646)
+++ content/renderer/media/mock_media_stream_dispatcher.cc (working copy)
@@ -21,7 +21,7 @@
void MockMediaStreamDispatcher::GenerateStream(
int request_id,
const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,
- const media_stream::StreamOptions& components,
+ const StreamOptions& components,
const GURL& url) {
request_id_ = request_id;
@@ -30,7 +30,7 @@
video_array_.clear();
if (IsAudioMediaType(components.audio_type)) {
- media_stream::StreamDeviceInfo audio;
+ StreamDeviceInfo audio;
audio.device_id = "audio_device_id";
audio.name = "microphone";
audio.stream_type = components.audio_type;
@@ -38,7 +38,7 @@
audio_array_.push_back(audio);
}
if (IsVideoMediaType(components.video_type)) {
- media_stream::StreamDeviceInfo video;
+ StreamDeviceInfo video;
video.device_id = "video_device_id";
video.name = "usb video camera";
video.stream_type = components.video_type;

Powered by Google App Engine
This is Rietveld 408576698