Unit test for WebMediaPlayerMS

content/renderer/media/webmediaplayer_ms.cc

Index: content/renderer/media/webmediaplayer_ms.cc
diff --git a/content/renderer/media/webmediaplayer_ms.cc b/content/renderer/media/webmediaplayer_ms.cc
index 12de85cff6d8526ae051accc7757d3b613e2f357..3ad358e5c0bce5d6c0709b6ea3f9491360455f80 100644
--- a/content/renderer/media/webmediaplayer_ms.cc
+++ b/content/renderer/media/webmediaplayer_ms.cc
@@ -61,10 +61,12 @@ WebMediaPlayerMS::WebMediaPlayerMS(
       worker_task_runner_(worker_task_runner),
       gpu_factories_(gpu_factories),
       compositor_task_runner_(compositor_task_runner),
-      initial_audio_output_device_id_(sink_id.utf8()),
-      initial_security_origin_(security_origin) {
+      initial_audio_output_device_id_(sink_id.utf8()) {
   DVLOG(1) << __FUNCTION__;
   DCHECK(client);
+  if (!security_origin.isNull()) {

[mcasas, 2015/11/04 22:20:30]

no need for {}

actually, you should prefer initialization over assignment, i.e.
move this to the initializer list:

initial_security_origin_(security_origin.isNull() ? url::Origin() :
url::Origin(security_origin));

and probably you should keep |initial_security_origin_| const :)

[qiangchen, 2015/11/06 19:14:57]

Done. Nice idea.

+    initial_security_origin_ = url::Origin(security_origin);
+  }
   media_log_->AddEvent(
       media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED));
 }
@@ -117,9 +119,12 @@ void WebMediaPlayerMS::load(LoadType load_type,
       gpu_factories_);
 
   RenderFrame* const frame = RenderFrame::FromWebFrame(frame_);
-  audio_renderer_ = renderer_factory_->GetAudioRenderer(
-      url, frame->GetRoutingID(), initial_audio_output_device_id_,
-      initial_security_origin_);
+
+  if (frame) {
+    audio_renderer_ = renderer_factory_->GetAudioRenderer(
+        url, frame->GetRoutingID(), initial_audio_output_device_id_,
+        initial_security_origin_);
+  }
 
   if (!video_frame_provider_ && !audio_renderer_) {
     SetNetworkState(WebMediaPlayer::NetworkStateNetworkError);
@@ -452,4 +457,9 @@ void WebMediaPlayerMS::ResetCanvasCache() {
   DCHECK(thread_checker_.CalledOnValidThread());
   video_renderer_.ResetCache();
 }
+
+WebMediaPlayerMSCompositor* WebMediaPlayerMS::GetCompositorForTesting() {
+  return compositor_.get();
+}
+
 }  // namespace content