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

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

Issue 2487133003: Remove dead code related to media device enumerations and monitoring. (Closed)
Patch Set: rebase Created 4 years, 1 month 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 89bef8f214fa21c7930d484477b3a55689118453..77bea1f5b417ed83fd7b5a7f4343d7204c2a29a3 100644
--- a/content/renderer/media/mock_media_stream_dispatcher.cc
+++ b/content/renderer/media/mock_media_stream_dispatcher.cc
@@ -18,8 +18,6 @@ namespace content {
MockMediaStreamDispatcher::MockMediaStreamDispatcher()
: MediaStreamDispatcher(NULL),
audio_input_request_id_(-1),
- audio_output_request_id_(-1),
- video_request_id_(-1),
request_stream_counter_(0),
stop_audio_device_counter_(0),
stop_video_device_counter_(0),
@@ -56,14 +54,6 @@ void MockMediaStreamDispatcher::CancelGenerateStream(
EXPECT_EQ(request_id, audio_input_request_id_);
}
-void MockMediaStreamDispatcher::EnumerateDevices(
- int request_id,
- const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,
- MediaStreamType type,
- const url::Origin& security_origin) {
- NOTREACHED();
-}
-
void MockMediaStreamDispatcher::StopStreamDevice(
const StreamDeviceInfo& device_info) {
if (IsAudioInputMediaType(device_info.device.type)) {
@@ -102,10 +92,6 @@ void MockMediaStreamDispatcher::AddAudioInputDeviceToArray(
if (matched_output) {
audio.device.matched_output_device_id =
kAudioOutputDeviceIdPrefix + base::IntToString(session_id_);
- audio.device.group_id =
- kAudioOutputDeviceIdPrefix + base::IntToString(session_id_);
- } else {
- audio.device.group_id = audio.device.id + "groupid";
}
audio.session_id = session_id_;
audio.device.input.sample_rate = media::AudioParameters::kAudioCDSampleRate;
@@ -114,18 +100,6 @@ void MockMediaStreamDispatcher::AddAudioInputDeviceToArray(
audio_input_array_.push_back(audio);
}
-void MockMediaStreamDispatcher::AddAudioOutputDeviceToArray() {
- StreamDeviceInfo audio;
- audio.device.id = kAudioOutputDeviceIdPrefix + base::IntToString(session_id_);
- audio.device.group_id =
- kAudioOutputDeviceIdPrefix + base::IntToString(session_id_);
- audio.device.name = "speaker";
- audio.device.type = MEDIA_DEVICE_AUDIO_OUTPUT;
- audio.device.video_facing = MEDIA_VIDEO_FACING_NONE;
- audio.session_id = session_id_;
- audio_output_array_.push_back(audio);
-}
-
void MockMediaStreamDispatcher::AddVideoDeviceToArray(bool facing_user) {
StreamDeviceInfo video;
video.device.id = test_same_id_ ? "test_id" : "video_device_id";
« no previous file with comments | « content/renderer/media/mock_media_stream_dispatcher.h ('k') | content/renderer/media/mock_media_stream_registry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698