summaryrefslogtreecommitdiffstats
path: root/ipc/ipc_test_base.cc
diff options
context:
space:
mode:
authormorrita <morrita@chromium.org>2014-09-09 12:35:24 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-09 19:41:40 +0000
commit373af03b7c0e1932c7ea3b832918b7767d47ff89 (patch)
tree5be2bbc870238a11e54e650434ddcf09472a9600 /ipc/ipc_test_base.cc
parent182520b878bee21aad3500391cd51d486e37bf1e (diff)
downloadchromium_src-373af03b7c0e1932c7ea3b832918b7767d47ff89.zip
chromium_src-373af03b7c0e1932c7ea3b832918b7767d47ff89.tar.gz
chromium_src-373af03b7c0e1932c7ea3b832918b7767d47ff89.tar.bz2
Add ipc_mojo_perftests
This change adds ipc_mojo_perftests that runs the same benchmark as of ipc_perftests. Now head-to-head comparison becomes possible. For this change, whole ipc_perftests logic is extracted to ipc_perftest_support.cc to make it reusable by ipc_mojo_perftests. TEST=none BUG=none R=jam@chromium.org, darin@chromium.org, yuzhu@chromium.org Review URL: https://codereview.chromium.org/536213002 Cr-Commit-Position: refs/heads/master@{#293988}
Diffstat (limited to 'ipc/ipc_test_base.cc')
-rw-r--r--ipc/ipc_test_base.cc22
1 files changed, 15 insertions, 7 deletions
diff --git a/ipc/ipc_test_base.cc b/ipc/ipc_test_base.cc
index 80ddd2d..6abef0f 100644
--- a/ipc/ipc_test_base.cc
+++ b/ipc/ipc_test_base.cc
@@ -52,8 +52,8 @@ void IPCTestBase::InitWithCustomMessageLoop(
}
void IPCTestBase::CreateChannel(IPC::Listener* listener) {
- return CreateChannelFromChannelHandle(GetChannelName(test_client_name_),
- listener);
+ CreateChannelFromChannelHandle(
+ GetChannelName(test_client_name_), listener);
}
bool IPCTestBase::ConnectChannel() {
@@ -80,7 +80,8 @@ void IPCTestBase::CreateChannelFromChannelHandle(
IPC::Listener* listener) {
CHECK(!channel_.get());
CHECK(!channel_proxy_.get());
- channel_ = IPC::Channel::CreateServer(channel_handle, listener);
+ channel_ = CreateChannelFactory(
+ channel_handle, task_runner().get())->BuildChannel(listener);
}
void IPCTestBase::CreateChannelProxy(
@@ -88,10 +89,11 @@ void IPCTestBase::CreateChannelProxy(
const scoped_refptr<base::SingleThreadTaskRunner>& ipc_task_runner) {
CHECK(!channel_.get());
CHECK(!channel_proxy_.get());
- channel_proxy_ = IPC::ChannelProxy::Create(GetChannelName(test_client_name_),
- IPC::Channel::MODE_SERVER,
- listener,
- ipc_task_runner);
+ channel_proxy_ = IPC::ChannelProxy::Create(
+ CreateChannelFactory(GetChannelName(test_client_name_),
+ ipc_task_runner.get()),
+ listener,
+ ipc_task_runner);
}
void IPCTestBase::DestroyChannelProxy() {
@@ -135,3 +137,9 @@ bool IPCTestBase::WaitForClientShutdown() {
scoped_refptr<base::TaskRunner> IPCTestBase::task_runner() {
return message_loop_->message_loop_proxy();
}
+
+scoped_ptr<IPC::ChannelFactory> IPCTestBase::CreateChannelFactory(
+ const IPC::ChannelHandle& handle,
+ base::TaskRunner* runner) {
+ return IPC::ChannelFactory::Create(handle, IPC::Channel::MODE_SERVER);
+}