Fix a bunch of mojo_public_*_unittests with the new EDK.

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/message_pump/message_pump_mojo.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:
-  explicit StringRecorder(std::string* buf) : buf_(buf) {}
-  void Run(const String& a) const { *buf_ = a.To<std::string>(); }
+  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();
+  }
 
  private:
   std::string* buf_;
+  base::Closure closure_;
 };
 
 class ImportedInterfaceImpl : public imported::ImportedInterface {
  public:
-  explicit ImportedInterfaceImpl(
-      InterfaceRequest<imported::ImportedInterface> request)
-      : binding_(this, std::move(request)) {}
+  ImportedInterfaceImpl(
+      InterfaceRequest<imported::ImportedInterface> request,
+      const base::Closure& closure)
+      : binding_(this, std::move(request)), closure_(closure) {}
 
-  void DoSomething() override { do_something_count_++; }
+  void DoSomething() override {
+    do_something_count_++;
+    closure_.Run();
+  }
 
   static int do_something_count() { return do_something_count_; }
 
  private:
   static int do_something_count_;
   Binding<ImportedInterface> binding_;
+  base::Closure closure_;
 };
 int ImportedInterfaceImpl::do_something_count_ = 0;
 
 class SampleNamedObjectImpl : public sample::NamedObject {
  public:
   explicit SampleNamedObjectImpl(InterfaceRequest<sample::NamedObject> request)
       : binding_(this, std::move(request)) {}
   void SetName(const mojo::String& name) override { name_ = name; }
 
   void GetName(const mojo::Callback<void(mojo::String)>& callback) override {
@@ skipping 39 matching lines @@
     if (request->obj)
       request->obj->DoSomething();
   }
 
   void DoStuff2(ScopedDataPipeConsumerHandle pipe,
                 const DoStuff2Callback& callback) override {
     // Read the data from the pipe, writing the response (as a string) to
     // DidStuff2().
     ASSERT_TRUE(pipe.is_valid());
     uint32_t data_size = 0;
+
+    MojoHandleSignalsState state;
+    ASSERT_EQ(MOJO_RESULT_OK,
+              MojoWait(pipe.get().value(), MOJO_HANDLE_SIGNAL_READABLE,
+                       MOJO_DEADLINE_INDEFINITE, &state));
+    ASSERT_EQ(MOJO_HANDLE_SIGNAL_READABLE, state.satisfied_signals);
     ASSERT_EQ(MOJO_RESULT_OK,
               ReadDataRaw(
                   pipe.get(), nullptr, &data_size, MOJO_READ_DATA_FLAG_QUERY));
     ASSERT_NE(0, static_cast<int>(data_size));
     char data[64];
     ASSERT_LT(static_cast<int>(data_size), 64);
     ASSERT_EQ(
         MOJO_RESULT_OK,
         ReadDataRaw(
             pipe.get(), data, &data_size, MOJO_READ_DATA_FLAG_ALL_OR_NONE));
@@ skipping 30 matching lines @@
 
   void TearDown() override { PumpMessages(); }
 
   void PumpMessages() { loop_.RunUntilIdle(); }
 
  private:
   base::MessageLoop loop_;
 };
 
 struct DoStuffCallback {
-  DoStuffCallback(bool* got_response, std::string* got_text_reply)
-      : got_response(got_response), got_text_reply(got_text_reply) {}
+  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 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));
 
       // Ensure that simply accessing response.pipe does not close it.
       EXPECT_TRUE(response->pipe.is_valid());
 
       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();
   }
 
   bool* got_response;
   std::string* got_text_reply;
+  base::Closure closure;
 };
 
 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;
-  ImportedInterfaceImpl imported_impl(GetProxy(&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;
-  DoStuffCallback cb(&got_response, &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);
 
   EXPECT_FALSE(*cb.got_response);
   int count_before = ImportedInterfaceImpl::do_something_count();
 
-  PumpMessages();
+  run_loop.Run();
+  run_loop2.Run();
 
   EXPECT_TRUE(*cb.got_response);
   EXPECT_EQ(kText1, *cb.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;
-  DoStuffCallback cb(&got_response, &got_text_reply);
+  base::RunLoop run_loop;
+  DoStuffCallback cb(&got_response, &got_text_reply, run_loop.QuitClosure());
   factory->DoStuff(std::move(request), ScopedMessagePipeHandle(), cb);
 
   EXPECT_FALSE(*cb.got_response);
 
-  PumpMessages();
+  run_loop.Run();
 
   EXPECT_TRUE(*cb.got_response);
 }
 
 struct DoStuff2Callback {
-  DoStuff2Callback(bool* got_response, std::string* got_text_reply)
-      : got_response(got_response), got_text_reply(got_text_reply) {}
+  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;
-  DoStuff2Callback cb(&got_response, &got_text_reply);
+  base::RunLoop run_loop;
+  DoStuff2Callback cb(&got_response, &got_text_reply, run_loop.QuitClosure());
   factory->DoStuff2(std::move(consumer_handle), cb);
 
   EXPECT_FALSE(*cb.got_response);
 
-  PumpMessages();
+  run_loop.Run();
 
   EXPECT_TRUE(*cb.got_response);
   EXPECT_EQ(expected_text_reply, *cb.got_text_reply);
 }
 
 TEST_F(HandlePassingTest, PipesAreClosed) {
   sample::FactoryPtr factory;
   SampleFactoryImpl factory_impl(GetProxy(&factory));
 
   MessagePipe extra_pipe;
@@ skipping 45 matching lines @@
   factory->CreateNamedObject(std::move(object1_request));
   EXPECT_FALSE(object1_request.is_pending());  // We've passed the request.
 
   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));
+  object1->GetName(StringRecorder(&name1, run_loop.QuitClosure()));
 
   std::string name2;
-  object2->GetName(StringRecorder(&name2));
+  object2->GetName(StringRecorder(&name2, run_loop2.QuitClosure()));
 
-  PumpMessages();  // Yield for results.
+  run_loop.Run();
+  run_loop2.Run();
 
   EXPECT_EQ(std::string("object1"), name1);
   EXPECT_EQ(std::string("object2"), name2);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo