diff options
| author | xhwang <xhwang@chromium.org> | 2014-09-12 14:28:40 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-12 21:32:04 +0000 |
| commit | f7e0e528982ff057fde0de1cfff2103cc8e82ea0 (patch) | |
| tree | 9406779e7a22b205f1bc78f2ef77edf08726d2f8 | |
| parent | 780827b616bfbda7c971979cd3bf2effab1d5acf (diff) | |
| download | chromium_src-f7e0e528982ff057fde0de1cfff2103cc8e82ea0.zip chromium_src-f7e0e528982ff057fde0de1cfff2103cc8e82ea0.tar.gz chromium_src-f7e0e528982ff057fde0de1cfff2103cc8e82ea0.tar.bz2 | |
Whitelist Widevine CDM for plugin UMA on all platforms.
Previously this is only whitelisted on Linux/ChromeOS. This CL relax this to
all platforms.
BUG=413812
TEST=Tested on Windows.
Review URL: https://codereview.chromium.org/567913002
Cr-Commit-Position: refs/heads/master@{#294663}
| -rw-r--r-- | chrome/renderer/pepper/pepper_uma_host.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/renderer/pepper/pepper_uma_host.cc b/chrome/renderer/pepper/pepper_uma_host.cc index dbf605bf..17c20e2 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. + 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) { |