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

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/message_loop/message_loop.h"
+#include "base/run_loop.h"
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/public/cpp/bindings/lib/message_builder.h"
 #include "mojo/public/cpp/bindings/tests/message_queue.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace test {
 namespace {
 
 class MessageAccumulator : public MessageReceiver {
  public:
   MessageAccumulator() {}
+  explicit MessageAccumulator(const base::Closure& closure)
+      : closure_(closure) {}
 
   bool Accept(Message* message) override {
     queue_.Push(message);
+    if (!closure_.is_null())
+      closure_.Run();
+    closure_.Reset();
     return true;
   }
 
   bool IsEmpty() const { return queue_.IsEmpty(); }
 
   void Pop(Message* message) { queue_.Pop(message); }
 
+  void set_closure(const base::Closure& closure) {
+    closure_ = closure;
+  }
+
  private:
   MessageQueue queue_;
+  base::Closure closure_;
 };
 
 class ConnectorDeletingMessageAccumulator : public MessageAccumulator {
  public:
   ConnectorDeletingMessageAccumulator(internal::Connector** connector)
       : connector_(connector) {}
 
   bool Accept(Message* message) override {
     delete *connector_;
     *connector_ = nullptr;
@@ skipping 37 matching lines @@
   void TearDown() override {}
 
   void AllocMessage(const char* text, Message* message) {
     size_t payload_size = strlen(text) + 1;  // Plus null terminator.
     internal::MessageBuilder builder(1, payload_size);
     memcpy(builder.buffer()->Allocate(payload_size), text, payload_size);
 
     builder.message()->MoveTo(message);
   }
 
-  void PumpMessages() { loop_.RunUntilIdle(); }
-
  protected:
   ScopedMessagePipeHandle handle0_;
   ScopedMessagePipeHandle handle1_;
 
  private:
   base::MessageLoop loop_;
 };
 
 TEST_F(ConnectorTest, Basic) {
   internal::Connector connector0(std::move(handle0_),
                                  internal::Connector::SINGLE_THREADED_SEND);
   internal::Connector connector1(std::move(handle1_),
                                  internal::Connector::SINGLE_THREADED_SEND);
 
   const char kText[] = "hello world";
 
   Message message;
   AllocMessage(kText, &message);
 
   connector0.Accept(&message);
 
-  MessageAccumulator accumulator;
+  base::RunLoop run_loop;
+  MessageAccumulator accumulator(run_loop.QuitClosure());
   connector1.set_incoming_receiver(&accumulator);
 
-  PumpMessages();
+  run_loop.Run();
 
   ASSERT_FALSE(accumulator.IsEmpty());
 
   Message message_received;
   accumulator.Pop(&message_received);
 
   EXPECT_EQ(
       std::string(kText),
       std::string(reinterpret_cast<const char*>(message_received.payload())));
 }
@@ skipping 25 matching lines @@
       std::string(kText),
       std::string(reinterpret_cast<const char*>(message_received.payload())));
 }
 
 TEST_F(ConnectorTest, Basic_EarlyIncomingReceiver) {
   internal::Connector connector0(std::move(handle0_),
                                  internal::Connector::SINGLE_THREADED_SEND);
   internal::Connector connector1(std::move(handle1_),
                                  internal::Connector::SINGLE_THREADED_SEND);
 
-  MessageAccumulator accumulator;
+  base::RunLoop run_loop;
+  MessageAccumulator accumulator(run_loop.QuitClosure());
   connector1.set_incoming_receiver(&accumulator);
 
   const char kText[] = "hello world";
 
   Message message;
   AllocMessage(kText, &message);
 
   connector0.Accept(&message);
 
-  PumpMessages();
+  run_loop.Run();
 
   ASSERT_FALSE(accumulator.IsEmpty());
 
   Message message_received;
   accumulator.Pop(&message_received);
 
   EXPECT_EQ(
       std::string(kText),
       std::string(reinterpret_cast<const char*>(message_received.payload())));
 }
 
 TEST_F(ConnectorTest, Basic_TwoMessages) {
   internal::Connector connector0(std::move(handle0_),
                                  internal::Connector::SINGLE_THREADED_SEND);
   internal::Connector connector1(std::move(handle1_),
                                  internal::Connector::SINGLE_THREADED_SEND);
 
   const char* kText[] = {"hello", "world"};
 
   for (size_t i = 0; i < MOJO_ARRAYSIZE(kText); ++i) {
     Message message;
     AllocMessage(kText[i], &message);
 
     connector0.Accept(&message);
   }
 
   MessageAccumulator accumulator;
   connector1.set_incoming_receiver(&accumulator);
 
-  PumpMessages();
-
   for (size_t i = 0; i < MOJO_ARRAYSIZE(kText); ++i) {
+    if (accumulator.IsEmpty()) {
+      base::RunLoop run_loop;
+      accumulator.set_closure(run_loop.QuitClosure());
+      run_loop.Run();
+    }
     ASSERT_FALSE(accumulator.IsEmpty());
 
     Message message_received;
     accumulator.Pop(&message_received);
 
     EXPECT_EQ(
         std::string(kText[i]),
         std::string(reinterpret_cast<const char*>(message_received.payload())));
   }
 }
@@ skipping 46 matching lines @@
   EXPECT_FALSE(connector0.encountered_error());
 
   // Write failures are not reported.
   bool ok = connector0.Accept(&message);
   EXPECT_TRUE(ok);
 
   // Still not observed.
   EXPECT_FALSE(connector0.encountered_error());
 
   // Spin the message loop, and then we should start observing the closed pipe.
-  PumpMessages();
+  base::RunLoop run_loop;
+  connector0.set_connection_error_handler(run_loop.QuitClosure());
+  run_loop.Run();
 
   EXPECT_TRUE(connector0.encountered_error());
 }
 
 TEST_F(ConnectorTest, MessageWithHandles) {
   internal::Connector connector0(std::move(handle0_),
                                  internal::Connector::SINGLE_THREADED_SEND);
   internal::Connector connector1(std::move(handle1_),
                                  internal::Connector::SINGLE_THREADED_SEND);
 
   const char kText[] = "hello world";
 
   Message message1;
   AllocMessage(kText, &message1);
 
   MessagePipe pipe;
   message1.mutable_handles()->push_back(pipe.handle0.release());
 
   connector0.Accept(&message1);
 
   // The message should have been transferred, releasing the handles.
   EXPECT_TRUE(message1.handles()->empty());
 
-  MessageAccumulator accumulator;
+  base::RunLoop run_loop;
+  MessageAccumulator accumulator(run_loop.QuitClosure());
   connector1.set_incoming_receiver(&accumulator);
 
-  PumpMessages();
+  run_loop.Run();
 
   ASSERT_FALSE(accumulator.IsEmpty());
 
   Message message_received;
   accumulator.Pop(&message_received);
 
   EXPECT_EQ(
       std::string(kText),
       std::string(reinterpret_cast<const char*>(message_received.payload())));
   ASSERT_EQ(1U, message_received.handles()->size());
 
   // Now send a message to the transferred handle and confirm it's sent through
   // to the orginal pipe.
   // TODO(vtl): Do we need a better way of "downcasting" the handle types?
   ScopedMessagePipeHandle smph;
   smph.reset(MessagePipeHandle(message_received.handles()->front().value()));
   message_received.mutable_handles()->front() = Handle();
   // |smph| now owns this handle.
 
   internal::Connector connector_received(
       std::move(smph), internal::Connector::SINGLE_THREADED_SEND);
   internal::Connector connector_original(
       std::move(pipe.handle1), internal::Connector::SINGLE_THREADED_SEND);
 
   Message message2;
   AllocMessage(kText, &message2);
 
   connector_received.Accept(&message2);
-  connector_original.set_incoming_receiver(&accumulator);
-  PumpMessages();
+  base::RunLoop run_loop2;
+  MessageAccumulator accumulator2(run_loop2.QuitClosure());
+  connector_original.set_incoming_receiver(&accumulator2);
+  run_loop2.Run();
 
-  ASSERT_FALSE(accumulator.IsEmpty());
+  ASSERT_FALSE(accumulator2.IsEmpty());
 
-  accumulator.Pop(&message_received);
+  accumulator2.Pop(&message_received);
 
   EXPECT_EQ(
       std::string(kText),
       std::string(reinterpret_cast<const char*>(message_received.payload())));
 }
 
 TEST_F(ConnectorTest, WaitForIncomingMessageWithError) {
   internal::Connector connector0(std::move(handle0_),
                                  internal::Connector::SINGLE_THREADED_SEND);
   // Close the other end of the pipe.
@@ skipping 41 matching lines @@
   for (size_t i = 0; i < MOJO_ARRAYSIZE(kText); ++i) {
     Message message;
     AllocMessage(kText[i], &message);
 
     connector0.Accept(&message);
   }
 
   ReentrantMessageAccumulator accumulator(&connector1);
   connector1.set_incoming_receiver(&accumulator);
 
-  PumpMessages();
-
   for (size_t i = 0; i < MOJO_ARRAYSIZE(kText); ++i) {
+    if (accumulator.IsEmpty()) {
+      base::RunLoop run_loop;
+      accumulator.set_closure(run_loop.QuitClosure());
+      run_loop.Run();
+    }
     ASSERT_FALSE(accumulator.IsEmpty());
 
     Message message_received;
     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());
 }
 
 TEST_F(ConnectorTest, RaiseError) {
+  base::RunLoop run_loop, run_loop2;
   internal::Connector connector0(std::move(handle0_),
                                  internal::Connector::SINGLE_THREADED_SEND);
   bool error_handler_called0 = false;
   connector0.set_connection_error_handler(
-      [&error_handler_called0]() { error_handler_called0 = true; });
+      [&error_handler_called0, &run_loop]() {
+        error_handler_called0 = true;
+        run_loop.Quit();
+      });
 
   internal::Connector connector1(std::move(handle1_),
                                  internal::Connector::SINGLE_THREADED_SEND);
   bool error_handler_called1 = false;
   connector1.set_connection_error_handler(
-      [&error_handler_called1]() { error_handler_called1 = true; });
+      [&error_handler_called1, &run_loop2]() {
+        error_handler_called1 = true;
+        run_loop2.Quit();
+      });
 
   const char kText[] = "hello world";
 
   Message message;
   AllocMessage(kText, &message);
 
   connector0.Accept(&message);
   connector0.RaiseError();
 
-  MessageAccumulator accumulator;
+  base::RunLoop run_loop3;
+  MessageAccumulator accumulator(run_loop3.QuitClosure());
   connector1.set_incoming_receiver(&accumulator);
 
-  PumpMessages();
+  run_loop3.Run();
 
   // Messages sent prior to RaiseError() still arrive at the other end.
   ASSERT_FALSE(accumulator.IsEmpty());
 
   Message message_received;
   accumulator.Pop(&message_received);
 
   EXPECT_EQ(
       std::string(kText),
       std::string(reinterpret_cast<const char*>(message_received.payload())));
 
-  PumpMessages();
+  run_loop.Run();
+  run_loop2.Run();
 
   // Connection error handler is called at both sides.
   EXPECT_TRUE(error_handler_called0);
   EXPECT_TRUE(error_handler_called1);
 
   // 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());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo