Encrypted Media: Add DefaultCdmFactory.

media/cdm/proxy_decryptor.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 "media/cdm/proxy_decryptor.h"
 
 #include <cstring>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #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"
 
 namespace media {
 
 // Special system code to signal a closed persistent session in a SessionError()
 // call. This is needed because there is no SessionClosed() call in the prefixed
 // EME API.
 const int kSessionClosedSystemCode = 29127;
 
@@ skipping 167 matching lines @@
                  web_session_id)));
   media_keys_->RemoveSession(web_session_id, promise.Pass());
 }
 
 scoped_ptr<MediaKeys> ProxyDecryptor::CreateMediaKeys(
     CdmFactory* cdm_factory,
     const std::string& key_system,
     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;
 
   return cdm_factory->Create(
       key_system,
       security_origin,
       base::Bind(&ProxyDecryptor::OnSessionMessage, weak_this),
       base::Bind(&ProxyDecryptor::OnSessionReady, weak_this),
       base::Bind(&ProxyDecryptor::OnSessionClosed, weak_this),
       base::Bind(&ProxyDecryptor::OnSessionError, weak_this),
       base::Bind(&ProxyDecryptor::OnSessionKeysChange, weak_this),
@@ skipping 87 matching lines @@
   bool is_persistent =
       session_type == PersistentSession || session_type == LoadSession;
   active_sessions_.insert(std::make_pair(web_session_id, is_persistent));
 
   // For LoadSession(), generate the SessionReady event.
   if (session_type == LoadSession)
     OnSessionReady(web_session_id);
 }
 
 }  // namespace media