Changed name of MediaStreamImpl to UserMediaClientImpl.

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}

content/content_renderer.gypi

@@ -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',
@@ -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',

content/content_tests.gypi

@@ -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',
@@ -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',

content/renderer/media/media_stream_audio_source.cc

@@ -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;

content/renderer/media/media_stream_dispatcher.cc

@@ -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) {

content/renderer/media/media_stream_impl.h → content/renderer/media/user_media_client_impl.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
-#define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
+#ifndef CONTENT_RENDERER_MEDIA_USER_MEDIA_CLIENT_IMPL_H_
+#define CONTENT_RENDERER_MEDIA_USER_MEDIA_CLIENT_IMPL_H_
 
 #include <string>
 #include <vector>
@@ -33,23 +33,23 @@ class MediaStreamDispatcher;
 class MediaStreamVideoSource;
 class VideoCapturerDelegate;
 
-// MediaStreamImpl is a delegate for the Media Stream GetUserMedia API.
+// UserMediaClientImpl is a delegate for the Media Stream GetUserMedia API.
 // It ties together WebKit and MediaStreamManager
 // (via MediaStreamDispatcher and MediaStreamDispatcherHost)
 // in the browser process. It must be created, called and destroyed on the
 // render thread.
-class CONTENT_EXPORT MediaStreamImpl
+class CONTENT_EXPORT UserMediaClientImpl
     : public RenderFrameObserver,
       NON_EXPORTED_BASE(public blink::WebUserMediaClient),
       public MediaStreamDispatcherEventHandler,
       NON_EXPORTED_BASE(public base::NonThreadSafe) {
  public:
   // |render_frame| and |dependency_factory| must outlive this instance.
-  MediaStreamImpl(
+  UserMediaClientImpl(
       RenderFrame* render_frame,
       PeerConnectionDependencyFactory* dependency_factory,
       scoped_ptr<MediaStreamDispatcher> media_stream_dispatcher);
-  virtual ~MediaStreamImpl();
+  virtual ~UserMediaClientImpl();
 
   MediaStreamDispatcher* media_stream_dispatcher() const {
     return media_stream_dispatcher_.get();
@@ -230,7 +230,7 @@ class CONTENT_EXPORT MediaStreamImpl
   // audio.
   PeerConnectionDependencyFactory* const dependency_factory_;
 
-  // MediaStreamImpl owns MediaStreamDispatcher instead of RenderFrameImpl
+  // UserMediaClientImpl owns MediaStreamDispatcher instead of RenderFrameImpl
   // (or RenderFrameObserver) to ensure tear-down occurs in the right order.
   const scoped_ptr<MediaStreamDispatcher> media_stream_dispatcher_;
 
@@ -243,11 +243,11 @@ class CONTENT_EXPORT MediaStreamImpl
 
   // Note: This member must be the last to ensure all outstanding weak pointers
   // are invalidated first.
-  base::WeakPtrFactory<MediaStreamImpl> weak_factory_;
+  base::WeakPtrFactory<UserMediaClientImpl> weak_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl);
+  DISALLOW_COPY_AND_ASSIGN(UserMediaClientImpl);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
+#endif  // CONTENT_RENDERER_MEDIA_USER_MEDIA_CLIENT_IMPL_H_

content/renderer/render_frame_impl.cc

@@ -68,10 +68,10 @@
 #include "content/renderer/media/audio_renderer_mixer_manager.h"
 #include "content/renderer/media/crypto/encrypted_media_player_support_impl.h"
 #include "content/renderer/media/media_stream_dispatcher.h"
-#include "content/renderer/media/media_stream_impl.h"
 #include "content/renderer/media/media_stream_renderer_factory.h"
 #include "content/renderer/media/midi_dispatcher.h"
 #include "content/renderer/media/render_media_log.h"
+#include "content/renderer/media/user_media_client_impl.h"
 #include "content/renderer/media/webcontentdecryptionmodule_impl.h"
 #include "content/renderer/media/webmediaplayer_impl.h"
 #include "content/renderer/media/webmediaplayer_ms.h"
@@ -3754,7 +3754,7 @@ void RenderFrameImpl::InitializeUserMediaClient() {
 
 #if defined(ENABLE_WEBRTC)
   DCHECK(!web_user_media_client_);
-  web_user_media_client_ = new MediaStreamImpl(
+  web_user_media_client_ = new UserMediaClientImpl(
       this,
       RenderThreadImpl::current()->GetPeerConnectionDependencyFactory(),
       make_scoped_ptr(new MediaStreamDispatcher(this)).Pass());

content/renderer/render_frame_impl.h

@@ -62,7 +62,6 @@ class ChildFrameCompositingHelper;
 class ExternalPopupMenu;
 class GeolocationDispatcher;
 class MediaStreamDispatcher;
-class MediaStreamImpl;
 class MediaStreamRendererFactory;
 class MidiDispatcher;
 class NotificationPermissionDispatcher;
@@ -78,6 +77,7 @@ class RenderViewImpl;
 class RenderWidget;
 class RenderWidgetFullscreenPepper;
 class ScreenOrientationDispatcher;
+class UserMediaClientImpl;
 struct CustomContextMenuContext;
 
 class CONTENT_EXPORT RenderFrameImpl
@@ -681,7 +681,7 @@ class CONTENT_EXPORT RenderFrameImpl
   NotificationProvider* notification_provider_;
 
   // Destroyed via the RenderFrameObserver::OnDestruct() mechanism.
-  MediaStreamImpl* web_user_media_client_;
+  UserMediaClientImpl* web_user_media_client_;
 
   // MidiClient attached to this frame; lazily initialized.
   MidiDispatcher* midi_dispatcher_;