media: Add External Clear Key content browser test on Android

media/base/android/android_cdm_factory.cc

 // Copyright 2015 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/base/android/android_cdm_factory.h"
 
+#include "base/feature_list.h"
 #include "base/strings/string_number_conversions.h"
 #include "media/base/android/media_drm_bridge.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/cdm_config.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 "third_party/widevine/cdm/widevine_cdm_common.h"
 #include "url/gurl.h"
 
 namespace media {
 
 AndroidCdmFactory::AndroidCdmFactory(const CreateFetcherCB& create_fetcher_cb)
     : create_fetcher_cb_(create_fetcher_cb) {}
 
 AndroidCdmFactory::~AndroidCdmFactory() {}
 
 void AndroidCdmFactory::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) {
   // Bound |cdm_created_cb| so we always fire it asynchronously.
   CdmCreatedCB bound_cdm_created_cb = BindToCurrentLoop(cdm_created_cb);
 
   if (!security_origin.is_valid()) {
     bound_cdm_created_cb.Run(nullptr, "Invalid origin.");
     return;
   }
 
+  // Create AesDecryptor here to support External Clear Key key system.
+  // This is used for testing.
+  if (base::FeatureList::IsEnabled(media::kExternalClearKeyForTesting) &&

[ddorwin, 2016/09/16 19:40:07]

nit: This order seems strange.

[xhwang, 2016/09/16 20:02:16]

I see your point. What I am thinking is "if ECK is not supported, don't bother
to check whether the key system is ECK"...

+      IsExternalClearKey(key_system)) {
+    scoped_refptr<MediaKeys> cdm(
+        new AesDecryptor(security_origin, session_message_cb, session_closed_cb,
+                         session_keys_change_cb));
+    bound_cdm_created_cb.Run(cdm, "");
+    return;
+  }
+
   std::string error_message;
 
   if (!MediaDrmBridge::IsKeySystemSupported(key_system)) {
     error_message = "Key system not supported unexpectedly: " + key_system;
     NOTREACHED() << error_message;
     bound_cdm_created_cb.Run(nullptr, error_message);
     return;
   }
 
   MediaDrmBridge::SecurityLevel security_level =
@@ skipping 22 matching lines @@
     LOG(ERROR) << error_message;
     bound_cdm_created_cb.Run(nullptr, error_message);
     return;
   }
 
   // Success!
   bound_cdm_created_cb.Run(cdm, "");
 }
 
 }  // namespace media