Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2335)

Unified Diff: content/shell/renderer/shell_content_renderer_client.cc

Issue 2268283003: media: Add External Clear Key content browser test on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..d36df7debda0fb74604bbdb23ef30420e6e98755 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"
@@ -129,4 +130,14 @@ void ShellContentRendererClient::ExposeInterfacesToBrowser(
base::Bind(&CreateTestMojoService));
}
+#if defined(OS_ANDROID)
+void ShellContentRendererClient::AddSupportedKeySystems(
+ std::vector<std::unique_ptr<media::KeySystemProperties>>* key_systems) {
+ static const char kExternalClearKeyKeySystem[] =
+ "org.chromium.externalclearkey";
+ key_systems->emplace_back(
+ new cdm::ExternalClearKeyProperties(kExternalClearKeyKeySystem));
+}
+#endif
+
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698