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

Unified Diff: chrome/renderer/plugins/plugin_uma_unittest.cc

Issue 15028015: Conditionally build support for Pepper-based CDMs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use AppendAscii() where possible. Created 7 years, 7 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
« no previous file with comments | « chrome/renderer/plugins/plugin_uma.cc ('k') | content/browser/media/encrypted_media_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/plugins/plugin_uma_unittest.cc
diff --git a/chrome/renderer/plugins/plugin_uma_unittest.cc b/chrome/renderer/plugins/plugin_uma_unittest.cc
index 3b1950c5bf2b170fc3f8c12238f9e8bc7d07a65d..587ab662b3f97bd3186998b3ee9668dee2149e28 100644
--- a/chrome/renderer/plugins/plugin_uma_unittest.cc
+++ b/chrome/renderer/plugins/plugin_uma_unittest.cc
@@ -106,7 +106,11 @@ TEST_F(PluginUMATest, ShockwaveFlash) {
}
TEST_F(PluginUMATest, WidevineCdm) {
+#if defined(ENABLE_PEPPER_CDMS)
ExpectPluginType(PluginUMAReporter::WIDEVINE_CDM,
+#else
+ ExpectPluginType(PluginUMAReporter::UNSUPPORTED_MIMETYPE,
+#endif
"application/x-ppapi-widevine-cdm",
GURL("some url"));
ExpectPluginType(PluginUMAReporter::UNSUPPORTED_MIMETYPE,
« no previous file with comments | « chrome/renderer/plugins/plugin_uma.cc ('k') | content/browser/media/encrypted_media_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698