EDK: Add a mojo::test::SimpleTestThread (and use it).

mojo/edk/system/channel_manager_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/edk/system/channel_manager.h"
 
 #include "base/callback.h"
 #include "base/message_loop/message_loop.h"
 #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"
 
 namespace mojo {
 namespace system {
 namespace {
 
 class ChannelManagerTest : public testing::Test {
  public:
   ChannelManagerTest()
@@ skipping 67 matching lines @@
 
   channel_manager().ShutdownChannelOnIOThread(id1);
   EXPECT_TRUE(ch1->HasOneRef());
   channel_manager().ShutdownChannelOnIOThread(id2);
   EXPECT_TRUE(ch2->HasOneRef());
 
   EXPECT_EQ(MOJO_RESULT_OK, d1->Close());
   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.
   OtherThread(scoped_refptr<base::TaskRunner> task_runner,
               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) {}
   ~OtherThread() override {}
 
  private:
   void Run() override {
     // TODO(vtl): Once we have a way of creating a channel from off the I/O
     // thread, do that here instead.
 
@@ skipping 42 matching lines @@
 
   EXPECT_EQ(MOJO_RESULT_OK, d->Close());
 }
 
 // TODO(vtl): Test |CreateChannelWithoutBootstrapOnIOThread()|. (This will
 // require additional functionality in |Channel|.)
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo