Mojo: Replace TestWithIOThreadBase with just a helper TestIOThread class.

mojo/system/remote_message_pipe_posix_unittest.cc

 // Copyright 2013 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.
 
 // TODO(vtl): The POSIX-specific bits have been factored out. Apply this test to
 // non-POSIX once we have a non-POSIX implementation.
 
 #include <stdint.h>
 #include <string.h>
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/platform_thread.h"  // For |Sleep()|.
 #include "mojo/system/channel.h"
 #include "mojo/system/embedder/platform_channel_pair.h"
 #include "mojo/system/embedder/scoped_platform_handle.h"
 #include "mojo/system/local_message_pipe_endpoint.h"
 #include "mojo/system/message_pipe.h"
 #include "mojo/system/message_pipe_dispatcher.h"
 #include "mojo/system/proxy_message_pipe_endpoint.h"
 #include "mojo/system/test_utils.h"
 #include "mojo/system/waiter.h"
+#include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace system {
 namespace {
 
-class RemoteMessagePipeTest : public test::TestWithIOThreadBase {
+class RemoteMessagePipeTest : public testing::Test {
  public:
   RemoteMessagePipeTest() {}
   virtual ~RemoteMessagePipeTest() {}
 
   virtual void SetUp() OVERRIDE {
-    test::TestWithIOThreadBase::SetUp();
-    test::PostTaskAndWait(io_thread_task_runner(),
+    test::PostTaskAndWait(io_thread()->task_runner(),
                           FROM_HERE,
                           base::Bind(&RemoteMessagePipeTest::SetUpOnIOThread,
                                      base::Unretained(this)));
   }
 
   virtual void TearDown() OVERRIDE {
-    test::PostTaskAndWait(io_thread_task_runner(),
+    test::PostTaskAndWait(io_thread()->task_runner(),
                           FROM_HERE,
                           base::Bind(&RemoteMessagePipeTest::TearDownOnIOThread,
                                      base::Unretained(this)));
-    test::TestWithIOThreadBase::TearDown();
   }
 
+ protected:
   // This connects MP 0, port 1 and MP 1, port 0 (leaving MP 0, port 0 and MP 1,
   // port 1 as the user-visible endpoints) to channel 0 and 1, respectively. MP
   // 0, port 1 and MP 1, port 0 must have |ProxyMessagePipeEndpoint|s.
   void ConnectMessagePipes(scoped_refptr<MessagePipe> mp0,
                            scoped_refptr<MessagePipe> mp1) {
     test::PostTaskAndWait(
-        io_thread_task_runner(),
+        io_thread()->task_runner(),
         FROM_HERE,
         base::Bind(&RemoteMessagePipeTest::ConnectMessagePipesOnIOThread,
                    base::Unretained(this), mp0, mp1));
   }
 
   // This connects |mp|'s port |channel_index ^ 1| to channel |channel_index|.
   // It assumes/requires that this is the bootstrap case, i.e., that the
   // endpoint IDs are both/will both be |Channel::kBootstrapEndpointId|. This
   // returns *without* waiting for it to finish connecting.
   void BootstrapMessagePipeNoWait(unsigned channel_index,
                                   scoped_refptr<MessagePipe> mp) {
-    io_thread_task_runner()->PostTask(
+    io_thread()->task_runner()->PostTask(
         FROM_HERE,
         base::Bind(&RemoteMessagePipeTest::BootstrapMessagePipeOnIOThread,
                    base::Unretained(this), channel_index, mp));
   }
 
   void RestoreInitialState() {
     test::PostTaskAndWait(
-        io_thread_task_runner(),
+        io_thread()->task_runner(),
         FROM_HERE,
         base::Bind(&RemoteMessagePipeTest::RestoreInitialStateOnIOThread,
                    base::Unretained(this)));
   }
 
+  test::TestIOThread* io_thread() { return &io_thread_; }
+
  private:
   void SetUpOnIOThread() {
-    CHECK_EQ(base::MessageLoop::current(), io_thread_message_loop());
+    CHECK_EQ(base::MessageLoop::current(), io_thread()->message_loop());
 
     embedder::PlatformChannelPair channel_pair;
     platform_handles_[0] = channel_pair.PassServerHandle();
     platform_handles_[1] = channel_pair.PassClientHandle();
   }
 
   void TearDownOnIOThread() {
-    CHECK_EQ(base::MessageLoop::current(), io_thread_message_loop());
+    CHECK_EQ(base::MessageLoop::current(), io_thread()->message_loop());
 
     if (channels_[0].get()) {
       channels_[0]->Shutdown();
       channels_[0] = NULL;
     }
     if (channels_[1].get()) {
       channels_[1]->Shutdown();
       channels_[1] = NULL;
     }
   }
 
   void CreateAndInitChannel(unsigned channel_index) {
-    CHECK_EQ(base::MessageLoop::current(), io_thread_message_loop());
+    CHECK_EQ(base::MessageLoop::current(), io_thread()->message_loop());
     CHECK(channel_index == 0 || channel_index == 1);
     CHECK(!channels_[channel_index].get());
 
     channels_[channel_index] = new Channel();
     CHECK(channels_[channel_index]->Init(
         platform_handles_[channel_index].Pass()));
   }
 
   void ConnectMessagePipesOnIOThread(scoped_refptr<MessagePipe> mp0,
                                      scoped_refptr<MessagePipe> mp1) {
-    CHECK_EQ(base::MessageLoop::current(), io_thread_message_loop());
+    CHECK_EQ(base::MessageLoop::current(), io_thread()->message_loop());
 
     if (!channels_[0].get())
       CreateAndInitChannel(0);
     if (!channels_[1].get())
       CreateAndInitChannel(1);
 
     MessageInTransit::EndpointId local_id0 =
         channels_[0]->AttachMessagePipeEndpoint(mp0, 1);
     MessageInTransit::EndpointId local_id1 =
         channels_[1]->AttachMessagePipeEndpoint(mp1, 0);
 
     channels_[0]->RunMessagePipeEndpoint(local_id0, local_id1);
     channels_[1]->RunMessagePipeEndpoint(local_id1, local_id0);
   }
 
   void BootstrapMessagePipeOnIOThread(unsigned channel_index,
                                       scoped_refptr<MessagePipe> mp) {
-    CHECK_EQ(base::MessageLoop::current(), io_thread_message_loop());
+    CHECK_EQ(base::MessageLoop::current(), io_thread()->message_loop());
     CHECK(channel_index == 0 || channel_index == 1);
 
     unsigned port = channel_index ^ 1u;
 
     // Important: If we don't boot
     CreateAndInitChannel(channel_index);
     CHECK_EQ(channels_[channel_index]->AttachMessagePipeEndpoint(mp, port),
              Channel::kBootstrapEndpointId);
     channels_[channel_index]->RunMessagePipeEndpoint(
         Channel::kBootstrapEndpointId, Channel::kBootstrapEndpointId);
   }
 
   void RestoreInitialStateOnIOThread() {
-    CHECK_EQ(base::MessageLoop::current(), io_thread_message_loop());
+    CHECK_EQ(base::MessageLoop::current(), io_thread()->message_loop());
 
     TearDownOnIOThread();
     SetUpOnIOThread();
   }
 
+  test::TestIOThread io_thread_;
   embedder::ScopedPlatformHandle platform_handles_[2];
   scoped_refptr<Channel> channels_[2];
 
   DISALLOW_COPY_AND_ASSIGN(RemoteMessagePipeTest);
 };
 
 TEST_F(RemoteMessagePipeTest, Basic) {
   const char hello[] = "hello";
   const char world[] = "world!!!1!!!1!";
   char buffer[100] = { 0 };
@@ skipping 394 matching lines @@
         scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint()),
         scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint())));
     BootstrapMessagePipeNoWait(0, mp0);
 
     scoped_refptr<MessagePipe> mp1(new MessagePipe(
         scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint()),
         scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint())));
     BootstrapMessagePipeNoWait(1, mp1);
 
     if (i & 1u) {
-      io_thread_task_runner()->PostTask(
+      io_thread()->task_runner()->PostTask(
           FROM_HERE, base::Bind(&base::PlatformThread::Sleep, delay));
     }
     if (i & 2u)
       base::PlatformThread::Sleep(delay);
 
     mp0->Close(0);
 
     if (i & 4u) {
-      io_thread_task_runner()->PostTask(
+      io_thread()->task_runner()->PostTask(
           FROM_HERE, base::Bind(&base::PlatformThread::Sleep, delay));
     }
     if (i & 8u)
       base::PlatformThread::Sleep(delay);
 
     mp1->Close(1);
 
     RestoreInitialState();
   }
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo