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

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

 // Copyright 2015 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/tests/router_test_util.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
 
@@ skipping 16 matching lines @@
                           const char* text,
                           uint64_t request_id,
                           Message* message) {
   size_t payload_size = strlen(text) + 1;  // Plus null terminator.
   internal::ResponseMessageBuilder builder(name, payload_size, request_id);
   memcpy(builder.buffer()->Allocate(payload_size), text, payload_size);
 
   builder.message()->MoveTo(message);
 }
 
-MessageAccumulator::MessageAccumulator(MessageQueue* queue) : queue_(queue) {}
+MessageAccumulator::MessageAccumulator(MessageQueue* queue,
+                                       const base::Closure& closure)
+    : queue_(queue), closure_(closure) {}
+
+MessageAccumulator::~MessageAccumulator() {}
 
 bool MessageAccumulator::Accept(Message* message) {
   queue_->Push(message);
+  if (!closure_.is_null()) {
+    closure_.Run();
+    closure_.Reset();
+  }
   return true;
 }
 
 ResponseGenerator::ResponseGenerator() {}
 
 bool ResponseGenerator::Accept(Message* message) {
   return false;
 }
 
 bool ResponseGenerator::AcceptWithResponder(
@@ skipping 14 matching lines @@
                                      const char* request_string,
                                      MessageReceiver* responder) {
   Message response;
   std::string response_string(request_string);
   response_string += " world!";
   AllocResponseMessage(name, response_string.c_str(), request_id, &response);
 
   return responder->Accept(&response);
 }
 
-LazyResponseGenerator::LazyResponseGenerator()
-    : responder_(nullptr), name_(0), request_id_(0) {}
+LazyResponseGenerator::LazyResponseGenerator(const base::Closure& closure)
+    : responder_(nullptr), name_(0), request_id_(0), closure_(closure) {}
 
 LazyResponseGenerator::~LazyResponseGenerator() {
   delete responder_;
 }
 
 bool LazyResponseGenerator::AcceptWithResponder(
     Message* message,
     MessageReceiverWithStatus* responder) {
   name_ = message->name();
   request_id_ = message->request_id();
   request_string_ =
       std::string(reinterpret_cast<const char*>(message->payload()));
   responder_ = responder;
+  if (!closure_.is_null()) {
+    closure_.Run();
+    closure_.Reset();
+  }
   return true;
 }
 
 void LazyResponseGenerator::Complete(bool send_response) {
   if (send_response) {
     SendResponse(name_, request_id_, request_string_.c_str(), responder_);
   }
   delete responder_;
   responder_ = nullptr;
 }
 
 }  // namespace test
 }  // namespace mojo