Encrypted Media: Add DefaultCdmFactory.

The DefaultCdmFactory is the default CdmFactory provided by media/.

BUG=422730,441957

Review URL: https://codereview.chromium.org/814143004

Cr-Commit-Position: refs/heads/master@{#309451}

1 files changed, 7 insertions, 17 deletions

diff --git a/media/blink/cdm_session_adapter.cc b/media/blink/cdm_session_adapter.cc
index b99b74a..7897084 100644
--- a/media/blink/cdm_session_adapter.cc
+++ b/media/blink/cdm_session_adapter.cc
@@ -13,7 +13,6 @@
 #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 {
@@ -33,22 +32,13 @@ bool CdmSessionAdapter::Initialize(CdmFactory* cdm_factory,
       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) {
-    media_keys_ = cdm_factory->Create(
-        key_system, security_origin,
-        base::Bind(&CdmSessionAdapter::OnSessionMessage, 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));
-  }
-
+  media_keys_ = cdm_factory->Create(
+      key_system, security_origin,
+      base::Bind(&CdmSessionAdapter::OnSessionMessage, 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;
 }