Chromium Code Reviews| 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) { |