EDK: Add a TestIOThread::IsCurrentAndRunning().

mojo/edk/system/data_pipe_impl_unittest.cc

 // Copyright 2015 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.
 
 // This file contains tests that are shared between different implementations of
 // |DataPipeImpl|.
 
 #include "mojo/edk/system/data_pipe_impl.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
 
 #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/simple_platform_support.h"
 #include "mojo/edk/system/channel.h"
 #include "mojo/edk/system/channel_endpoint.h"
 #include "mojo/edk/system/data_pipe.h"
 #include "mojo/edk/system/data_pipe_consumer_dispatcher.h"
 #include "mojo/edk/system/data_pipe_producer_dispatcher.h"
 #include "mojo/edk/system/memory.h"
 #include "mojo/edk/system/message_pipe.h"
 #include "mojo/edk/system/raw_channel.h"
@@ skipping 288 matching lines @@
     if (!message_pipes_[i])
       return;
     message_pipes_[i]->Close(0);
     message_pipes_[i] = nullptr;
   }
 
   // TODO(vtl): The arguments should be rvalue references, but that doesn't
   // currently work correctly with base::Bind.
   void SetUpOnIOThread(RefPtr<ChannelEndpoint> ep0,
                        RefPtr<ChannelEndpoint> ep1) {
-    CHECK_EQ(base::MessageLoop::current(), io_thread_.message_loop());
+    CHECK(io_thread_.IsCurrentAndRunning());
 
     embedder::PlatformChannelPair channel_pair;
     channels_[0] = MakeRefCounted<Channel>(&platform_support_);
     channels_[0]->Init(RawChannel::Create(channel_pair.PassServerHandle()));
     channels_[0]->SetBootstrapEndpoint(std::move(ep0));
     channels_[1] = MakeRefCounted<Channel>(&platform_support_);
     channels_[1]->Init(RawChannel::Create(channel_pair.PassClientHandle()));
     channels_[1]->SetBootstrapEndpoint(std::move(ep1));
   }
 
   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;
     }
   }
@@ skipping 2146 matching lines @@
   test::Sleep(10u);
 
   EXPECT_EQ(MOJO_RESULT_OK, this->ConsumerEndReadData(num_bytes));
 
   this->ConsumerClose();
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo