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

Unified Diff: mojo/edk/system/channel_manager_unittest.cc

Issue 1361143004: EDK: Add a mojo::test::SimpleTestThread (and use it). (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 3 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 | « no previous file | mojo/edk/system/dispatcher_unittest.cc » ('j') | mojo/edk/test/simple_test_thread.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/channel_manager_unittest.cc
diff --git a/mojo/edk/system/channel_manager_unittest.cc b/mojo/edk/system/channel_manager_unittest.cc
index 2d38b619d1f1eac82706a5416c32f7d0c7cbb6eb..23bf1439bd1840890f91a74d1e84e6e6446d8af2 100644
--- a/mojo/edk/system/channel_manager_unittest.cc
+++ b/mojo/edk/system/channel_manager_unittest.cc
@@ -9,12 +9,12 @@
#include "base/run_loop.h"
#include "base/task_runner.h"
#include "base/thread_task_runner_handle.h"
-#include "base/threading/simple_thread.h"
#include "mojo/edk/embedder/platform_channel_pair.h"
#include "mojo/edk/embedder/simple_platform_support.h"
#include "mojo/edk/system/channel.h"
#include "mojo/edk/system/channel_endpoint.h"
#include "mojo/edk/system/message_pipe_dispatcher.h"
+#include "mojo/edk/test/simple_test_thread.h"
#include "mojo/public/cpp/system/macros.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -102,7 +102,7 @@ TEST_F(ChannelManagerTest, TwoChannels) {
EXPECT_EQ(MOJO_RESULT_OK, d2->Close());
}
-class OtherThread : public base::SimpleThread {
+class OtherThread : public mojo::test::SimpleTestThread {
public:
// Note: There should be no other refs to the channel identified by
// |channel_id| outside the channel manager.
@@ -110,8 +110,7 @@ class OtherThread : public base::SimpleThread {
ChannelManager* channel_manager,
ChannelId channel_id,
const base::Closure& quit_closure)
- : base::SimpleThread("other_thread"),
- task_runner_(task_runner),
+ : task_runner_(task_runner),
channel_manager_(channel_manager),
channel_id_(channel_id),
quit_closure_(quit_closure) {}
« no previous file with comments | « no previous file | mojo/edk/system/dispatcher_unittest.cc » ('j') | mojo/edk/test/simple_test_thread.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698