mojo::Callback -> base::Callback

mojo/public/cpp/bindings/tests/handle_passing_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 <stdint.h>
 #include <utility>
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/public/cpp/test_support/test_utils.h"
 #include "mojo/public/interfaces/bindings/tests/sample_factory.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace test {
 namespace {
 
 const char kText1[] = "hello";
 const char kText2[] = "world";
 
-class StringRecorder {
- public:
-  StringRecorder(std::string* buf, const base::Closure& closure)
-      : buf_(buf), closure_(closure) {}
-  void Run(const String& a) const {
-    *buf_ = a.To<std::string>();
-    closure_.Run();
-  }
+void RecordString(std::string* storage,
+                  const base::Closure& closure,
+                  String str) {
+  *storage = str.To<std::string>();

[yzshen1, 2016/06/18 00:01:18]

nit: str.PassStorage() 

[Ken Rockot(use gerrit already), 2016/06/18 03:24:26]

Done

+  closure.Run();
+}
 
- private:
-  std::string* buf_;
-  base::Closure closure_;
-};
+base::Callback<void(mojo::String)> MakeStringRecorder(
+    std::string* storage,
+    const base::Closure& closure) {
+  return base::Bind(&RecordString, storage, closure);
+}
 
 class ImportedInterfaceImpl : public imported::ImportedInterface {
  public:
   ImportedInterfaceImpl(
       InterfaceRequest<imported::ImportedInterface> request,
       const base::Closure& closure)
       : binding_(this, std::move(request)), closure_(closure) {}
 
   void DoSomething() override {
     do_something_count_++;
@@ skipping 113 matching lines @@
   HandlePassingTest() {}
 
   void TearDown() override { PumpMessages(); }
 
   void PumpMessages() { loop_.RunUntilIdle(); }
 
  private:
   base::MessageLoop loop_;
 };
 
-struct DoStuffCallback {
-  DoStuffCallback(bool* got_response,
-                  std::string* got_text_reply,
-                  const base::Closure& closure)
-      : got_response(got_response),
-        got_text_reply(got_text_reply),
-        closure(closure) {}
+void DoStuff(bool* got_response,
+             std::string* got_text_reply,
+             const base::Closure& closure,
+             sample::ResponsePtr response,
+             String text_reply) {
+  *got_text_reply = text_reply;
 
-  void Run(sample::ResponsePtr response, const String& text_reply) const {
-    *got_text_reply = text_reply;
+  if (response->pipe.is_valid()) {
+    std::string text2;
+    EXPECT_TRUE(ReadTextMessage(response->pipe.get(), &text2));
 
-    if (response->pipe.is_valid()) {
-      std::string text2;
-      EXPECT_TRUE(ReadTextMessage(response->pipe.get(), &text2));
+    // Ensure that simply accessing response.pipe does not close it.
+    EXPECT_TRUE(response->pipe.is_valid());
 
-      // Ensure that simply accessing response.pipe does not close it.
-      EXPECT_TRUE(response->pipe.is_valid());
+    EXPECT_EQ(std::string(kText2), text2);
 
-      EXPECT_EQ(std::string(kText2), text2);
-
-      // Do some more tests of handle passing:
-      ScopedMessagePipeHandle p = std::move(response->pipe);
-      EXPECT_TRUE(p.is_valid());
-      EXPECT_FALSE(response->pipe.is_valid());
-    }
-
-    *got_response = true;
-    closure.Run();
+    // Do some more tests of handle passing:
+    ScopedMessagePipeHandle p = std::move(response->pipe);
+    EXPECT_TRUE(p.is_valid());
+    EXPECT_FALSE(response->pipe.is_valid());
   }
 
-  bool* got_response;
-  std::string* got_text_reply;
-  base::Closure closure;
-};
+  *got_response = true;
+  closure.Run();
+}
+
+void DoStuff2(bool* got_response,
+             std::string* got_text_reply,
+             const base::Closure& closure,
+             String text_reply) {
+  *got_response = true;
+  *got_text_reply = text_reply;
+  closure.Run();
+}
 
 TEST_F(HandlePassingTest, Basic) {
   sample::FactoryPtr factory;
   SampleFactoryImpl factory_impl(GetProxy(&factory));
 
   MessagePipe pipe0;
   EXPECT_TRUE(WriteTextMessage(pipe0.handle1.get(), kText1));
 
   MessagePipe pipe1;
   EXPECT_TRUE(WriteTextMessage(pipe1.handle1.get(), kText2));
 
   imported::ImportedInterfacePtr imported;
   base::RunLoop run_loop;
   ImportedInterfaceImpl imported_impl(GetProxy(&imported),
                                       run_loop.QuitClosure());
 
   sample::RequestPtr request(sample::Request::New());
   request->x = 1;
   request->pipe = std::move(pipe1.handle0);
   request->obj = std::move(imported);
   bool got_response = false;
   std::string got_text_reply;
   base::RunLoop run_loop2;
-  DoStuffCallback cb(&got_response, &got_text_reply, run_loop2.QuitClosure());
-  factory->DoStuff(std::move(request), std::move(pipe0.handle0), cb);
+  factory->DoStuff(std::move(request), std::move(pipe0.handle0),
+                   base::Bind(&DoStuff, &got_response, &got_text_reply,
+                              run_loop2.QuitClosure()));
 
-  EXPECT_FALSE(*cb.got_response);
+  EXPECT_FALSE(got_response);
   int count_before = ImportedInterfaceImpl::do_something_count();
 
   run_loop.Run();
   run_loop2.Run();
 
-  EXPECT_TRUE(*cb.got_response);
-  EXPECT_EQ(kText1, *cb.got_text_reply);
+  EXPECT_TRUE(got_response);
+  EXPECT_EQ(kText1, got_text_reply);
   EXPECT_EQ(1, ImportedInterfaceImpl::do_something_count() - count_before);
 }
 
 TEST_F(HandlePassingTest, PassInvalid) {
   sample::FactoryPtr factory;
   SampleFactoryImpl factory_impl(GetProxy(&factory));
 
   sample::RequestPtr request(sample::Request::New());
   request->x = 1;
   bool got_response = false;
   std::string got_text_reply;
   base::RunLoop run_loop;
-  DoStuffCallback cb(&got_response, &got_text_reply, run_loop.QuitClosure());
-  factory->DoStuff(std::move(request), ScopedMessagePipeHandle(), cb);
+  factory->DoStuff(std::move(request), ScopedMessagePipeHandle(),
+                   base::Bind(&DoStuff, &got_response, &got_text_reply,
+                              run_loop.QuitClosure()));
 
-  EXPECT_FALSE(*cb.got_response);
+  EXPECT_FALSE(got_response);
 
   run_loop.Run();
 
-  EXPECT_TRUE(*cb.got_response);
+  EXPECT_TRUE(got_response);
 }
 
-struct DoStuff2Callback {
-  DoStuff2Callback(bool* got_response,
-                   std::string* got_text_reply,
-                   const base::Closure& closure)
-      : got_response(got_response),
-        got_text_reply(got_text_reply),
-        closure(closure) {}
-
-  void Run(const String& text_reply) const {
-    *got_response = true;
-    *got_text_reply = text_reply;
-    closure.Run();
-  }
-
-  bool* got_response;
-  std::string* got_text_reply;
-  base::Closure closure;
-};
-
 // Verifies DataPipeConsumer can be passed and read from.
 TEST_F(HandlePassingTest, DataPipe) {
   sample::FactoryPtr factory;
   SampleFactoryImpl factory_impl(GetProxy(&factory));
 
   // Writes a string to a data pipe and passes the data pipe (consumer) to the
   // factory.
   ScopedDataPipeProducerHandle producer_handle;
   ScopedDataPipeConsumerHandle consumer_handle;
   MojoCreateDataPipeOptions options = {sizeof(MojoCreateDataPipeOptions),
                                        MOJO_CREATE_DATA_PIPE_OPTIONS_FLAG_NONE,
                                        1,
                                        1024};
   ASSERT_EQ(MOJO_RESULT_OK,
             CreateDataPipe(&options, &producer_handle, &consumer_handle));
   std::string expected_text_reply = "got it";
   // +1 for \0.
   uint32_t data_size = static_cast<uint32_t>(expected_text_reply.size() + 1);
   ASSERT_EQ(MOJO_RESULT_OK,
             WriteDataRaw(producer_handle.get(),
                          expected_text_reply.c_str(),
                          &data_size,
                          MOJO_WRITE_DATA_FLAG_ALL_OR_NONE));
 
   bool got_response = false;
   std::string got_text_reply;
   base::RunLoop run_loop;
-  DoStuff2Callback cb(&got_response, &got_text_reply, run_loop.QuitClosure());
-  factory->DoStuff2(std::move(consumer_handle), cb);
+  factory->DoStuff2(std::move(consumer_handle),
+                    base::Bind(&DoStuff2, &got_response, &got_text_reply,
+                               run_loop.QuitClosure()));
 
-  EXPECT_FALSE(*cb.got_response);
+  EXPECT_FALSE(got_response);
 
   run_loop.Run();
 
-  EXPECT_TRUE(*cb.got_response);
-  EXPECT_EQ(expected_text_reply, *cb.got_text_reply);
+  EXPECT_TRUE(got_response);
+  EXPECT_EQ(expected_text_reply, got_text_reply);
 }
 
 TEST_F(HandlePassingTest, PipesAreClosed) {
   sample::FactoryPtr factory;
   SampleFactoryImpl factory_impl(GetProxy(&factory));
 
   MessagePipe extra_pipe;
 
   MojoHandle handle0_value = extra_pipe.handle0.get().value();
   MojoHandle handle1_value = extra_pipe.handle1.get().value();
@@ skipping 40 matching lines @@
 
   ASSERT_TRUE(object1);
   object1->SetName("object1");
 
   sample::NamedObjectPtr object2;
   factory->CreateNamedObject(GetProxy(&object2));
   object2->SetName("object2");
 
   base::RunLoop run_loop, run_loop2;
   std::string name1;
-  object1->GetName(StringRecorder(&name1, run_loop.QuitClosure()));
+  object1->GetName(MakeStringRecorder(&name1, run_loop.QuitClosure()));
 
   std::string name2;
-  object2->GetName(StringRecorder(&name2, run_loop2.QuitClosure()));
+  object2->GetName(MakeStringRecorder(&name2, run_loop2.QuitClosure()));
 
   run_loop.Run();
   run_loop2.Run();
 
   EXPECT_EQ(std::string("object1"), name1);
   EXPECT_EQ(std::string("object2"), name2);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo