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..c5ac3f98b86b7537a1878a50810f9698a016b95a 100644
--- a/content/renderer/media/webmediaplayer_ms.cc
+++ b/content/renderer/media/webmediaplayer_ms.cc
@@ -62,7 +62,9 @@ WebMediaPlayerMS::WebMediaPlayerMS(
       gpu_factories_(gpu_factories),
       compositor_task_runner_(compositor_task_runner),
       initial_audio_output_device_id_(sink_id.utf8()),
-      initial_security_origin_(security_origin) {
+      initial_security_origin_(security_origin.isNull()
+                                   ? url::Origin()
+                                   : url::Origin(security_origin)) {

[mcasas, 2015/12/02 19:42:31]

url::Origin() has a ctor with no arguments, so you
can just do
initial_security_otiring_(security_origin)

[qiangchen, 2015/12/05 00:24:14]

Ah, that does not work. Here
security_origin is of type blink::WebSecurityOrigin
initial_security_origin_ is url::Origin

initial_security_origin_(security_origin) is essentially doing a implicit cast.
The code is at
https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit...

Where Unqiue() function asserts m_private, which means if
security_origin.isNull(), an exception will be thrown, and then crashes.

   DVLOG(1) << __FUNCTION__;
   DCHECK(client);
   media_log_->AddEvent(
@@ -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,5 @@ void WebMediaPlayerMS::ResetCanvasCache() {
   DCHECK(thread_checker_.CalledOnValidThread());
   video_renderer_.ResetCache();
 }
+
 }  // namespace content