Encrypted Media: Add DefaultCdmFactory.

media/cdm/proxy_decryptor.cc

Index: media/cdm/proxy_decryptor.cc
diff --git a/media/cdm/proxy_decryptor.cc b/media/cdm/proxy_decryptor.cc
index 2daa10cf854cbe2af784aa383556c3b98923a3af..2a65bbeacd0a263ebe193678b93012df8f05eb30 100644
--- a/media/cdm/proxy_decryptor.cc
+++ b/media/cdm/proxy_decryptor.cc
@@ -13,7 +13,6 @@
 #include "media/base/cdm_callback_promise.h"
 #include "media/base/cdm_factory.h"
 #include "media/base/key_systems.h"
-#include "media/cdm/aes_decryptor.h"
 #include "media/cdm/json_web_key.h"
 #include "media/cdm/key_system_names.h"
 
@@ -201,13 +200,6 @@ scoped_ptr<MediaKeys> ProxyDecryptor::CreateMediaKeys(
     const GURL& security_origin) {
   base::WeakPtr<ProxyDecryptor> weak_this = weak_ptr_factory_.GetWeakPtr();
 
-  if (CanUseAesDecryptor(key_system)) {
-    return scoped_ptr<media::MediaKeys>(new AesDecryptor(
-        base::Bind(&ProxyDecryptor::OnSessionMessage, weak_this),
-        base::Bind(&ProxyDecryptor::OnSessionClosed, weak_this),
-        base::Bind(&ProxyDecryptor::OnSessionKeysChange, weak_this)));
-  }
-
   if (!cdm_factory)

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

ditto

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

Done.

     return nullptr;