Update MediaKeys interface for EME

content/renderer/media/webcontentdecryptionmodule_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 "content/renderer/media/webcontentdecryptionmodule_impl.h"
 
 #include <map>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #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"
 #include "url/gurl.h"
 
 #if defined(ENABLE_PEPPER_CDMS)
 #include "content/renderer/media/crypto/pepper_cdm_wrapper_impl.h"
 #endif
 
 namespace content {
@@ skipping 43 matching lines @@
           key_system_ascii,
           security_origin_as_gurl)) {
     return NULL;
   }
 
   return new WebContentDecryptionModuleImpl(adapter);
 }
 
 WebContentDecryptionModuleImpl::WebContentDecryptionModuleImpl(
     scoped_refptr<CdmSessionAdapter> adapter)
-    : adapter_(adapter) {}
+    : adapter_(adapter) {
+}
 
 WebContentDecryptionModuleImpl::~WebContentDecryptionModuleImpl() {
 }
 
 // The caller owns the created session.
 blink::WebContentDecryptionModuleSession*
 WebContentDecryptionModuleImpl::createSession() {
   return adapter_->CreateSession();
 }
 
 blink::WebContentDecryptionModuleSession*
 WebContentDecryptionModuleImpl::createSession(
     blink::WebContentDecryptionModuleSession::Client* client) {
   WebContentDecryptionModuleSessionImpl* session = adapter_->CreateSession();
   session->setClientInterface(client);
   return session;
 }
 
+void WebContentDecryptionModuleImpl::setServerCertificate(
+    const uint8* server_certificate,
+    size_t server_certificate_length,
+    blink::WebContentDecryptionModuleResult result) {
+  DCHECK(server_certificate);
+  adapter_->SetServerCertificate(server_certificate,
+                                 server_certificate_length,
+                                 make_scoped_ptr<media::SimpleCdmPromise>(

[ddorwin, 2014/09/24 17:37:46]

According to
https://code.google.com/p/chromium/codesearch#chromium/src/base/memory/scoped...,
you don't need the <>. That makes this simpler and probably makes the next
comment obsolete.

[jrummell, 2014/09/24 22:32:32]

Without the type make_scoped_ptr returns scoped_ptr<WebSimpleCdmPromise>, and it
can't convert that to scoped_ptr<SimpleCdmPromise>.

+                                     new WebSimpleCdmPromise(result)));

[ddorwin, 2014/09/24 17:37:46]

Would this be simpler if we made a templated Create() method for the Web*
promises?

[jrummell, 2014/09/24 22:32:32]

I could, but Create() would return scoped_ptr<WebSimpleCdmPromise>, so I would
have to write WebSimpleCdmPromise::Create(result).PassAs<SimpleCdmPromise>(),
which is no shorter. Or switch the template to <T, U>, with U being the type
returned by Create().

+}
+
 media::Decryptor* WebContentDecryptionModuleImpl::GetDecryptor() {
   return adapter_->GetDecryptor();
 }
 
 #if defined(ENABLE_BROWSER_CDMS)
 int WebContentDecryptionModuleImpl::GetCdmId() const {
   return adapter_->GetCdmId();
 }
 #endif  // defined(ENABLE_BROWSER_CDMS)
 
 }  // namespace content