EDK: Add a TestIOThread::IsCurrentAndRunning().

mojo/edk/system/remote_message_pipe_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 <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "base/message_loop/message_loop.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/embedder/platform_shared_buffer.h"
 #include "mojo/edk/embedder/scoped_platform_handle.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/channel_endpoint_id.h"
 #include "mojo/edk/system/incoming_endpoint.h"
 #include "mojo/edk/system/message_pipe.h"
 #include "mojo/edk/system/message_pipe_dispatcher.h"
@@ skipping 66 matching lines @@
   }
 
   embedder::PlatformSupport* platform_support() { return &platform_support_; }
   test::TestIOThread* io_thread() { return &io_thread_; }
   // Warning: It's up to the caller to ensure that the returned channel
   // is/remains valid.
   Channel* channels(size_t i) { return channels_[i].get(); }
 
  private:
   void SetUpOnIOThread() {
-    CHECK_EQ(base::MessageLoop::current(), io_thread()->message_loop());
+    CHECK(io_thread()->IsCurrentAndRunning());
 
     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(io_thread()->IsCurrentAndRunning());
 
     if (channels_[0]) {
       channels_[0]->Shutdown();
       channels_[0] = nullptr;
     }
     if (channels_[1]) {
       channels_[1]->Shutdown();
       channels_[1] = nullptr;
     }
   }
 
   void CreateAndInitChannel(unsigned channel_index) {
-    CHECK_EQ(base::MessageLoop::current(), io_thread()->message_loop());
+    CHECK(io_thread()->IsCurrentAndRunning());
     CHECK(channel_index == 0 || channel_index == 1);
     CHECK(!channels_[channel_index]);
 
     channels_[channel_index] = MakeRefCounted<Channel>(&platform_support_);
     channels_[channel_index]->Init(
         RawChannel::Create(platform_handles_[channel_index].Pass()));
   }
 
   // TODO(vtl): The arguments should be rvalue references, but that doesn't
   // currently work correctly with base::Bind.
   void BootstrapChannelEndpointsOnIOThread(RefPtr<ChannelEndpoint> ep0,
                                            RefPtr<ChannelEndpoint> ep1) {
-    CHECK_EQ(base::MessageLoop::current(), io_thread()->message_loop());
+    CHECK(io_thread()->IsCurrentAndRunning());
 
     if (!channels_[0])
       CreateAndInitChannel(0);
     if (!channels_[1])
       CreateAndInitChannel(1);
 
     channels_[0]->SetBootstrapEndpoint(std::move(ep0));
     channels_[1]->SetBootstrapEndpoint(std::move(ep1));
   }
 
   // TODO(vtl): |ep| should be an rvalue reference, but that doesn't currently
   // work correctly with base::Bind.
   void BootstrapChannelEndpointOnIOThread(unsigned channel_index,
                                           RefPtr<ChannelEndpoint> ep) {
-    CHECK_EQ(base::MessageLoop::current(), io_thread()->message_loop());
+    CHECK(io_thread()->IsCurrentAndRunning());
     CHECK(channel_index == 0 || channel_index == 1);
 
     CreateAndInitChannel(channel_index);
     channels_[channel_index]->SetBootstrapEndpoint(std::move(ep));
   }
 
   void RestoreInitialStateOnIOThread() {
-    CHECK_EQ(base::MessageLoop::current(), io_thread()->message_loop());
+    CHECK(io_thread()->IsCurrentAndRunning());
 
     TearDownOnIOThread();
     SetUpOnIOThread();
   }
 
   embedder::SimplePlatformSupport platform_support_;
   test::TestIOThread io_thread_;
   embedder::ScopedPlatformHandle platform_handles_[2];
   RefPtr<Channel> channels_[2];
 
@@ skipping 1186 matching lines @@
   mp0->Close(0);
   mp1->Close(1);
   EXPECT_EQ(MOJO_RESULT_OK, dispatcher->Close());
   // Note that |local_mp|'s port 0 belong to |dispatcher|, which was closed.
   local_mp->Close(1);
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo