Fix the histograms whitelist for the OOP PDF plugin. (try 2)

chrome/renderer/pepper/pepper_uma_host.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/pepper/pepper_uma_host.h"
 
 #include "base/metrics/histogram.h"
 #include "base/sha1.h"
 #include "base/strings/string_number_conversions.h"
+#include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/chrome_content_renderer_client.h"
 #include "content/public/renderer/pepper_plugin_instance.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/renderer_ppapi_host.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/host/dispatch_host_message.h"
 #include "ppapi/host/host_message_context.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/proxy/ppapi_messages.h"
 
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
 
 #if defined(ENABLE_EXTENSIONS)
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #endif  // defined(ENABLE_EXTENSIONS)
 
 namespace {
 
 const char* const kPredefinedAllowedUMAOrigins[] = {
     "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F",  // see http://crbug.com/317833
-    "4EB74897CB187C7633357C2FE832E0AD6A44883A"   // see http://crbug.com/317833
+    "4EB74897CB187C7633357C2FE832E0AD6A44883A",  // see http://crbug.com/317833
 };
 
 const char* const kWhitelistedHistogramPrefixes[] = {
-    "22F67DA2061FFC4DC9A4974036348D9C38C22919"  // see http://crbug.com/390221
+    "22F67DA2061FFC4DC9A4974036348D9C38C22919",  // see http://crbug.com/390221
 };
 
 const char* const kWhitelistedPluginBaseNames[] = {
 #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
+    ChromeContentClient::kPDFPluginPath,
 };
 
 std::string HashPrefix(const std::string& histogram) {
   const std::string id_hash =
       base::SHA1HashString(histogram.substr(0, histogram.find('.')));
   DCHECK_EQ(id_hash.length(), base::kSHA1Length);
   return base::HexEncode(id_hash.c_str(), id_hash.length());
 }
 
 }  // namespace
@@ skipping 43 matching lines @@
   return false;
 #endif
 }
 
 bool PepperUMAHost::IsHistogramAllowed(const std::string& histogram) {
   if (is_plugin_in_process_ && histogram.find("NaCl.") == 0) {
     return true;
   }
 
   if (IsPluginWhitelisted() &&
-      allowed_histogram_prefixes_.find(HashPrefix(histogram)) !=
-          allowed_histogram_prefixes_.end()) {
+      ContainsKey(allowed_histogram_prefixes_, HashPrefix(histogram))) {
     return true;
   }
 
-  if (allowed_plugin_base_names_.find(plugin_base_name_.MaybeAsASCII()) !=
-      allowed_plugin_base_names_.end()) {
+  if (ContainsKey(allowed_plugin_base_names_,
+                  plugin_base_name_.MaybeAsASCII())) {
     return true;
   }
 
   LOG(ERROR) << "Host or histogram name is not allowed to use the UMA API.";
   return false;
 }
 
 #define RETURN_IF_BAD_ARGS(_min, _max, _buckets) \
   do {                                           \
     if (_min >= _max || _buckets <= 1)           \
@@ skipping 77 matching lines @@
     ppapi::host::HostMessageContext* context) {
   if (!IsPluginWhitelisted())
     return PP_ERROR_NOACCESS;
   bool enabled = false;
   content::RenderThread::Get()->Send(
       new ChromeViewHostMsg_IsCrashReportingEnabled(&enabled));
   if (enabled)
     return PP_OK;
   return PP_ERROR_FAILED;
 }