media: Enable encrypted media content browsertests when MojoCdm is used

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 e5c8b9f8d96e1cfd44e5cc5d0271a45690909d1a..6b37b0ee9e3a5bd83d9e47c35cce83c4fc70818c 100644
--- a/content/shell/renderer/shell_content_renderer_client.cc
+++ b/content/shell/renderer/shell_content_renderer_client.cc
@@ -26,7 +26,7 @@
 #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
@@ -140,7 +140,7 @@ void ShellContentRendererClient::ExposeInterfacesToBrowser(
       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))