diff options
| author | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-02 20:29:30 +0000 |
|---|---|---|
| committer | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-02 20:29:30 +0000 |
| commit | 3b0e466e530c99fe730a9a5e11dd416c48e052f8 (patch) | |
| tree | d4f4d955edc7076fa3408c6625174179da5df72f /ppapi/proxy | |
| parent | d53b6850a51ebedb7496036ae31e5f2dd142efff (diff) | |
| download | chromium_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 'ppapi/proxy')
| -rw-r--r-- | ppapi/proxy/proxy_channel.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/ppapi/proxy/proxy_channel.cc b/ppapi/proxy/proxy_channel.cc index db2a30f..b7f8a82 100644 --- a/ppapi/proxy/proxy_channel.cc +++ b/ppapi/proxy/proxy_channel.cc @@ -31,14 +31,11 @@ bool ProxyChannel::InitWithChannel(Delegate* delegate, bool is_client) { delegate_ = delegate; peer_pid_ = peer_pid; - channel_ = IPC::SyncChannel::Create( - this, - delegate->GetIPCMessageLoop(), - delegate->GetShutdownEvent()); - if (is_client) - channel_->InitClient(channel_handle, true); - else - channel_->InitServer(channel_handle, true); + IPC::Channel::Mode mode = is_client ? IPC::Channel::MODE_CLIENT + : IPC::Channel::MODE_SERVER; + channel_.reset(new IPC::SyncChannel(channel_handle, mode, this, + delegate->GetIPCMessageLoop(), true, + delegate->GetShutdownEvent())); return true; } |