summaryrefslogtreecommitdiffstats
path: root/ipc/ipc_send_fds_test.cc
diff options
context:
space:
mode:
authormorrita@chromium.org <morrita@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-30 03:58:59 +0000
committermorrita@chromium.org <morrita@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-30 03:58:59 +0000
commite482111a87c5415af8aaf33636f00c650c19b61e (patch)
tree2aaac1052209eb2ff1d1e3be3dac7f9010bef8b7 /ipc/ipc_send_fds_test.cc
parent1df3479c2fff2122dd136c8eb2838034324fae9e (diff)
downloadchromium_src-e482111a87c5415af8aaf33636f00c650c19b61e.zip
chromium_src-e482111a87c5415af8aaf33636f00c650c19b61e.tar.gz
chromium_src-e482111a87c5415af8aaf33636f00c650c19b61e.tar.bz2
Introduce IPC::Channel::Create*() to ensure it being heap-allocated.
This change introduces IPC::Channel::Create*() API to turn IPC::Channel into a heap allocated object. This will allow us to make Channel a polymorphic class. This change also tries to hide Channel::Mode from public API so that we can simplify channel creation code paths cleaner in following changes. ChannelProxy has to follow same pattern to finish this cleanup. Such changes will follow. TEST=none BUG=377980 R=darin@chromium.org,cpu@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=273575 Review URL: https://codereview.chromium.org/307653003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273713 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_send_fds_test.cc')
-rw-r--r--ipc/ipc_send_fds_test.cc16
1 files changed, 6 insertions, 10 deletions
diff --git a/ipc/ipc_send_fds_test.cc b/ipc/ipc_send_fds_test.cc
index aeec890..7e6a4e4 100644
--- a/ipc/ipc_send_fds_test.cc
+++ b/ipc/ipc_send_fds_test.cc
@@ -134,10 +134,10 @@ int SendFdsClientCommon(const std::string& test_client_name,
MyChannelDescriptorListener listener(expected_inode_num);
// Set up IPC channel.
- IPC::Channel channel(IPCTestBase::GetChannelName(test_client_name),
- IPC::Channel::MODE_CLIENT,
- &listener);
- CHECK(channel.Connect());
+ scoped_ptr<IPC::Channel> channel(IPC::Channel::CreateClient(
+ IPCTestBase::GetChannelName(test_client_name),
+ &listener));
+ CHECK(channel->Connect());
// Run message loop.
base::MessageLoop::current()->Run();
@@ -233,14 +233,10 @@ class PipeChannelHelper {
void Init() {
IPC::ChannelHandle in_handle("IN");
- in.reset(new IPC::Channel(in_handle,
- IPC::Channel::MODE_SERVER,
- &null_listener_));
+ in = IPC::Channel::CreateServer(in_handle, &null_listener_);
base::FileDescriptor out_fd(in->TakeClientFileDescriptor(), false);
IPC::ChannelHandle out_handle("OUT", out_fd);
- out.reset(new IPC::Channel(out_handle,
- IPC::Channel::MODE_CLIENT,
- &cb_listener_));
+ out = IPC::Channel::CreateClient(out_handle, &cb_listener_);
// PostTask the connect calls to make sure the callbacks happens
// on the right threads.
in_thread_->message_loop()->PostTask(