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

Unified Diff: chrome/renderer/pepper/pepper_uma_host.cc

Issue 567913002: Whitelist Widevine CDM for plugin UMA on all platforms. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/pepper/pepper_uma_host.cc
diff --git a/chrome/renderer/pepper/pepper_uma_host.cc b/chrome/renderer/pepper/pepper_uma_host.cc
index dbf605bf2bd8eb322bf52f6218193d0041664b27..17c20e2b83636e611f100926a10303eaf0d74dca 100644
--- a/chrome/renderer/pepper/pepper_uma_host.cc
+++ b/chrome/renderer/pepper/pepper_uma_host.cc
@@ -21,6 +21,8 @@
#include "ppapi/host/ppapi_host.h"
#include "ppapi/proxy/ppapi_messages.h"
+#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
teravest 2014/09/12 17:46:35 I checked the gyp dependencies for this; looks OK.
+
namespace {
const char* const kPredefinedAllowedUMAOrigins[] = {
@@ -33,8 +35,11 @@ const char* const kWhitelistedHistogramPrefixes[] = {
};
const char* const kWhitelistedPluginBaseNames[] = {
- "libwidevinecdmadapter.so", // see http://crbug.com/368743
- "libpdf.so" // see http://crbug.com/405305
+#if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
+ kWidevineCdmAdapterFileName, // see http://crbug.com/368743
+ // and http://crbug.com/410630
+#endif
+ "libpdf.so" // see http://crbug.com/405305
};
std::string HashPrefix(const std::string& histogram) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698