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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/renderer/media/media_stream_dispatcher_unittest.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
« content/common/media/video_capture.h ('K') | « content/renderer/media/media_stream_dispatcher_eventhandler.h ('k') | content/renderer/media/media_stream_impl.h » ('j') | content/renderer/media/video_capture_message_filter_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/media_stream_dispatcher_unittest.cc
===================================================================
--- content/renderer/media/media_stream_dispatcher_unittest.cc (revision 164646)
+++ content/renderer/media/media_stream_dispatcher_unittest.cc (working copy)
@@ -40,8 +40,8 @@
virtual void OnStreamGenerated(
int request_id,
const std::string &label,
- const media_stream::StreamDeviceInfoArray& audio_device_array,
- const media_stream::StreamDeviceInfoArray& video_device_array) OVERRIDE {
+ const StreamDeviceInfoArray& audio_device_array,
+ const StreamDeviceInfoArray& video_device_array) OVERRIDE {
request_id_ = request_id;
label_ = label;
}
@@ -52,7 +52,7 @@
virtual void OnDevicesEnumerated(
int request_id,
- const media_stream::StreamDeviceInfoArray& device_array) OVERRIDE {
+ const StreamDeviceInfoArray& device_array) OVERRIDE {
request_id_ = request_id;
}
@@ -63,7 +63,7 @@
virtual void OnDeviceOpened(
int request_id,
const std::string& label,
- const media_stream::StreamDeviceInfo& video_device) OVERRIDE {
+ const StreamDeviceInfo& video_device) OVERRIDE {
request_id_ = request_id;
label_ = label;
}
@@ -85,7 +85,7 @@
scoped_ptr<MediaStreamDispatcher> dispatcher(new MediaStreamDispatcher(NULL));
scoped_ptr<MockMediaStreamDispatcherEventHandler>
handler(new MockMediaStreamDispatcherEventHandler);
- media_stream::StreamOptions components(kAudioType, kVideoType);
+ StreamOptions components(kAudioType, kVideoType);
GURL security_origin;
int ipc_request_id1 = dispatcher->next_ipc_id_;
@@ -97,15 +97,15 @@
components, security_origin);
EXPECT_EQ(dispatcher->requests_.size(), size_t(2));
- media_stream::StreamDeviceInfoArray audio_device_array(1);
- media_stream::StreamDeviceInfo audio_device_info;
+ StreamDeviceInfoArray audio_device_array(1);
+ StreamDeviceInfo audio_device_info;
audio_device_info.name = "Microphone";
audio_device_info.stream_type = kAudioType;
audio_device_info.session_id = kAudioSessionId;
audio_device_array[0] = audio_device_info;
- media_stream::StreamDeviceInfoArray video_device_array(1);
- media_stream::StreamDeviceInfo video_device_info;
+ StreamDeviceInfoArray video_device_array(1);
+ StreamDeviceInfo video_device_info;
video_device_info.name = "Camera";
video_device_info.stream_type = kVideoType;
video_device_info.session_id = kVideoSessionId;
@@ -137,16 +137,16 @@
// Stop stream2.
dispatcher->StopStream(stream_label2);
EXPECT_EQ(dispatcher->audio_session_id(stream_label2, 0),
- media_stream::StreamDeviceInfo::kNoId);
+ StreamDeviceInfo::kNoId);
EXPECT_EQ(dispatcher->video_session_id(stream_label2, 0),
- media_stream::StreamDeviceInfo::kNoId);
+ StreamDeviceInfo::kNoId);
// Stop stream1.
dispatcher->StopStream(stream_label1);
EXPECT_EQ(dispatcher->audio_session_id(stream_label1, 0),
- media_stream::StreamDeviceInfo::kNoId);
+ StreamDeviceInfo::kNoId);
EXPECT_EQ(dispatcher->video_session_id(stream_label1, 0),
- media_stream::StreamDeviceInfo::kNoId);
+ StreamDeviceInfo::kNoId);
EXPECT_EQ(dispatcher->label_stream_map_.size(), size_t(0));
// Verify that the request has been completed.
@@ -161,7 +161,7 @@
scoped_ptr<MediaStreamDispatcher> dispatcher(new MediaStreamDispatcher(NULL));
scoped_ptr<MockMediaStreamDispatcherEventHandler>
handler(new MockMediaStreamDispatcherEventHandler);
- media_stream::StreamOptions components(kNoAudioType, kVideoType);
+ StreamOptions components(kNoAudioType, kVideoType);
components.audio_device_id = kDeviceId;
components.video_device_id = kDeviceId;
GURL security_origin;
@@ -176,10 +176,10 @@
EXPECT_EQ(dispatcher->requests_.size(), size_t(2));
// No audio requested.
- media_stream::StreamDeviceInfoArray audio_device_array;
+ StreamDeviceInfoArray audio_device_array;
- media_stream::StreamDeviceInfoArray video_device_array(1);
- media_stream::StreamDeviceInfo video_device_info;
+ StreamDeviceInfoArray video_device_array(1);
+ StreamDeviceInfo video_device_info;
video_device_info.name = "Fake Video Capture Device";
video_device_info.stream_type = kVideoType;
video_device_info.session_id = kVideoSessionId;
@@ -210,16 +210,16 @@
// Stop stream2.
dispatcher->StopStream(stream_label2);
EXPECT_EQ(dispatcher->audio_session_id(stream_label2, 0),
- media_stream::StreamDeviceInfo::kNoId);
+ StreamDeviceInfo::kNoId);
EXPECT_EQ(dispatcher->video_session_id(stream_label2, 0),
- media_stream::StreamDeviceInfo::kNoId);
+ StreamDeviceInfo::kNoId);
// Stop stream1.
dispatcher->StopStream(stream_label1);
EXPECT_EQ(dispatcher->audio_session_id(stream_label1, 0),
- media_stream::StreamDeviceInfo::kNoId);
+ StreamDeviceInfo::kNoId);
EXPECT_EQ(dispatcher->video_session_id(stream_label1, 0),
- media_stream::StreamDeviceInfo::kNoId);
+ StreamDeviceInfo::kNoId);
EXPECT_EQ(dispatcher->label_stream_map_.size(), size_t(0));
// Verify that the request has been completed.
@@ -249,8 +249,8 @@
security_origin);
EXPECT_EQ(dispatcher->video_enumeration_state_.requests.size(), size_t(2));
- media_stream::StreamDeviceInfoArray video_device_array(1);
- media_stream::StreamDeviceInfo video_device_info;
+ StreamDeviceInfoArray video_device_array(1);
+ StreamDeviceInfo video_device_info;
video_device_info.name = "Camera";
video_device_info.device_id = "device_path";
video_device_info.stream_type = kVideoType;
@@ -301,12 +301,12 @@
// Stop stream2.
dispatcher->StopStream(stream_label2);
EXPECT_EQ(dispatcher->video_session_id(stream_label2, 0),
- media_stream::StreamDeviceInfo::kNoId);
+ StreamDeviceInfo::kNoId);
// Stop stream1.
dispatcher->StopStream(stream_label1);
EXPECT_EQ(dispatcher->video_session_id(stream_label1, 0),
- media_stream::StreamDeviceInfo::kNoId);
+ StreamDeviceInfo::kNoId);
EXPECT_EQ(dispatcher->label_stream_map_.size(), size_t(0));
// Verify that the request have been completed.
@@ -319,7 +319,7 @@
scoped_ptr<MediaStreamDispatcher> dispatcher(new MediaStreamDispatcher(NULL));
scoped_ptr<MockMediaStreamDispatcherEventHandler>
handler(new MockMediaStreamDispatcherEventHandler);
- media_stream::StreamOptions components(kAudioType, kVideoType);
+ StreamOptions components(kAudioType, kVideoType);
GURL security_origin;
// Test failure when creating a stream.
@@ -338,15 +338,15 @@
dispatcher->GenerateStream(kRequestId1, handler.get()->AsWeakPtr(),
components, security_origin);
- media_stream::StreamDeviceInfoArray audio_device_array(1);
- media_stream::StreamDeviceInfo audio_device_info;
+ StreamDeviceInfoArray audio_device_array(1);
+ StreamDeviceInfo audio_device_info;
audio_device_info.name = "Microphone";
audio_device_info.stream_type = kAudioType;
audio_device_info.session_id = kAudioSessionId;
audio_device_array[0] = audio_device_info;
- media_stream::StreamDeviceInfoArray video_device_array(1);
- media_stream::StreamDeviceInfo video_device_info;
+ StreamDeviceInfoArray video_device_array(1);
+ StreamDeviceInfo video_device_info;
video_device_info.name = "Camera";
video_device_info.stream_type = kVideoType;
video_device_info.session_id = kVideoSessionId;
@@ -371,7 +371,7 @@
scoped_ptr<MediaStreamDispatcher> dispatcher(new MediaStreamDispatcher(NULL));
scoped_ptr<MockMediaStreamDispatcherEventHandler>
handler(new MockMediaStreamDispatcherEventHandler);
- media_stream::StreamOptions components(kAudioType, kVideoType);
+ StreamOptions components(kAudioType, kVideoType);
int ipc_request_id1 = dispatcher->next_ipc_id_;
dispatcher->GenerateStream(kRequestId1, handler.get()->AsWeakPtr(),
@@ -384,18 +384,18 @@
EXPECT_EQ(1u, dispatcher->requests_.size());
// Complete the creation of stream1.
- media_stream::StreamDeviceInfo audio_device_info;
+ StreamDeviceInfo audio_device_info;
audio_device_info.name = "Microphone";
audio_device_info.stream_type = kAudioType;
audio_device_info.session_id = kAudioSessionId;
- media_stream::StreamDeviceInfoArray audio_device_array(1);
+ StreamDeviceInfoArray audio_device_array(1);
audio_device_array[0] = audio_device_info;
- media_stream::StreamDeviceInfo video_device_info;
+ StreamDeviceInfo video_device_info;
video_device_info.name = "Camera";
video_device_info.stream_type = kVideoType;
video_device_info.session_id = kVideoSessionId;
- media_stream::StreamDeviceInfoArray video_device_array(1);
+ StreamDeviceInfoArray video_device_array(1);
video_device_array[0] = video_device_info;
std::string stream_label1 = "stream1";
« content/common/media/video_capture.h ('K') | « content/renderer/media/media_stream_dispatcher_eventhandler.h ('k') | content/renderer/media/media_stream_impl.h » ('j') | content/renderer/media/video_capture_message_filter_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698