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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 772043004: Replace WIDEVINE_CDM_AVAILABLE with a gyp define 'enable_widevine_cdm'. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Switch to enable_widevine_cdm. Created 6 years 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
« chrome/renderer/plugins/plugin_uma.cc ('K') | « chrome/renderer/plugins/plugin_uma.cc ('k') | chromecast/media/base/key_systems_common.cc » ('j') | third_party/widevine/cdm/BUILD.gn » ('J')
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 7bce210e02ce577acc5ebed38f7726335ae728ab..820b372ffdb005e55e21cc1ea15f59b79dc28f40 100644
--- a/chrome/renderer/plugins/plugin_uma_unittest.cc
+++ b/chrome/renderer/plugins/plugin_uma_unittest.cc
@@ -103,7 +103,7 @@ TEST_F(PluginUMATest, ShockwaveFlash) {
}
TEST_F(PluginUMATest, WidevineCdm) {
-#if defined(ENABLE_PEPPER_CDMS)
+#if defined(ENABLE_WIDEVINE_CDM) && defined(ENABLE_PEPPER_CDMS)
ddorwin 2014/12/15 18:31:06 ditto
sandersd (OOO until July 31) 2014/12/15 21:51:22 Done.
ExpectPluginType(PluginUMAReporter::WIDEVINE_CDM,
#else
ExpectPluginType(PluginUMAReporter::UNSUPPORTED_MIMETYPE,
« chrome/renderer/plugins/plugin_uma.cc ('K') | « chrome/renderer/plugins/plugin_uma.cc ('k') | chromecast/media/base/key_systems_common.cc » ('j') | third_party/widevine/cdm/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698