EDK: Add a TestIOThread::IsCurrentAndRunning().

mojo/edk/system/channel_test_base.cc

Index: mojo/edk/system/channel_test_base.cc
diff --git a/mojo/edk/system/channel_test_base.cc b/mojo/edk/system/channel_test_base.cc
index ecb7d1b202b2dcdf394d73b1b034e233034ae3c6..933b5d1ec4dd5a650f4b7f867c4bb8e85cf8dfb5 100644
--- a/mojo/edk/system/channel_test_base.cc
+++ b/mojo/edk/system/channel_test_base.cc
@@ -7,7 +7,6 @@
 #include <utility>
 
 #include "base/logging.h"
-#include "base/message_loop/message_loop.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/system/raw_channel.h"
 
@@ -28,14 +27,14 @@ void ChannelTestBase::SetUp() {
 }
 
 void ChannelTestBase::CreateChannelOnIOThread(unsigned i) {
-  CHECK_EQ(base::MessageLoop::current(), io_thread()->message_loop());
+  CHECK(io_thread()->IsCurrentAndRunning());
 
   CHECK(!channels_[i]);
   channels_[i] = MakeRefCounted<Channel>(&platform_support_);
 }
 
 void ChannelTestBase::InitChannelOnIOThread(unsigned i) {
-  CHECK_EQ(base::MessageLoop::current(), io_thread()->message_loop());
+  CHECK(io_thread()->IsCurrentAndRunning());
 
   CHECK(raw_channels_[i]);
   CHECK(channels_[i]);
@@ -48,7 +47,7 @@ void ChannelTestBase::CreateAndInitChannelOnIOThread(unsigned i) {
 }
 
 void ChannelTestBase::ShutdownChannelOnIOThread(unsigned i) {
-  CHECK_EQ(base::MessageLoop::current(), io_thread()->message_loop());
+  CHECK(io_thread()->IsCurrentAndRunning());
 
   CHECK(channels_[i]);
   channels_[i]->Shutdown();
@@ -60,7 +59,7 @@ void ChannelTestBase::ShutdownAndReleaseChannelOnIOThread(unsigned i) {
 }
 
 void ChannelTestBase::SetUpOnIOThread() {
-  CHECK_EQ(base::MessageLoop::current(), io_thread()->message_loop());
+  CHECK(io_thread()->IsCurrentAndRunning());
 
   embedder::PlatformChannelPair channel_pair;
   raw_channels_[0] = RawChannel::Create(channel_pair.PassServerHandle());