Commit ad1fecf3 authored by thestig's avatar thestig Committed by Commit bot

Fix the histograms whitelist for the OOP PDF plugin.

BUG=405305

Review URL: https://codereview.chromium.org/897863003

Cr-Commit-Position: refs/heads/master@{#314764}
parent 72ce43ad
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include "base/metrics/histogram.h" #include "base/metrics/histogram.h"
#include "base/sha1.h" #include "base/sha1.h"
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "chrome/common/chrome_content_client.h"
#include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_switches.h"
#include "chrome/common/render_messages.h" #include "chrome/common/render_messages.h"
#include "chrome/renderer/chrome_content_renderer_client.h" #include "chrome/renderer/chrome_content_renderer_client.h"
...@@ -30,11 +31,11 @@ namespace { ...@@ -30,11 +31,11 @@ namespace {
const char* const kPredefinedAllowedUMAOrigins[] = { const char* const kPredefinedAllowedUMAOrigins[] = {
"6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F", // see http://crbug.com/317833 "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F", // see http://crbug.com/317833
"4EB74897CB187C7633357C2FE832E0AD6A44883A" // see http://crbug.com/317833 "4EB74897CB187C7633357C2FE832E0AD6A44883A", // see http://crbug.com/317833
}; };
const char* const kWhitelistedHistogramPrefixes[] = { const char* const kWhitelistedHistogramPrefixes[] = {
"22F67DA2061FFC4DC9A4974036348D9C38C22919" // see http://crbug.com/390221 "22F67DA2061FFC4DC9A4974036348D9C38C22919", // see http://crbug.com/390221
}; };
const char* const kWhitelistedPluginBaseNames[] = { const char* const kWhitelistedPluginBaseNames[] = {
...@@ -42,7 +43,7 @@ const char* const kWhitelistedPluginBaseNames[] = { ...@@ -42,7 +43,7 @@ const char* const kWhitelistedPluginBaseNames[] = {
kWidevineCdmAdapterFileName, // see http://crbug.com/368743 kWidevineCdmAdapterFileName, // see http://crbug.com/368743
// and http://crbug.com/410630 // and http://crbug.com/410630
#endif #endif
"libpdf.so" // see http://crbug.com/405305 ChromeContentClient::kPDFPluginPath,
}; };
std::string HashPrefix(const std::string& histogram) { std::string HashPrefix(const std::string& histogram) {
...@@ -106,13 +107,12 @@ bool PepperUMAHost::IsHistogramAllowed(const std::string& histogram) { ...@@ -106,13 +107,12 @@ bool PepperUMAHost::IsHistogramAllowed(const std::string& histogram) {
} }
if (IsPluginWhitelisted() && if (IsPluginWhitelisted() &&
allowed_histogram_prefixes_.find(HashPrefix(histogram)) != ContainsKey(allowed_histogram_prefixes_, HashPrefix(histogram))) {
allowed_histogram_prefixes_.end()) {
return true; return true;
} }
if (allowed_plugin_base_names_.find(plugin_base_name_.MaybeAsASCII()) != if (ContainsKey(allowed_plugin_base_names_,
allowed_plugin_base_names_.end()) { plugin_base_name_.MaybeAsASCII())) {
return true; return true;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment