Skip to content

Commit

Permalink
Changed name of MediaStreamImpl to UserMediaClientImpl.
Browse files Browse the repository at this point in the history
UserMediaClientImpl's purpose is to implement blink::WebUserMediaClient and does not implement a MediaStream. Thus the class is renamed to reflect this.

BUG=409560

Review URL: https://codereview.chromium.org/524363003

Cr-Commit-Position: refs/heads/master@{#293132}
  • Loading branch information
perkj authored and Commit bot committed Sep 3, 2014
1 parent 84a5bad commit 1a2d043
Show file tree
Hide file tree
Showing 9 changed files with 180 additions and 174 deletions.
4 changes: 2 additions & 2 deletions content/content_renderer.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -607,8 +607,7 @@
'renderer/media/media_stream_audio_sink_owner.h',
'renderer/media/media_stream_audio_track_sink.h',
'renderer/media/media_stream_center.cc',
'renderer/media/media_stream_dispatcher.cc',
'renderer/media/media_stream_impl.cc',
'renderer/media/media_stream_dispatcher.cc',
'renderer/media/media_stream_registry_interface.h',
'renderer/media/media_stream_audio_source.cc',
'renderer/media/media_stream_audio_source.h',
Expand Down Expand Up @@ -650,6 +649,7 @@
'renderer/media/rtc_video_encoder_factory.h',
'renderer/media/rtc_video_renderer.cc',
'renderer/media/rtc_video_renderer.h',
'renderer/media/user_media_client_impl.cc',
'renderer/media/video_source_handler.cc',
'renderer/media/video_source_handler.h',
'renderer/media/video_track_adapter.cc',
Expand Down
2 changes: 1 addition & 1 deletion content/content_tests.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,6 @@
'renderer/media/media_stream_audio_processor_unittest.cc',
'renderer/media/media_stream_constraints_util_unittest.cc',
'renderer/media/media_stream_dispatcher_unittest.cc',
'renderer/media/media_stream_impl_unittest.cc',
'renderer/media/media_stream_video_capture_source_unittest.cc',
'renderer/media/media_stream_video_source_unittest.cc',
'renderer/media/media_stream_video_track_unittest.cc',
Expand All @@ -807,6 +806,7 @@
'renderer/media/mock_media_constraint_factory.cc',
'renderer/media/rtc_peer_connection_handler_unittest.cc',
'renderer/media/rtc_video_decoder_unittest.cc',
'renderer/media/user_media_client_impl_unittest.cc',
'renderer/media/video_source_handler_unittest.cc',
'renderer/media/webrtc/media_stream_remote_video_source_unittest.cc',
'renderer/media/webrtc/media_stream_track_metrics_unittest.cc',
Expand Down
8 changes: 4 additions & 4 deletions content/renderer/media/media_stream_audio_source.cc
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ void MediaStreamAudioSource::AddTrack(
constraints,
this)) {
// The source failed to start.
// MediaStreamImpl rely on the |stop_callback| to be triggered when the
// last track is removed from the source. But in this case, the source is
// is not even started. So we need to fail both adding the track and
// trigger |stop_callback|.
// UserMediaClientImpl rely on the |stop_callback| to be triggered when
// the last track is removed from the source. But in this case, the
// source is is not even started. So we need to fail both adding the
// track and trigger |stop_callback|.
callback.Run(this, MEDIA_DEVICE_TRACK_START_FAILURE, "");
StopSource();
return;
Expand Down
2 changes: 1 addition & 1 deletion content/renderer/media/media_stream_dispatcher.cc
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ void MediaStreamDispatcher::CloseDevice(const std::string& label) {
}

void MediaStreamDispatcher::OnDestruct() {
// Do not self-destruct. MediaStreamImpl owns |this|.
// Do not self-destruct. UserMediaClientImpl owns |this|.
}

bool MediaStreamDispatcher::Send(IPC::Message* message) {
Expand Down
Loading

0 comments on commit 1a2d043

Please sign in to comment.