summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/webplugin_delegate_proxy.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-21 21:06:23 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-21 21:06:23 +0000
commit421d1cd06fb54c660e0f251df5a0d6403a214670 (patch)
tree174505a79267a4ac711bb20f4730f8c8f65f81ad /chrome/renderer/webplugin_delegate_proxy.cc
parent830853df6093d39820366da09a18296097335d56 (diff)
downloadchromium_src-421d1cd06fb54c660e0f251df5a0d6403a214670.zip
chromium_src-421d1cd06fb54c660e0f251df5a0d6403a214670.tar.gz
chromium_src-421d1cd06fb54c660e0f251df5a0d6403a214670.tar.bz2
Revert r21117 as it caused reliability failures.
Also included in this revert: r21165, r21180, and a couple valgrind suppression edits TBR=huanr Review URL: http://codereview.chromium.org/155876 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21216 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/webplugin_delegate_proxy.cc')
-rw-r--r--chrome/renderer/webplugin_delegate_proxy.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc
index 603db89..45a98bf 100644
--- a/chrome/renderer/webplugin_delegate_proxy.cc
+++ b/chrome/renderer/webplugin_delegate_proxy.cc
@@ -237,9 +237,10 @@ bool WebPluginDelegateProxy::Initialize(const GURL& url, char** argn,
IPC::AddChannelSocket(channel_handle.name, channel_handle.socket.fd);
#endif
+ MessageLoop* ipc_message_loop = RenderThread::current()->owner_loop();
scoped_refptr<PluginChannelHost> channel_host =
- PluginChannelHost::GetPluginChannelHost(
- channel_handle.name, ChildProcess::current()->io_message_loop());
+ PluginChannelHost::GetPluginChannelHost(channel_handle.name,
+ ipc_message_loop);
if (!channel_host.get())
return false;