Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1910)

Unified Diff: mojo/system/channel_unittest.cc

Issue 488003003: Add ChannelProxy benchmark to ipc_perftests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Landing. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/embedder/embedder_unittest.cc ('k') | mojo/system/message_pipe_test_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/system/channel_unittest.cc
diff --git a/mojo/system/channel_unittest.cc b/mojo/system/channel_unittest.cc
index bdde6f603d923c0b2ed26dee31863f8b66a84cc9..c556b6c781fda4e092b1ca4dda15716230729050 100644
--- a/mojo/system/channel_unittest.cc
+++ b/mojo/system/channel_unittest.cc
@@ -7,6 +7,7 @@
#include "base/bind.h"
#include "base/location.h"
#include "base/message_loop/message_loop.h"
+#include "base/test/test_io_thread.h"
#include "mojo/embedder/platform_channel_pair.h"
#include "mojo/embedder/simple_platform_support.h"
#include "mojo/system/message_in_transit.h"
@@ -29,7 +30,7 @@ Tristate BoolToTristate(bool b) {
class ChannelTest : public testing::Test {
public:
ChannelTest()
- : io_thread_(test::TestIOThread::kAutoStart),
+ : io_thread_(base::TestIOThread::kAutoStart),
init_result_(TRISTATE_UNKNOWN) {}
virtual ~ChannelTest() {}
@@ -61,7 +62,7 @@ class ChannelTest : public testing::Test {
channel_->Shutdown();
}
- test::TestIOThread* io_thread() { return &io_thread_; }
+ base::TestIOThread* io_thread() { return &io_thread_; }
RawChannel* raw_channel() { return raw_channel_.get(); }
scoped_ptr<RawChannel>* mutable_raw_channel() { return &raw_channel_; }
Channel* channel() { return channel_.get(); }
@@ -78,7 +79,7 @@ class ChannelTest : public testing::Test {
}
embedder::SimplePlatformSupport platform_support_;
- test::TestIOThread io_thread_;
+ base::TestIOThread io_thread_;
scoped_ptr<RawChannel> raw_channel_;
embedder::ScopedPlatformHandle other_platform_handle_;
scoped_refptr<Channel> channel_;
« no previous file with comments | « mojo/embedder/embedder_unittest.cc ('k') | mojo/system/message_pipe_test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698