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 /ipc/ipc_sync_channel_unittest.cc | |
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 'ipc/ipc_sync_channel_unittest.cc')
-rw-r--r-- | ipc/ipc_sync_channel_unittest.cc | 65 |
1 files changed, 33 insertions, 32 deletions
diff --git a/ipc/ipc_sync_channel_unittest.cc b/ipc/ipc_sync_channel_unittest.cc index 33653c7..ca8d5d7 100644 --- a/ipc/ipc_sync_channel_unittest.cc +++ b/ipc/ipc_sync_channel_unittest.cc @@ -151,12 +151,12 @@ class Worker : public Listener, public Sender { } virtual SyncChannel* CreateChannel() { - scoped_ptr<SyncChannel> channel = SyncChannel::Create( - this, - ipc_thread_.message_loop_proxy().get(), - &shutdown_event_); - channel->InitByMode(channel_name_, mode_, true); - return channel.release(); + return new SyncChannel(channel_name_, + mode_, + this, + ipc_thread_.message_loop_proxy().get(), + true, + &shutdown_event_); } base::Thread* ListenerThread() { @@ -324,10 +324,9 @@ class TwoStepServer : public Worker { } virtual SyncChannel* CreateChannel() OVERRIDE { - SyncChannel* channel = SyncChannel::Create( - this, ipc_thread().message_loop_proxy().get(), - shutdown_event()).release(); - channel->InitByMode(channel_name(), mode(), create_pipe_now_); + SyncChannel* channel = new SyncChannel( + this, ipc_thread().message_loop_proxy().get(), shutdown_event()); + channel->Init(channel_name(), mode(), create_pipe_now_); return channel; } @@ -346,10 +345,9 @@ class TwoStepClient : public Worker { } virtual SyncChannel* CreateChannel() OVERRIDE { - SyncChannel* channel = SyncChannel::Create( - this, ipc_thread().message_loop_proxy().get(), - shutdown_event()).release(); - channel->InitByMode(channel_name(), mode(), create_pipe_now_); + SyncChannel* channel = new SyncChannel( + this, ipc_thread().message_loop_proxy().get(), shutdown_event()); + channel->Init(channel_name(), mode(), create_pipe_now_); return channel; } @@ -1137,12 +1135,13 @@ class RestrictedDispatchClient : public Worker { else LOG(ERROR) << "Send failed to dispatch incoming message on same channel"; - non_restricted_channel_ = - SyncChannel::CreateClient("non_restricted_channel", - this, - ipc_thread().message_loop_proxy().get(), - true, - shutdown_event()); + non_restricted_channel_.reset( + new SyncChannel("non_restricted_channel", + Channel::MODE_CLIENT, + this, + ipc_thread().message_loop_proxy().get(), + true, + shutdown_event())); server_->ListenerThread()->message_loop()->PostTask( FROM_HERE, base::Bind(&RestrictedDispatchServer::OnDoPing, server_, 2)); @@ -1527,12 +1526,13 @@ class RestrictedDispatchPipeWorker : public Worker { if (is_first()) event1_->Signal(); event2_->Wait(); - other_channel_ = SyncChannel::CreateClient( - other_channel_name_, - this, - ipc_thread().message_loop_proxy().get(), - true, - shutdown_event()); + other_channel_.reset( + new SyncChannel(other_channel_name_, + Channel::MODE_CLIENT, + this, + ipc_thread().message_loop_proxy().get(), + true, + shutdown_event())); other_channel_->SetRestrictDispatchChannelGroup(group_); if (!is_first()) { event1_->Signal(); @@ -1606,12 +1606,13 @@ class ReentrantReplyServer1 : public Worker { server_ready_(server_ready) { } virtual void Run() OVERRIDE { - server2_channel_ = SyncChannel::CreateClient( - "reentrant_reply2", - this, - ipc_thread().message_loop_proxy().get(), - true, - shutdown_event()); + server2_channel_.reset( + new SyncChannel("reentrant_reply2", + Channel::MODE_CLIENT, + this, + ipc_thread().message_loop_proxy().get(), + true, + shutdown_event())); server_ready_->Signal(); Message* msg = new SyncChannelTestMsg_Reentrant1(); server2_channel_->Send(msg); |