media: Add External Clear Key content browser test on Android

content/shell/renderer/shell_content_renderer_client.cc

 // Copyright (c) 2012 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 "content/shell/renderer/shell_content_renderer_client.h"
 
 #include <string>
 
 #include "base/bind.h"
 #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"
 #include "content/shell/renderer/shell_render_view_observer.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "services/shell/public/cpp/interface_registry.h"
 #include "third_party/WebKit/public/web/WebTestingSupport.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "v8/include/v8.h"
 
 #if defined(ENABLE_PLUGINS)
 #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 {
 
 // A test Mojo service which can be driven by browser tests for various reasons.
 class TestMojoServiceImpl : public mojom::TestMojoService {
  public:
   explicit TestMojoServiceImpl(mojom::TestMojoServiceRequest request)
       : binding_(this, std::move(request)) {
     binding_.set_connection_error_handler(
@@ skipping 84 matching lines @@
     blink::WebTestingSupport::injectInternalsObject(context);
   }
 }
 
 void ShellContentRendererClient::ExposeInterfacesToBrowser(
     shell::InterfaceRegistry* interface_registry) {
   interface_registry->AddInterface<mojom::TestMojoService>(
       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