| Index: content/browser/plugin_service_impl.cc
|
| ===================================================================
|
| --- content/browser/plugin_service_impl.cc (revision 155271)
|
| +++ content/browser/plugin_service_impl.cc (working copy)
|
| @@ -288,6 +288,7 @@
|
| PpapiPluginProcessHost* PluginServiceImpl::FindOrStartPpapiPluginProcess(
|
| const FilePath& plugin_path,
|
| const FilePath& profile_data_directory,
|
| + int render_process_id,
|
| PpapiPluginProcessHost::PluginClient* client) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
|
|
| @@ -303,8 +304,7 @@
|
|
|
| // This plugin isn't loaded by any plugin process, so create a new process.
|
| return PpapiPluginProcessHost::CreatePluginHost(
|
| - *info, profile_data_directory,
|
| - client->GetResourceContext()->GetHostResolver());
|
| + *info, profile_data_directory, render_process_id);
|
| }
|
|
|
| PpapiPluginProcessHost* PluginServiceImpl::FindOrStartPpapiBrokerProcess(
|
| @@ -353,9 +353,10 @@
|
| void PluginServiceImpl::OpenChannelToPpapiPlugin(
|
| const FilePath& plugin_path,
|
| const FilePath& profile_data_directory,
|
| + int render_process_id,
|
| PpapiPluginProcessHost::PluginClient* client) {
|
| PpapiPluginProcessHost* plugin_host = FindOrStartPpapiPluginProcess(
|
| - plugin_path, profile_data_directory, client);
|
| + plugin_path, profile_data_directory, render_process_id, client);
|
| if (plugin_host) {
|
| plugin_host->OpenChannelToPlugin(client);
|
| } else {
|
|
|