Merge 270616 "Whitelist libwidevinecdmadapter.so for pepper UMA ..."

chrome/renderer/pepper/pepper_uma_host.h

 // 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.
 
 #ifndef CHROME_RENDERER_PEPPER_PEPPER_UMA_HOST_H_
 #define CHROME_RENDERER_PEPPER_PEPPER_UMA_HOST_H_
 
 #include <set>
 #include <string>
 
+#include "base/files/file_path.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/host/resource_host.h"
 #include "url/gurl.h"
 
 namespace content {
 class RendererPpapiHost;
 }
 
 namespace ppapi {
@@ skipping 35 matching lines @@
 
   int32_t OnHistogramEnumeration(ppapi::host::HostMessageContext* context,
                                  const std::string& name,
                                  int32_t sample,
                                  int32_t boundary_value);
 
   int32_t OnIsCrashReportingEnabled(ppapi::host::HostMessageContext* context);
 
   const GURL document_url_;
   bool is_plugin_in_process_;
+  base::FilePath plugin_base_name_;
 
   // Set of origins that can use UMA private APIs from NaCl.
   std::set<std::string> allowed_origins_;
   // Set of hashed histogram prefixes that can be used from this interface.
   std::set<std::string> allowed_histogram_prefixes_;
+  // Set of plugin files names that are allowed to use this interface.
+  std::set<std::string> allowed_plugin_base_names_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperUMAHost);
 };
 
 #endif  // CHROME_RENDERER_PEPPER_PEPPER_UMA_HOST_H_