Merge 180159

content/browser/plugin_service_impl.h

Index: content/browser/plugin_service_impl.h
===================================================================
--- content/browser/plugin_service_impl.h	(revision 183671)
+++ content/browser/plugin_service_impl.h	(working copy)
@@ -120,13 +120,14 @@
   // 'plugin_path' if needed. If the process fails to start, the return value
   // is NULL. Must be called on the IO thread.
   PluginProcessHost* FindOrStartNpapiPluginProcess(
-      const FilePath& plugin_path);
+      int render_process_id, const FilePath& plugin_path);
   PpapiPluginProcessHost* FindOrStartPpapiPluginProcess(
+      int render_process_id,
       const FilePath& plugin_path,
       const FilePath& profile_data_directory,
       PpapiPluginProcessHost::PluginClient* client);
   PpapiPluginProcessHost* FindOrStartPpapiBrokerProcess(
-      const FilePath& plugin_path);
+      int render_process_id, const FilePath& plugin_path);
 
   // Opens a channel to a plugin process for the given mime type, starting
   // a new plugin process if necessary.  This must be called on the IO thread
@@ -137,10 +138,12 @@
                                 const GURL& page_url,
                                 const std::string& mime_type,
                                 PluginProcessHost::Client* client);
-  void OpenChannelToPpapiPlugin(const FilePath& plugin_path,
+  void OpenChannelToPpapiPlugin(int render_process_id,
+                                const FilePath& plugin_path,
                                 const FilePath& profile_data_directory,
                                 PpapiPluginProcessHost::PluginClient* client);
-  void OpenChannelToPpapiBroker(const FilePath& path,
+  void OpenChannelToPpapiBroker(int render_process_id,
+                                const FilePath& path,
                                 PpapiPluginProcessHost::BrokerClient* client);
 
   // Cancels opening a channel to a NPAPI plugin.
@@ -198,9 +201,9 @@
 
   // Helper so we can finish opening the channel after looking up the
   // plugin.
-  void FinishOpenChannelToPlugin(
-      const FilePath& plugin_path,
-      PluginProcessHost::Client* client);
+  void FinishOpenChannelToPlugin(int render_process_id,
+                                 const FilePath& plugin_path,
+                                 PluginProcessHost::Client* client);
 
 #if defined(OS_POSIX) && !defined(OS_OPENBSD) && !defined(OS_ANDROID)
   // Registers a new FilePathWatcher for a given path.