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

Unified Diff: mojo/embedder/embedder_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 | « ipc/mojo/ipc_channel_mojo_unittest.cc ('k') | mojo/system/channel_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/embedder/embedder_unittest.cc
diff --git a/mojo/embedder/embedder_unittest.cc b/mojo/embedder/embedder_unittest.cc
index 5b74f441cb3144170c21fbeed1ff2f6ec3ca5a79..8ba7db8b3d079bfcb9ca74655da8986939d9fc73 100644
--- a/mojo/embedder/embedder_unittest.cc
+++ b/mojo/embedder/embedder_unittest.cc
@@ -12,6 +12,7 @@
#include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "base/synchronization/waitable_event.h"
+#include "base/test/test_io_thread.h"
#include "mojo/common/test/multiprocess_test_helper.h"
#include "mojo/embedder/platform_channel_pair.h"
#include "mojo/embedder/test_embedder.h"
@@ -100,14 +101,14 @@ class ScopedTestChannel {
class EmbedderTest : public testing::Test {
public:
- EmbedderTest() : test_io_thread_(system::test::TestIOThread::kAutoStart) {}
+ EmbedderTest() : test_io_thread_(base::TestIOThread::kAutoStart) {}
virtual ~EmbedderTest() {}
protected:
- system::test::TestIOThread* test_io_thread() { return &test_io_thread_; }
+ base::TestIOThread* test_io_thread() { return &test_io_thread_; }
private:
- system::test::TestIOThread test_io_thread_;
+ base::TestIOThread test_io_thread_;
DISALLOW_COPY_AND_ASSIGN(EmbedderTest);
};
@@ -460,8 +461,7 @@ MOJO_MULTIPROCESS_TEST_CHILD_TEST(MultiprocessChannelsClient) {
mojo::test::MultiprocessTestHelper::client_platform_handle.Pass();
EXPECT_TRUE(client_platform_handle.is_valid());
- system::test::TestIOThread test_io_thread(
- system::test::TestIOThread::kAutoStart);
+ base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart);
mojo::embedder::test::InitWithSimplePlatformSupport();
{
« no previous file with comments | « ipc/mojo/ipc_channel_mojo_unittest.cc ('k') | mojo/system/channel_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698