Initialize the CDM asynchronously

media/blink/webmediaplayer_impl.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 "media/blink/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <string>
@@ skipping 679 matching lines @@
 
 void WebMediaPlayerImpl::OnWaitingForDecryptionKey() {
   client_->didBlockPlaybackWaitingForKey();
 
   // TODO(jrummell): didResumePlaybackBlockedForKey() should only be called
   // when a key has been successfully added (e.g. OnSessionKeysChange() with
   // |has_additional_usable_key| = true). http://crbug.com/461903
   client_->didResumePlaybackBlockedForKey();
 }
 
 void WebMediaPlayerImpl::SetCdm(const CdmAttachedCB& cdm_attached_cb,

[sandersd (OOO until July 31), 2015/04/27 20:17:48]

I'm not very familiar with how this happens, can you quickly describe how we get
here? Thanks!

[jrummell, 2015/04/27 21:24:38]

This is a CB passed down through ProxyDecryptor::CreateCdm(). When
initialization is complete, it is called. Previous CLs could provide NULL (see
ProxyDecryptor::OnCdmCreated(), line 96), but it looks like that path was never
executed (at least in the tests).

                                 CdmContext* cdm_context) {
-  pipeline_.SetCdm(cdm_context, cdm_attached_cb);
+  // The CDM may fail to create, so no need to tell the pipeline that a CDM
+  // is attached.
+  if (cdm_context)
+    pipeline_.SetCdm(cdm_context, cdm_attached_cb);
 }
 
 void WebMediaPlayerImpl::OnCdmAttached(
     blink::WebContentDecryptionModuleResult result,
     bool success) {
   if (success) {
     result.complete();
     return;
   }
 
@@ skipping 300 matching lines @@
 
   // pause() may be called after playback has ended and the HTMLMediaElement
   // requires that currentTime() == duration() after ending.  We want to ensure
   // |paused_time_| matches currentTime() in this case or a future seek() may
   // incorrectly discard what it thinks is a seek to the existing time.
   paused_time_ =
       ended_ ? pipeline_.GetMediaDuration() : pipeline_.GetMediaTime();
 }
 
 }  // namespace media