Update MediaKeys interface for EME

content/renderer/media/webcontentdecryptionmodule_impl.cc

Index: content/renderer/media/webcontentdecryptionmodule_impl.cc
diff --git a/content/renderer/media/webcontentdecryptionmodule_impl.cc b/content/renderer/media/webcontentdecryptionmodule_impl.cc
index 9dcb39ee9ca98931c5f49c05035f805ed883e846..13017b983abd147f6fe0b6e7c13054b53befc91b 100644
--- a/content/renderer/media/webcontentdecryptionmodule_impl.cc
+++ b/content/renderer/media/webcontentdecryptionmodule_impl.cc
@@ -14,7 +14,9 @@
 #include "base/strings/utf_string_conversions.h"
 #include "content/renderer/media/cdm_session_adapter.h"
 #include "content/renderer/media/crypto/key_systems.h"
+#include "content/renderer/media/webcontentdecryptionmoduleresult_helper.h"
 #include "content/renderer/media/webcontentdecryptionmodulesession_impl.h"
+#include "media/base/cdm_promise.h"
 #include "media/base/media_keys.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebSecurityOrigin.h"
@@ -78,7 +80,8 @@ WebContentDecryptionModuleImpl* WebContentDecryptionModuleImpl::Create(
 
 WebContentDecryptionModuleImpl::WebContentDecryptionModuleImpl(
     scoped_refptr<CdmSessionAdapter> adapter)
-    : adapter_(adapter) {}
+    : adapter_(adapter) {
+}
 
 WebContentDecryptionModuleImpl::~WebContentDecryptionModuleImpl() {
 }
@@ -97,6 +100,18 @@ WebContentDecryptionModuleImpl::createSession(
   return session;
 }
 
+void WebContentDecryptionModuleImpl::setServerCertificate(
+    const uint8* server_certificate,
+    size_t server_certificate_length,
+    blink::WebContentDecryptionModuleResult result) {
+  DCHECK(server_certificate);
+  scoped_ptr<media::SimpleCdmPromise> promise =

[ddorwin, 2014/09/23 23:14:21]

This might be simpler as:
coped_ptr<media::SimpleCdmPromise> promise(new
BlinkCdmPromiseTemplate<void>(result));

Or, just inline it with the call at line 112.

[jrummell, 2014/09/24 00:49:32]

Done.

+      make_scoped_ptr<media::SimpleCdmPromise>(
+          new BlinkCdmPromiseTemplate<void>(result));
+  adapter_->SetServerCertificate(
+      server_certificate, server_certificate_length, promise.Pass());
+}
+
 media::Decryptor* WebContentDecryptionModuleImpl::GetDecryptor() {
   return adapter_->GetDecryptor();
 }