Merge 180159

content/browser/renderer_host/render_message_filter.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/render_message_filter.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 642 matching lines @@
     const std::vector<webkit::WebPluginInfo>& all_plugins) {
   // Filter the plugin list.
   PluginServiceFilter* filter = PluginServiceImpl::GetInstance()->GetFilter();
   std::vector<webkit::WebPluginInfo> plugins;
 
   int child_process_id = -1;
   int routing_id = MSG_ROUTING_NONE;
   for (size_t i = 0; i < all_plugins.size(); ++i) {
     // Copy because the filter can mutate.
     webkit::WebPluginInfo plugin(all_plugins[i]);
-    if (!filter || filter->ShouldUsePlugin(child_process_id,
+    if (!filter || filter->IsPluginEnabled(child_process_id,
                                            routing_id,
                                            resource_context_,
                                            GURL(),
                                            GURL(),
                                            &plugin)) {
       plugins.push_back(plugin);
     }
   }
 
   ViewHostMsg_GetPlugins::WriteReplyParams(reply_msg, plugins);
@@ skipping 26 matching lines @@
   plugin_host_clients_.insert(client);
   plugin_service_->OpenChannelToNpapiPlugin(
       render_process_id_, routing_id,
       url, policy_url, mime_type, client);
 }
 
 void RenderMessageFilter::OnOpenChannelToPepperPlugin(
     const FilePath& path,
     IPC::Message* reply_msg) {
   plugin_service_->OpenChannelToPpapiPlugin(
-      path, profile_data_directory_, new OpenChannelToPpapiPluginCallback(
-          this, resource_context_, reply_msg));
+      render_process_id_,
+      path,
+      profile_data_directory_,
+      new OpenChannelToPpapiPluginCallback(this, resource_context_, reply_msg));
 }
 
 void RenderMessageFilter::OnDidCreateOutOfProcessPepperInstance(
     int plugin_child_id,
     int32 pp_instance,
     PepperRendererInstanceData instance_data,
     bool is_external) {
   // It's important that we supply the render process ID ourselves based on the
   // channel the message arrived on. We use the
   //   PP_Instance -> (process id, view id)
@@ skipping 29 matching lines @@
   } else {
     PpapiPluginProcessHost::DidDeleteOutOfProcessInstance(
         plugin_child_id, pp_instance);
   }
 }
 
 void RenderMessageFilter::OnOpenChannelToPpapiBroker(int routing_id,
                                                      int request_id,
                                                      const FilePath& path) {
   plugin_service_->OpenChannelToPpapiBroker(
-      path, new OpenChannelToPpapiBrokerCallback(this, routing_id, request_id));
+      render_process_id_,
+      path,
+      new OpenChannelToPpapiBrokerCallback(this, routing_id, request_id));
 }
 
 void RenderMessageFilter::OnGenerateRoutingID(int* route_id) {
   *route_id = render_widget_helper_->GetNextRoutingID();
 }
 
 void RenderMessageFilter::OnGetCPUUsage(int* cpu_usage) {
   base::TimeTicks now = base::TimeTicks::Now();
   int64 since_last_sample_ms = (now - cpu_usage_sample_time_).InMilliseconds();
   if (since_last_sample_ms > kCPUUsageSampleIntervalMs) {
@@ skipping 365 matching lines @@
 
   HENHMETAFILE metafile = CloseEnhMetaFile(hdc);
 
   if (metafile) {
     DeleteEnhMetaFile(metafile);
   }
 }
 #endif
 
 }  // namespace content