diff options
| author | ygorshenin@chromium.org <ygorshenin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-28 19:42:59 +0000 |
|---|---|---|
| committer | ygorshenin@chromium.org <ygorshenin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-28 19:42:59 +0000 |
| commit | 8522332eef21df16cac696d7725f4b5eeebc3be6 (patch) | |
| tree | 8a2704f6dd82e0a8ef9ed247766cdb63a7728e1e /content/browser/plugin_service_impl.cc | |
| parent | a23bccf2686126046ec29b7cbe69b0b9c809a153 (diff) | |
| download | chromium_src-8522332eef21df16cac696d7725f4b5eeebc3be6.zip chromium_src-8522332eef21df16cac696d7725f4b5eeebc3be6.tar.gz chromium_src-8522332eef21df16cac696d7725f4b5eeebc3be6.tar.bz2 | |
TCPSockets are switched to the new Pepper proxy.
BUG=230784
TEST=browser_tests:*TCPSocket*, *TCPServerSocket*
Review URL: https://chromiumcodereview.appspot.com/22923014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220073 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_service_impl.cc')
| -rw-r--r-- | content/browser/plugin_service_impl.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc index 6682a4d..3837223 100644 --- a/content/browser/plugin_service_impl.cc +++ b/content/browser/plugin_service_impl.cc @@ -328,8 +328,7 @@ PluginProcessHost* PluginServiceImpl::FindOrStartNpapiPluginProcess( PpapiPluginProcessHost* PluginServiceImpl::FindOrStartPpapiPluginProcess( int render_process_id, const base::FilePath& plugin_path, - const base::FilePath& profile_data_directory, - PpapiPluginProcessHost::PluginClient* client) { + const base::FilePath& profile_data_directory) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); if (filter_ && !filter_->CanLoadPlugin(render_process_id, plugin_path)) @@ -356,8 +355,7 @@ PpapiPluginProcessHost* PluginServiceImpl::FindOrStartPpapiPluginProcess( // 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); } PpapiPluginProcessHost* PluginServiceImpl::FindOrStartPpapiBrokerProcess( @@ -413,7 +411,7 @@ void PluginServiceImpl::OpenChannelToPpapiPlugin( const base::FilePath& profile_data_directory, PpapiPluginProcessHost::PluginClient* client) { PpapiPluginProcessHost* plugin_host = FindOrStartPpapiPluginProcess( - render_process_id, plugin_path, profile_data_directory, client); + render_process_id, plugin_path, profile_data_directory); if (plugin_host) { plugin_host->OpenChannelToPlugin(client); } else { |