media: Enable encrypted media content browsertests when MojoCdm is used

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_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)
+#if defined(ENABLE_MOJO_CDM)

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

These should be converted to build features (separate CL).

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

Acknowledged.

 #include "base/feature_list.h"
 #include "media/base/media_switches.h"
 #endif
 
 namespace content {
 
 namespace {
 
 // A test service which can be driven by browser tests for various reasons.
 class TestServiceImpl : public mojom::TestService {
@@ skipping 93 matching lines @@
     blink::WebTestingSupport::injectInternalsObject(context);
   }
 }
 
 void ShellContentRendererClient::ExposeInterfacesToBrowser(
     shell::InterfaceRegistry* interface_registry) {
   interface_registry->AddInterface<mojom::TestService>(
       base::Bind(&CreateTestService));
 }
 
-#if defined(OS_ANDROID)
+#if defined(ENABLE_MOJO_CDM)

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

This isn't going to be correct for desktop.

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

This shell is the content embedder only used for content_browsertests. For
browser_tests, "chrome" is the content embedder, we have pepper ECK registered
there.

[ddorwin, 2016/11/10 01:24:29]

I meant when SoDo is enabled.

[xhwang, 2016/11/10 07:11:28]

My original plan was that when SoDo is enabled, we'll keep using a ClearKeyCdm
based ECK in "chrome". In content shell, we'll keep using a AesDecryptor based
ECK (as registered here).

 void ShellContentRendererClient::AddSupportedKeySystems(
     std::vector<std::unique_ptr<media::KeySystemProperties>>* key_systems) {
   if (!base::FeatureList::IsEnabled(media::kExternalClearKeyForTesting))
     return;
 
   static const char kExternalClearKeyKeySystem[] =
       "org.chromium.externalclearkey";
   key_systems->emplace_back(
       new cdm::ExternalClearKeyProperties(kExternalClearKeyKeySystem));
 }
 #endif
 
 }  // namespace content