Encrypted Media: Implement IPC based SetCdm().

content/renderer/media/cdm_session_adapter.cc

 // Copyright 2014 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/cdm_session_adapter.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "content/renderer/media/crypto/content_decryption_module_factory.h"
 #include "content/renderer/media/webcontentdecryptionmodulesession_impl.h"
 #include "media/base/media_keys.h"
 #include "url/gurl.h"
 
 namespace content {
 
 const uint32 kStartingSessionId = 1;
 uint32 CdmSessionAdapter::next_session_id_ = kStartingSessionId;
 COMPILE_ASSERT(kStartingSessionId > media::MediaKeys::kInvalidSessionId,
                invalid_starting_value);
 
 CdmSessionAdapter::CdmSessionAdapter() : weak_ptr_factory_(this) {}
 
 CdmSessionAdapter::~CdmSessionAdapter() {}
 
 bool CdmSessionAdapter::Initialize(
 #if defined(ENABLE_PEPPER_CDMS)
     const CreatePepperCdmCB& create_pepper_cdm_cb,
-#endif
+#elif defined(OS_ANDROID)
+    int* cdm_id,
+#endif  // defined(ENABLE_PEPPER_CDMS)
     const std::string& key_system) {
   base::WeakPtr<CdmSessionAdapter> weak_this = weak_ptr_factory_.GetWeakPtr();
   media_keys_ =
       ContentDecryptionModuleFactory::Create(
           key_system,
 #if defined(ENABLE_PEPPER_CDMS)

[ddorwin, 2014/03/25 23:03:59]

It would be nice if we could combine these into some CreatePlatformSpecificCdmCB
and eliminate these CBs. We're slowly whittling away the differences.

[xhwang, 2014/03/26 06:02:04]

Agreed that we should hide all these differences somewhere. Need to think more
on this.

           create_pepper_cdm_cb,
 #elif defined(OS_ANDROID)
           // TODO(xhwang): Support Android.
           NULL,
-          0,
           // TODO(ddorwin): Get the URL for the frame containing the MediaKeys.
           GURL(),
+          cdm_id,
 #endif  // defined(ENABLE_PEPPER_CDMS)
           base::Bind(&CdmSessionAdapter::OnSessionCreated, weak_this),
           base::Bind(&CdmSessionAdapter::OnSessionMessage, weak_this),
           base::Bind(&CdmSessionAdapter::OnSessionReady, weak_this),
           base::Bind(&CdmSessionAdapter::OnSessionClosed, weak_this),
           base::Bind(&CdmSessionAdapter::OnSessionError, weak_this));
 
   // Success if |media_keys_| created.
   return media_keys_;
 }
@@ skipping 87 matching lines @@
 WebContentDecryptionModuleSessionImpl* CdmSessionAdapter::GetSession(
     uint32 session_id) {
   // Since session objects may get garbage collected, it is possible that there
   // are events coming back from the CDM and the session has been unregistered.
   // We can not tell if the CDM is firing events at sessions that never existed.
   SessionMap::iterator session = sessions_.find(session_id);
   return (session != sessions_.end()) ? session->second : NULL;
 }
 
 }  // namespace content