Unit test for WebMediaPlayerMS

content/renderer/media/webmediaplayer_ms.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/webmediaplayer_ms.h"
 
 #include <limits>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 43 matching lines @@
       client_(client),
       delegate_(delegate),
       paused_(true),
       received_first_frame_(false),
       media_log_(media_log),
       renderer_factory_(factory.Pass()),
       media_task_runner_(media_task_runner),
       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));
 }
 
 WebMediaPlayerMS::~WebMediaPlayerMS() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (compositor_)
     compositor_task_runner_->DeleteSoon(FROM_HERE, compositor_.release());
@@ skipping 32 matching lines @@
 
   video_frame_provider_ = renderer_factory_->GetVideoFrameProvider(
       url,
       base::Bind(&WebMediaPlayerMS::OnSourceError, AsWeakPtr()),
       base::Bind(&WebMediaPlayerMS::OnFrameAvailable, AsWeakPtr()),
       media_task_runner_,
       worker_task_runner_,
       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);
     return;
   }
 
   if (audio_renderer_) {
     audio_renderer_->SetVolume(DEFAULT_AUDIO_VOLUME);
     audio_renderer_->Start();
   }
@@ skipping 312 matching lines @@
 }
 
 media::SkCanvasVideoRenderer* WebMediaPlayerMS::GetSkCanvasVideoRenderer() {
   return &video_renderer_;
 }
 
 void WebMediaPlayerMS::ResetCanvasCache() {
   DCHECK(thread_checker_.CalledOnValidThread());
   video_renderer_.ResetCache();
 }
+
+WebMediaPlayerMSCompositor* WebMediaPlayerMS::GetCompositorForTesting() {
+  return compositor_.get();
+}
+
 }  // namespace content