media: Enable encrypted media content browsertests when MojoCdm is used

media/cdm/default_cdm_factory.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/cdm/default_cdm_factory.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "media/base/key_system_names.h"
 #include "media/base/key_systems.h"
+#include "media/base/media_switches.h"
 #include "media/cdm/aes_decryptor.h"
 #include "url/gurl.h"
 
 namespace media {
 
 DefaultCdmFactory::DefaultCdmFactory() {

[xhwang, 2016/11/03 07:14:44]

This class is only used for testing. I'd like to rename it to TestCdmFactory or
CdmFactoryForTesting in a separate CL. WDYT?

 }
 
 DefaultCdmFactory::~DefaultCdmFactory() {
 }
 
+static bool ShouldUseAesDecryptor(const std::string& key_system) {

[ddorwin, 2016/10/28 19:03:47]

s/Use/Create/?

[xhwang, 2016/11/03 07:14:44]

Done.

+  if (CanUseAesDecryptor(key_system))
+    return true;
+
+  // Create AesDecryptor here to support External Clear Key key system.

[ddorwin, 2016/10/28 19:03:48]

nit: This comment is a bit odd ("Create... here"). Maybe "should create" or
similar.

[xhwang, 2016/11/03 07:14:44]

Done.

+  // This is used for testing.
+  return base::FeatureList::IsEnabled(media::kExternalClearKeyForTesting) &&
+         IsExternalClearKey(key_system);
+}
+
 void DefaultCdmFactory::Create(
     const std::string& key_system,
     const GURL& security_origin,
     const CdmConfig& cdm_config,
     const SessionMessageCB& session_message_cb,
     const SessionClosedCB& session_closed_cb,
     const SessionKeysChangeCB& session_keys_change_cb,
     const SessionExpirationUpdateCB& session_expiration_update_cb,
     const CdmCreatedCB& cdm_created_cb) {
   if (!security_origin.is_valid()) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(cdm_created_cb, nullptr, "Invalid origin."));
     return;
   }
-  if (!CanUseAesDecryptor(key_system)) {
+
+  if (!ShouldUseAesDecryptor(key_system)) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(cdm_created_cb, nullptr, "Unsupported key system."));
     return;
   }
 
   scoped_refptr<MediaKeys> cdm(
       new AesDecryptor(security_origin, session_message_cb, session_closed_cb,
                        session_keys_change_cb));
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(cdm_created_cb, cdm, ""));
 }
 
 }  // namespace media