Update mojo sdk to rev f6c8ec07c01deebc13178d516225fd12695c3dc2

mojo/edk/system/message_pipe_test_utils.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/message_pipe_test_utils.h"
 
 #include "base/bind.h"
 #include "base/threading/platform_thread.h"  // For |Sleep()|.
 #include "mojo/edk/system/channel.h"
 #include "mojo/edk/system/channel_endpoint.h"
 #include "mojo/edk/system/message_pipe.h"
 #include "mojo/edk/system/waiter.h"
 
 namespace mojo {
 namespace system {
 namespace test {
 
 MojoResult WaitIfNecessary(scoped_refptr<MessagePipe> mp,
                            MojoHandleSignals signals,
                            HandleSignalsState* signals_state) {
   Waiter waiter;
   waiter.Init();
 
-  MojoResult add_result = mp->AddWaiter(0, &waiter, signals, 0, signals_state);
+  MojoResult add_result =
+      mp->AddAwakable(0, &waiter, signals, 0, signals_state);
   if (add_result != MOJO_RESULT_OK) {
     return (add_result == MOJO_RESULT_ALREADY_EXISTS) ? MOJO_RESULT_OK
                                                       : add_result;
   }
 
   MojoResult wait_result = waiter.Wait(MOJO_DEADLINE_INDEFINITE, nullptr);
-  mp->RemoveWaiter(0, &waiter, signals_state);
+  mp->RemoveAwakable(0, &waiter, signals_state);
   return wait_result;
 }
 
 ChannelThread::ChannelThread(embedder::PlatformSupport* platform_support)
     : platform_support_(platform_support),
       test_io_thread_(base::TestIOThread::kManualStart) {
 }
 
 ChannelThread::~ChannelThread() {
   Stop();
 }
 
 void ChannelThread::Start(embedder::ScopedPlatformHandle platform_handle,
                           scoped_refptr<ChannelEndpoint> channel_endpoint) {
   test_io_thread_.Start();
   test_io_thread_.PostTaskAndWait(
       FROM_HERE,
       base::Bind(&ChannelThread::InitChannelOnIOThread, base::Unretained(this),
                  base::Passed(&platform_handle), channel_endpoint));
 }
 
 void ChannelThread::Stop() {
-  if (channel_.get()) {
+  if (channel_) {
     // Hack to flush write buffers before quitting.
     // TODO(vtl): Remove this once |Channel| has a
     // |FlushWriteBufferAndShutdown()| (or whatever).
     while (!channel_->IsWriteBufferEmpty())
       base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(20));
 
     test_io_thread_.PostTaskAndWait(
         FROM_HERE, base::Bind(&ChannelThread::ShutdownChannelOnIOThread,
                               base::Unretained(this)));
   }
@@ skipping 13 matching lines @@
   // Attach and run the endpoint.
   // Note: On the "server" (parent process) side, we need not attach/run the
   // endpoint immediately. However, on the "client" (child process) side, this
   // *must* be done here -- otherwise, the |Channel| may receive/process
   // messages (which it can do as soon as it's hooked up to the IO thread
   // message loop, and that message loop runs) before the endpoint is attached.
   channel_->AttachAndRunEndpoint(channel_endpoint, true);
 }
 
 void ChannelThread::ShutdownChannelOnIOThread() {
-  CHECK(channel_.get());
+  CHECK(channel_);
   channel_->Shutdown();
   channel_ = nullptr;
 }
 
 #if !defined(OS_IOS)
 MultiprocessMessagePipeTestBase::MultiprocessMessagePipeTestBase()
     : channel_thread_(&platform_support_) {
 }
 
 MultiprocessMessagePipeTestBase::~MultiprocessMessagePipeTestBase() {
 }
 
 void MultiprocessMessagePipeTestBase::Init(scoped_refptr<ChannelEndpoint> ep) {
   channel_thread_.Start(helper_.server_platform_handle.Pass(), ep);
 }
 #endif
 
 }  // namespace test
 }  // namespace system
 }  // namespace mojo