EDK: Make mojo::embedder::AsyncWait (etc.) take an std::function instead of a base::Callback.

mojo/edk/embedder/embedder_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 "mojo/edk/embedder/embedder.h"
 
 #include <string.h>
 
 #include <memory>
 
@@ skipping 225 matching lines @@
 }
 
 TEST_F(EmbedderTest, AsyncWait) {
   ScopedMessagePipeHandle client_mp;
   ScopedMessagePipeHandle server_mp;
   EXPECT_EQ(MOJO_RESULT_OK, CreateMessagePipe(nullptr, &client_mp, &server_mp));
 
   TestAsyncWaiter waiter;
   EXPECT_EQ(MOJO_RESULT_OK,
             AsyncWait(client_mp.get().value(), MOJO_HANDLE_SIGNAL_READABLE,
-                      base::Bind(&TestAsyncWaiter::Awake,
-                                 base::Unretained(&waiter))));
+                      [&waiter](MojoResult result) { waiter.Awake(result); }));
 
   test_io_thread().PostTask(base::Bind(&WriteHello, server_mp.get()));
   EXPECT_TRUE(waiter.TryWait());
   EXPECT_EQ(MOJO_RESULT_OK, waiter.wait_result());
 
   // If message is in the queue, it does't allow us to wait.
   TestAsyncWaiter waiter_that_doesnt_wait;
   EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,
             AsyncWait(client_mp.get().value(), MOJO_HANDLE_SIGNAL_READABLE,
-                      base::Bind(&TestAsyncWaiter::Awake,
-                                 base::Unretained(&waiter_that_doesnt_wait))));
+                      [&waiter_that_doesnt_wait](MojoResult result) {
+                        waiter_that_doesnt_wait.Awake(result);
+                      }));
 
   char buffer[1000];
   uint32_t num_bytes = static_cast<uint32_t>(sizeof(buffer));
   CHECK_EQ(MOJO_RESULT_OK,
            ReadMessageRaw(client_mp.get(), buffer, &num_bytes, nullptr, nullptr,
                           MOJO_READ_MESSAGE_FLAG_NONE));
 
   TestAsyncWaiter unsatisfiable_waiter;
   EXPECT_EQ(MOJO_RESULT_OK,
             AsyncWait(client_mp.get().value(), MOJO_HANDLE_SIGNAL_READABLE,
-                      base::Bind(&TestAsyncWaiter::Awake,
-                                 base::Unretained(&unsatisfiable_waiter))));
+                      [&unsatisfiable_waiter](MojoResult result) {
+                        unsatisfiable_waiter.Awake(result);
+                      }));
 
   test_io_thread().PostTask(
       base::Bind(&CloseScopedHandle, base::Passed(server_mp.Pass())));
 
   EXPECT_TRUE(unsatisfiable_waiter.TryWait());
   EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION,
             unsatisfiable_waiter.wait_result());
 }
 
 TEST_F(EmbedderTest, ChannelsHandlePassing) {
@@ skipping 500 matching lines @@
 
   EXPECT_TRUE(test::Shutdown());
 }
 
 // TODO(vtl): Test immediate write & close.
 // TODO(vtl): Test broken-connection cases.
 
 }  // namespace
 }  // namespace embedder
 }  // namespace mojo