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

mojo/public/cpp/bindings/tests/request_response_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 <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/test_support/test_utils.h"
 #include "mojo/public/interfaces/bindings/tests/sample_import.mojom.h"
 #include "mojo/public/interfaces/bindings/tests/sample_interfaces.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace test {
 namespace {
@@ skipping 30 matching lines @@
 
   void EchoInt(int32_t a, const EchoIntCallback& callback) override {
     callback.Run(a);
   }
 
   Binding<sample::Provider> binding_;
 };
 
 class StringRecorder {
  public:
-  explicit StringRecorder(std::string* buf) : buf_(buf) {}
-  void Run(const String& a) const { *buf_ = a; }
+  StringRecorder(std::string* buf, const base::Closure& closure)
+      : buf_(buf), closure_(closure) {}
+  void Run(const String& a) const {
+    *buf_ = a;
+    closure_.Run();
+  }
   void Run(const String& a, const String& b) const {
     *buf_ = a.get() + b.get();
+    closure_.Run();
   }
 
  private:
   std::string* buf_;
+  base::Closure closure_;
 };
 
 class EnumRecorder {
  public:
-  explicit EnumRecorder(sample::Enum* value) : value_(value) {}
-  void Run(sample::Enum a) const { *value_ = a; }
+  explicit EnumRecorder(sample::Enum* value, const base::Closure& closure)
+      : value_(value), closure_(closure) {}
+  void Run(sample::Enum a) const {
+    *value_ = a;
+    closure_.Run();
+  }
 
  private:
   sample::Enum* value_;
+  base::Closure closure_;
 };
 
 class MessagePipeWriter {
  public:
-  explicit MessagePipeWriter(const char* text) : text_(text) {}
+  MessagePipeWriter(const char* text, const base::Closure& closure)
+      : text_(text), closure_(closure) {}
   void Run(ScopedMessagePipeHandle handle) const {
     WriteTextMessage(handle.get(), text_);
+    closure_.Run();
   }
 
  private:
   std::string text_;
+  base::Closure closure_;
 };
 
 class RequestResponseTest : public testing::Test {
  public:
   RequestResponseTest() : loop_(common::MessagePumpMojo::Create()) {}
   ~RequestResponseTest() override { loop_.RunUntilIdle(); }
 
   void PumpMessages() { loop_.RunUntilIdle(); }
 
  private:
   base::MessageLoop loop_;
 };
 
 TEST_F(RequestResponseTest, EchoString) {
   sample::ProviderPtr provider;
   ProviderImpl provider_impl(GetProxy(&provider));
 
   std::string buf;
-  provider->EchoString(String::From("hello"), StringRecorder(&buf));
+  base::RunLoop run_loop;
+  provider->EchoString(String::From("hello"),
+                       StringRecorder(&buf, run_loop.QuitClosure()));
 
-  PumpMessages();
+  run_loop.Run();
 
   EXPECT_EQ(std::string("hello"), buf);
 }
 
 TEST_F(RequestResponseTest, EchoStrings) {
   sample::ProviderPtr provider;
   ProviderImpl provider_impl(GetProxy(&provider));
 
   std::string buf;
+  base::RunLoop run_loop;
   provider->EchoStrings(
-      String::From("hello"), String::From(" world"), StringRecorder(&buf));
+      String::From("hello"), String::From(" world"),
+      StringRecorder(&buf, run_loop.QuitClosure()));
 
-  PumpMessages();
+  run_loop.Run();
 
   EXPECT_EQ(std::string("hello world"), buf);
 }
 
 TEST_F(RequestResponseTest, EchoMessagePipeHandle) {
   sample::ProviderPtr provider;
   ProviderImpl provider_impl(GetProxy(&provider));
 
   MessagePipe pipe2;
-  provider->EchoMessagePipeHandle(std::move(pipe2.handle1),
-                                  MessagePipeWriter("hello"));
+  base::RunLoop run_loop;
+  provider->EchoMessagePipeHandle(
+      std::move(pipe2.handle1),
+      MessagePipeWriter("hello", run_loop.QuitClosure()));
 
-  PumpMessages();
+  run_loop.Run();
 
   std::string value;
   ReadTextMessage(pipe2.handle0.get(), &value);
 
   EXPECT_EQ(std::string("hello"), value);
 }
 
 TEST_F(RequestResponseTest, EchoEnum) {
   sample::ProviderPtr provider;
   ProviderImpl provider_impl(GetProxy(&provider));
 
   sample::Enum value;
-  provider->EchoEnum(sample::ENUM_VALUE, EnumRecorder(&value));
+  base::RunLoop run_loop;
+  provider->EchoEnum(sample::ENUM_VALUE,
+                     EnumRecorder(&value, run_loop.QuitClosure()));
 
-  PumpMessages();
+  run_loop.Run();
 
   EXPECT_EQ(sample::ENUM_VALUE, value);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo