Encrypted Media: Implement IPC based SetCdm().

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"
@@ skipping 21 matching lines @@
 
   scoped_refptr<CdmSessionAdapter> adapter(new CdmSessionAdapter());
   if (!adapter->Initialize(
 #if defined(ENABLE_PEPPER_CDMS)
           // TODO(jrummell): Figure out how to get a WebFrame from Blink (or
           // something equivalent) so the plugin can actually get created.
           // http://crbug.com/250049
           base::Bind(&PepperCdmWrapperImpl::Create,
                      static_cast<blink::WebFrame*>(NULL)),
 #endif
           UTF16ToASCII(key_system))) {

[ddorwin, 2014/03/11 18:05:14]

Let's have an output parameter for the CDM ID and return that at line 69.

[xhwang, 2014/03/12 01:07:52]

Done.

     return NULL;
   }
 
   return new WebContentDecryptionModuleImpl(adapter);
 }
 
 WebContentDecryptionModuleImpl::WebContentDecryptionModuleImpl(
     scoped_refptr<CdmSessionAdapter> adapter)
     : adapter_(adapter) {
 }
 
 WebContentDecryptionModuleImpl::~WebContentDecryptionModuleImpl() {
 }
 
 // The caller owns the created session.
 blink::WebContentDecryptionModuleSession*
 WebContentDecryptionModuleImpl::createSession(
     blink::WebContentDecryptionModuleSession::Client* client) {
   return adapter_->CreateSession(client);
 }
 
 media::Decryptor* WebContentDecryptionModuleImpl::GetDecryptor() {
   return adapter_->GetDecryptor();
 }
 
+int WebContentDecryptionModuleImpl::GetCdmId() {
+  return adapter_->GetCdmId();
+}
+
 }  // namespace content