Encrypted Media: Add DefaultCdmFactory.

media/blink/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 "media/blink/cdm_session_adapter.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/stl_util.h"
 #include "media/base/cdm_factory.h"
 #include "media/base/cdm_promise.h"
 #include "media/base/key_systems.h"
 #include "media/base/media_keys.h"
 #include "media/blink/webcontentdecryptionmodulesession_impl.h"
-#include "media/cdm/aes_decryptor.h"
 #include "url/gurl.h"
 
 namespace media {
 
 const char kMediaEME[] = "Media.EME.";
 const char kDot[] = ".";
 
 CdmSessionAdapter::CdmSessionAdapter() : weak_ptr_factory_(this) {
 }
 
 CdmSessionAdapter::~CdmSessionAdapter() {}
 
 bool CdmSessionAdapter::Initialize(CdmFactory* cdm_factory,
                                    const std::string& key_system,
                                    const GURL& security_origin) {
   key_system_uma_prefix_ =
       kMediaEME + GetKeySystemNameForUMA(key_system) + kDot;
 
   base::WeakPtr<CdmSessionAdapter> weak_this = weak_ptr_factory_.GetWeakPtr();
 
-  if (CanUseAesDecryptor(key_system)) {
-    media_keys_.reset(new AesDecryptor(
-        base::Bind(&CdmSessionAdapter::OnSessionMessage, weak_this),
-        base::Bind(&CdmSessionAdapter::OnSessionClosed, weak_this),
-        base::Bind(&CdmSessionAdapter::OnSessionKeysChange, weak_this)));
-  } else if (cdm_factory) {
+  if (cdm_factory) {

[ddorwin, 2014/12/19 18:16:56]

If we have a default, can this ever be null?

[xhwang, 2014/12/19 19:18:30]

Good point. Done.

     media_keys_ = cdm_factory->Create(

[ddorwin, 2014/12/19 18:16:56]

Clear Key isn't added to the existing factories. How can Clear Key be created on
desktop and Android?

[gunsch, 2014/12/19 19:06:19]

I think AesDecryptor is still created in RenderCdmFactory:
https://code.google.com/p/chromium/codesearch#chromium/src/content/renderer/m...

[xhwang, 2014/12/19 19:18:28]

See gunsch's reply. We still create AesDecryptor in RenderCdmFactory (which
should be removed in the last CL ;)

We also use RenderCdmFactory on Android, so Clear Key is taken care of:
https://code.google.com/p/chromium/codesearch#chromium/src/content/renderer/m...

[xhwang, 2014/12/19 19:18:30]

Thanks for the link!

         key_system, security_origin,
         base::Bind(&CdmSessionAdapter::OnSessionMessage, weak_this),
         base::Bind(&CdmSessionAdapter::OnSessionReady, weak_this),
         base::Bind(&CdmSessionAdapter::OnSessionClosed, weak_this),
         base::Bind(&CdmSessionAdapter::OnSessionError, weak_this),
         base::Bind(&CdmSessionAdapter::OnSessionKeysChange, weak_this),
         base::Bind(&CdmSessionAdapter::OnSessionExpirationUpdate, weak_this));
   }
 
   return media_keys_.get() != nullptr;
@@ skipping 135 matching lines @@
 WebContentDecryptionModuleSessionImpl* CdmSessionAdapter::GetSession(
     const std::string& web_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(web_session_id);
   return (session != sessions_.end()) ? session->second.get() : NULL;
 }
 
 }  // namespace media