mojo::Callback -> base::Callback

mojo/public/cpp/bindings/tests/connector_unittest.cc

 // Copyright 2013 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/public/cpp/bindings/lib/connector.h"
 
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 #include <utility>
 
+#include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "mojo/public/cpp/bindings/lib/message_builder.h"
 #include "mojo/public/cpp/bindings/tests/message_queue.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace test {
 namespace {
 
 class MessageAccumulator : public MessageReceiver {
  public:
   MessageAccumulator() {}
   explicit MessageAccumulator(const Closure& closure) : closure_(closure) {}
 
   bool Accept(Message* message) override {
     queue_.Push(message);
     if (!closure_.is_null()) {
       Closure closure = closure_;
-      closure_.reset();
+      closure_.Reset();
       closure.Run();
     }
     return true;
   }
 
   bool IsEmpty() const { return queue_.IsEmpty(); }
 
   void Pop(Message* message) { queue_.Pop(message); }
 
   void set_closure(const Closure& closure) { closure_ = closure; }
@@ skipping 404 matching lines @@
     accumulator.Pop(&message_received);
 
     EXPECT_EQ(
         std::string(kText[i]),
         std::string(reinterpret_cast<const char*>(message_received.payload())));
   }
 
   ASSERT_EQ(2, accumulator.number_of_calls());
 }
 
+void ForwardErrorHandler(bool* called, const base::Closure& callback) {
+  *called = true;
+  callback.Run();
+}
+
 TEST_F(ConnectorTest, RaiseError) {
   base::RunLoop run_loop, run_loop2;
   internal::Connector connector0(std::move(handle0_),
                                  internal::Connector::SINGLE_THREADED_SEND,
                                  base::ThreadTaskRunnerHandle::Get());
   bool error_handler_called0 = false;
   connector0.set_connection_error_handler(
-      [&error_handler_called0, &run_loop]() {
-        error_handler_called0 = true;
-        run_loop.Quit();
-      });
+      base::Bind(&ForwardErrorHandler, &error_handler_called0,
+                 run_loop.QuitClosure()));
 
   internal::Connector connector1(std::move(handle1_),
                                  internal::Connector::SINGLE_THREADED_SEND,
                                  base::ThreadTaskRunnerHandle::Get());
   bool error_handler_called1 = false;
   connector1.set_connection_error_handler(
-      [&error_handler_called1, &run_loop2]() {
-        error_handler_called1 = true;
-        run_loop2.Quit();
-      });
+      base::Bind(&ForwardErrorHandler, &error_handler_called1,
+                 run_loop2.QuitClosure()));
 
   const char kText[] = "hello world";
 
   Message message;
   AllocMessage(kText, &message);
 
   connector0.Accept(&message);
   connector0.RaiseError();
 
   base::RunLoop run_loop3;
@@ skipping 21 matching lines @@
 
   // The error flag is set at both sides.
   EXPECT_TRUE(connector0.encountered_error());
   EXPECT_TRUE(connector1.encountered_error());
 
   // The message pipe handle is valid at both sides.
   EXPECT_TRUE(connector0.is_valid());
   EXPECT_TRUE(connector1.is_valid());
 }
 
+void PauseConnectorAndRunClosure(internal::Connector* connector,
+                                 const base::Closure& closure) {
+  connector->PauseIncomingMethodCallProcessing();
+  closure.Run();
+}
+
 TEST_F(ConnectorTest, PauseWithQueuedMessages) {
   internal::Connector connector0(std::move(handle0_),
                                  internal::Connector::SINGLE_THREADED_SEND,
                                  base::ThreadTaskRunnerHandle::Get());
   internal::Connector connector1(std::move(handle1_),
                                  internal::Connector::SINGLE_THREADED_SEND,
                                  base::ThreadTaskRunnerHandle::Get());
 
   const char kText[] = "hello world";
 
   // Queue up two messages.
   Message message;
   AllocMessage(kText, &message);
   connector0.Accept(&message);
   AllocMessage(kText, &message);
   connector0.Accept(&message);
 
   base::RunLoop run_loop;
   // Configure the accumulator such that it pauses after the first message is
   // received.
-  MessageAccumulator accumulator([&connector1, &run_loop]() {
-    connector1.PauseIncomingMethodCallProcessing();
-    run_loop.Quit();
-  });
+  MessageAccumulator accumulator(
+      base::Bind(&PauseConnectorAndRunClosure, &connector1,
+                 run_loop.QuitClosure()));
   connector1.set_incoming_receiver(&accumulator);
 
   run_loop.Run();
 
   // As we paused after the first message we should only have gotten one
   // message.
   ASSERT_EQ(1u, accumulator.size());
 }
 
+void AccumulateWithNestedLoop(MessageAccumulator* accumulator,
+                              const base::Closure& closure) {
+  base::RunLoop nested_run_loop;
+  base::MessageLoop::ScopedNestableTaskAllower allow(
+      base::MessageLoop::current());
+  accumulator->set_closure(nested_run_loop.QuitClosure());
+  nested_run_loop.Run();
+  closure.Run();
+}
+
 TEST_F(ConnectorTest, ProcessWhenNested) {
   internal::Connector connector0(std::move(handle0_),
                                  internal::Connector::SINGLE_THREADED_SEND,
                                  base::ThreadTaskRunnerHandle::Get());
   internal::Connector connector1(std::move(handle1_),
                                  internal::Connector::SINGLE_THREADED_SEND,
                                  base::ThreadTaskRunnerHandle::Get());
 
   const char kText[] = "hello world";
 
   // Queue up two messages.
   Message message;
   AllocMessage(kText, &message);
   connector0.Accept(&message);
   AllocMessage(kText, &message);
   connector0.Accept(&message);
 
   base::RunLoop run_loop;
   MessageAccumulator accumulator;
   // When the accumulator gets the first message it spins a nested message
   // loop. The loop is quit when another message is received.
-  accumulator.set_closure([&accumulator, &connector1, &run_loop]() {
-    base::RunLoop nested_run_loop;
-    base::MessageLoop::ScopedNestableTaskAllower allow(
-        base::MessageLoop::current());
-    accumulator.set_closure([&nested_run_loop]() { nested_run_loop.Quit(); });
-    nested_run_loop.Run();
-    run_loop.Quit();
-  });
+  accumulator.set_closure(base::Bind(&AccumulateWithNestedLoop, &accumulator,
+                                     run_loop.QuitClosure()));
   connector1.set_incoming_receiver(&accumulator);
 
   run_loop.Run();
 
   ASSERT_EQ(2u, accumulator.size());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo