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

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

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.h
diff --git a/content/renderer/media/mock_media_stream_dispatcher.h b/content/renderer/media/mock_media_stream_dispatcher.h
index 0735c53518be945c8f48c48d6e62f637de3051ba..d23f551786c0c483e2e8a64978f6322927e69920 100644
--- a/content/renderer/media/mock_media_stream_dispatcher.h
+++ b/content/renderer/media/mock_media_stream_dispatcher.h
@@ -28,19 +28,12 @@ class MockMediaStreamDispatcher : public MediaStreamDispatcher {
int request_id,
const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler)
override;
- void EnumerateDevices(
- int request_id,
- const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,
- MediaStreamType type,
- const url::Origin& security_origin) override;
void StopStreamDevice(const StreamDeviceInfo& device_info) override;
bool IsStream(const std::string& label) override;
int video_session_id(const std::string& label, int index) override;
int audio_session_id(const std::string& label, int index) override;
int audio_input_request_id() const { return audio_input_request_id_; }
- int audio_output_request_id() const { return audio_output_request_id_; }
- int video_request_id() const { return video_request_id_; }
int request_stream_counter() const { return request_stream_counter_; }
void IncrementSessionId() { ++session_id_; }
void TestSameId() { test_same_id_ = true; }
@@ -52,22 +45,13 @@ class MockMediaStreamDispatcher : public MediaStreamDispatcher {
const StreamDeviceInfoArray& audio_input_array() const {
return audio_input_array_;
}
- const StreamDeviceInfoArray& audio_output_array() const {
- return audio_output_array_;
- }
const StreamDeviceInfoArray& video_array() const { return video_array_; }
- size_t NumDeviceChangeSubscribers() const {
- return MediaStreamDispatcher::NumDeviceChangeSubscribers();
- }
private:
void AddAudioInputDeviceToArray(bool matched_output);
- void AddAudioOutputDeviceToArray();
void AddVideoDeviceToArray(bool facing_user);
int audio_input_request_id_;
- int audio_output_request_id_; // Only used for EnumerateDevices.
- int video_request_id_; // Only used for EnumerateDevices.
base::WeakPtr<MediaStreamDispatcherEventHandler> event_handler_;
int request_stream_counter_;
int stop_audio_device_counter_;
@@ -77,7 +61,6 @@ class MockMediaStreamDispatcher : public MediaStreamDispatcher {
int session_id_;
bool test_same_id_;
StreamDeviceInfoArray audio_input_array_;
- StreamDeviceInfoArray audio_output_array_;
StreamDeviceInfoArray video_array_;
DISALLOW_COPY_AND_ASSIGN(MockMediaStreamDispatcher);
« no previous file with comments | « content/renderer/media/media_stream_dispatcher_unittest.cc ('k') | content/renderer/media/mock_media_stream_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698