summaryrefslogtreecommitdiffstats
path: root/components/nacl/renderer/trusted_plugin_channel.cc
diff options
context:
space:
mode:
authorlambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-02 20:29:30 +0000
committerlambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-02 20:29:30 +0000
commit3b0e466e530c99fe730a9a5e11dd416c48e052f8 (patch)
treed4f4d955edc7076fa3408c6625174179da5df72f /components/nacl/renderer/trusted_plugin_channel.cc
parentd53b6850a51ebedb7496036ae31e5f2dd142efff (diff)
downloadchromium_src-3b0e466e530c99fe730a9a5e11dd416c48e052f8.zip
chromium_src-3b0e466e530c99fe730a9a5e11dd416c48e052f8.tar.gz
chromium_src-3b0e466e530c99fe730a9a5e11dd416c48e052f8.tar.bz2
Revert 274310 "Introduce IPC::ChannelProxy::Create*() and IPC::S..."
Broke Windows compile: http://build.chromium.org/p/chromium.win/buildstatus?builder=Win%20x64%20Builder&number=180 FAILED: ninja -t msvc -e environment.x64 -- C:\b\build\goma/gomacc "C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64\cl.exe" /nologo /showIncludes /FC @obj\remoting\host\win\remoting_core.wts_session_process_delegate.obj.rsp /c ..\..\remoting\host\win\wts_session_process_delegate.cc /Foobj\remoting\host\win\remoting_core.wts_session_process_delegate.obj /Fdobj\remoting\remoting_core.cc.pdb c:\b\build\slave\win_x64_builder\build\src\remoting\host\win\wts_session_process_delegate.cc(386) : error C2661: 'IPC::ChannelProxy::ChannelProxy' : no overloaded function takes 4 arguments ninja: build stopped: subcommand failed. > Introduce IPC::ChannelProxy::Create*() and IPC::SynChannel::Create*() > > This change hides constructors of these classes so that we can turn > them polymorphic classes. > > Note that having almost identical ChannelProxy::Init*() isn't great > and they will be replaced by a factory-like abstraction in coming > changes. > > TEST=none > R=darin,cpu > BUG=377980 > > Review URL: https://codereview.chromium.org/301973003 TBR=morrita@chromium.org Review URL: https://codereview.chromium.org/312553004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274315 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/nacl/renderer/trusted_plugin_channel.cc')
-rw-r--r--components/nacl/renderer/trusted_plugin_channel.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/nacl/renderer/trusted_plugin_channel.cc b/components/nacl/renderer/trusted_plugin_channel.cc
index cfb9523..7ce3d84 100644
--- a/components/nacl/renderer/trusted_plugin_channel.cc
+++ b/components/nacl/renderer/trusted_plugin_channel.cc
@@ -17,8 +17,8 @@ TrustedPluginChannel::TrustedPluginChannel(
const base::Callback<void(int32_t)>& connected_callback,
base::WaitableEvent* waitable_event)
: connected_callback_(connected_callback),
- channel_(IPC::SyncChannel::CreateClient(
- handle, this,
+ channel_(new IPC::SyncChannel(
+ handle, IPC::Channel::MODE_CLIENT, this,
content::RenderThread::Get()->GetIOMessageLoopProxy(), true,
waitable_event)) {
}