Allow setContentDecryptionModule() to get called when setting is done.

content/renderer/media/webmediaplayer_impl.cc

Index: content/renderer/media/webmediaplayer_impl.cc
diff --git a/content/renderer/media/webmediaplayer_impl.cc b/content/renderer/media/webmediaplayer_impl.cc
index 1a61233b71ad0fb0002ba1257674d03742893df7..ee7325b61b1eef082b7d5e179046f998c575b15a 100644
--- a/content/renderer/media/webmediaplayer_impl.cc
+++ b/content/renderer/media/webmediaplayer_impl.cc
@@ -61,6 +61,7 @@
 #include "media/filters/video_renderer_impl.h"
 #include "media/filters/vpx_video_decoder.h"
 #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h"
+#include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h"
 #include "third_party/WebKit/public/platform/WebMediaSource.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
@@ -783,7 +784,7 @@ WebMediaPlayerImpl::GenerateKeyRequestInternal(const std::string& key_system,
 
     if (proxy_decryptor_ && !decryptor_ready_cb_.is_null()) {
       base::ResetAndReturn(&decryptor_ready_cb_)
-          .Run(proxy_decryptor_->GetDecryptor());
+          .Run(proxy_decryptor_->GetDecryptor(), base::Bind(&base::DoNothing));
     }
 
     current_key_system_ = key_system;
@@ -888,6 +889,8 @@ WebMediaPlayer::MediaKeyException WebMediaPlayerImpl::CancelKeyRequestInternal(
 void WebMediaPlayerImpl::setContentDecryptionModule(
     blink::WebContentDecryptionModule* cdm) {
   DCHECK(main_loop_->BelongsToCurrentThread());
+  // TODO(jrummell): Remove this method once blink starts calling with 2

[ddorwin, 2014/07/30 22:35:45]

Better in the header?

[jrummell, 2014/08/01 22:09:42]

Based in comments for the blink review, we may keep this method around. Removed
TODO.

+  // parameters.
 
   // TODO(xhwang): Support setMediaKeys(0) if necessary: http://crbug.com/330324
   if (!cdm)
@@ -896,7 +899,40 @@ void WebMediaPlayerImpl::setContentDecryptionModule(
   web_cdm_ = ToWebContentDecryptionModuleImpl(cdm);
 
   if (web_cdm_ && !decryptor_ready_cb_.is_null())
-    base::ResetAndReturn(&decryptor_ready_cb_).Run(web_cdm_->GetDecryptor());
+    base::ResetAndReturn(&decryptor_ready_cb_)
+        .Run(web_cdm_->GetDecryptor(), base::Bind(&base::DoNothing));
+}
+
+void WebMediaPlayerImpl::setContentDecryptionModule(
+    blink::WebContentDecryptionModule* cdm,
+    blink::WebContentDecryptionModuleResult result) {
+  DCHECK(main_loop_->BelongsToCurrentThread());
+
+  // TODO(xhwang): Support setMediaKeys(0) if necessary: http://crbug.com/330324
+  if (!cdm) {
+    result.completeWithError(
+        blink::WebContentDecryptionModuleExceptionNotSupportedError,
+        0,
+        "Setting a null MediaKeys object not supported.");

[ddorwin, 2014/07/30 22:35:45]

nit: s/not/is not/.
Or, to be more concise, just drop "Setting a ".

[jrummell, 2014/08/01 22:09:42]

Done.

+    return;
+  }
+
+  web_cdm_ = ToWebContentDecryptionModuleImpl(cdm);
+
+  if (web_cdm_ && !decryptor_ready_cb_.is_null()) {
+    base::ResetAndReturn(&decryptor_ready_cb_)
+        .Run(web_cdm_->GetDecryptor(),
+             BIND_TO_RENDER_LOOP1(
+                 &WebMediaPlayerImpl::ContentDecryptionModuleSet, result));
+  } else {
+    // No player, so setting CDM is complete.

[ddorwin, 2014/07/30 22:35:45]

I don't think this comment is correct. WMPI is the player.

web_cdm_ should not be NULL given line 912. That means the decryptor_ready_cb_
is null. How can that happen?

[jrummell, 2014/08/01 22:09:42]

Comment updated. decryptor_ready_cb_ is null if .src has not been specified yet.

+    ContentDecryptionModuleSet(result);
+  }
+}
+
+void WebMediaPlayerImpl::ContentDecryptionModuleSet(
+    blink::WebContentDecryptionModuleResult result) {
+  result.complete();
 }
 
 void WebMediaPlayerImpl::InvalidateOnMainThread() {
@@ -1315,7 +1351,8 @@ void WebMediaPlayerImpl::SetDecryptorReadyCB(
   // Cancels the previous decryptor request.
   if (decryptor_ready_cb.is_null()) {
     if (!decryptor_ready_cb_.is_null())
-      base::ResetAndReturn(&decryptor_ready_cb_).Run(NULL);
+      base::ResetAndReturn(&decryptor_ready_cb_)
+          .Run(NULL, base::Bind(&base::DoNothing));

[ddorwin, 2014/07/30 22:35:45]

Don't we need to satisfy the promise in some way?

How can this happen?

[jrummell, 2014/08/01 22:09:42]

Here we are cancelling the previous request. There is no promise associated with
this.

     return;
   }
 
@@ -1330,12 +1367,14 @@ void WebMediaPlayerImpl::SetDecryptorReadyCB(
   DCHECK(!proxy_decryptor_ || !web_cdm_);
 
   if (proxy_decryptor_) {
-    decryptor_ready_cb.Run(proxy_decryptor_->GetDecryptor());
+    decryptor_ready_cb.Run(proxy_decryptor_->GetDecryptor(),
+                           base::Bind(&base::DoNothing));

[ddorwin, 2014/07/30 22:35:45]

prefixed only - so this is fine.

[jrummell, 2014/08/01 22:09:42]

Acknowledged.

     return;
   }
 
   if (web_cdm_) {
-    decryptor_ready_cb.Run(web_cdm_->GetDecryptor());
+    decryptor_ready_cb.Run(web_cdm_->GetDecryptor(),

[ddorwin, 2014/07/30 22:35:45]

Maybe comment that there can be no outstanding setMediaKeys() calls if web_cdm_.

That may not actually be true. The key is that there are no outstanding calls or
ContentDecryptionModuleSet is pending and does not need to be called again.

[jrummell, 2014/08/01 22:09:42]

Not sure what to comment here. setContentDecryptionModule() may have called
decryptor_ready_cb_ with the decryptor and it hasn't completed, but here we are
calling a different decryptor_ready_cb (with the same decryptor). If we saved
the WebContentDecryptionModuleResult, then calling it would be required here.
But currently we're not doing that.

The other interesting thing is that this gets called twice, once per stream. So
even if we "saved" the WebContentDecryptionModuleResult, it would only get
resolved when the first stream attaches to the decryptor.

+                           base::Bind(&base::DoNothing));
     return;
   }