media: Add External Clear Key content browser test on Android

content/shell/renderer/shell_content_renderer_client.cc

Index: content/shell/renderer/shell_content_renderer_client.cc
diff --git a/content/shell/renderer/shell_content_renderer_client.cc b/content/shell/renderer/shell_content_renderer_client.cc
index 9d9b88a67b26a5644092fc2e3e687beb3ae6cd97..fa01401bb0d352a7a14abf5b03219935feb86047 100644
--- a/content/shell/renderer/shell_content_renderer_client.cc
+++ b/content/shell/renderer/shell_content_renderer_client.cc
@@ -10,6 +10,7 @@
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "components/cdm/renderer/external_clear_key_key_system_properties.h"
 #include "components/web_cache/renderer/web_cache_impl.h"
 #include "content/public/test/test_mojo_service.mojom.h"
 #include "content/shell/common/shell_switches.h"
@@ -25,6 +26,11 @@
 #include "ppapi/shared_impl/ppapi_switches.h"
 #endif
 
+#if defined(OS_ANDROID)
+#include "base/feature_list.h"
+#include "media/base/media_switches.h"
+#endif
+
 namespace content {
 
 namespace {
@@ -129,4 +135,17 @@ void ShellContentRendererClient::ExposeInterfacesToBrowser(
       base::Bind(&CreateTestMojoService));
 }
 
+#if defined(OS_ANDROID)
+void ShellContentRendererClient::AddSupportedKeySystems(
+    std::vector<std::unique_ptr<media::KeySystemProperties>>* key_systems) {
+  if (!base::FeatureList::IsEnabled(media::kExternalClearKeyForTesting))

[Peter Beverloo, 2016/09/22 11:55:23]

Out of interest, why do you use a base::Feature for this flag since it's only
meant for testing? You really only need the command line aspect of it?

[xhwang, 2016/09/22 16:54:58]

Yeah, I wanted to add a command line flag but was told that all
--enable/--disable flags should be a base::Feature now.

+    return;
+
+  static const char kExternalClearKeyKeySystem[] =
+      "org.chromium.externalclearkey";
+  key_systems->emplace_back(
+      new cdm::ExternalClearKeyProperties(kExternalClearKeyKeySystem));
+}
+#endif
+
 }  // namespace content