EDK: Make mojo::platform::TaskRunner's PostTask() take an std::function<void()>.

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 "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"
@@ skipping 201 matching lines @@
  public:
   RemoteDataPipeImplTestHelper()
       : io_thread_(test::TestIOThread::StartMode::AUTO) {}
   ~RemoteDataPipeImplTestHelper() override {}
 
   void SetUp() override {
     RefPtr<ChannelEndpoint> ep[2];
     message_pipes_[0] = MessagePipe::CreateLocalProxy(&ep[0]);
     message_pipes_[1] = MessagePipe::CreateLocalProxy(&ep[1]);
 
-    io_thread_.PostTaskAndWait(base::Bind(
-        &RemoteDataPipeImplTestHelper::SetUpOnIOThread, base::Unretained(this),
-        base::Passed(&ep[0]), base::Passed(&ep[1])));
+    io_thread_.PostTaskAndWait([this, &ep]() mutable {
+      SetUpOnIOThread(std::move(ep[0]), std::move(ep[1]));
+    });
   }
 
   void TearDown() override {
     EnsureMessagePipeClosed(0);
     EnsureMessagePipeClosed(1);
-    io_thread_.PostTaskAndWait(
-        base::Bind(&RemoteDataPipeImplTestHelper::TearDownOnIOThread,
-                   base::Unretained(this)));
+    io_thread_.PostTaskAndWait([this]() { TearDownOnIOThread(); });
   }
 
   void Create(const MojoCreateDataPipeOptions& validated_options) override {
     CHECK(!dp_);
     dp_ = DataPipe::CreateLocal(validated_options);
   }
 
   bool IsStrictCircularBuffer() const override { return false; }
 
  protected:
@@ skipping 53 matching lines @@
   RefPtr<DataPipe> dp() { return dp_; }
 
  private:
   void EnsureMessagePipeClosed(size_t i) {
     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) {
+  void SetUpOnIOThread(RefPtr<ChannelEndpoint>&& ep0,
+                       RefPtr<ChannelEndpoint>&& ep1) {
     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));
   }
@@ skipping 2159 matching lines @@
   test::Sleep(10u);
 
   EXPECT_EQ(MOJO_RESULT_OK, this->ConsumerEndReadData(num_bytes));
 
   this->ConsumerClose();
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo