Mojo: AsyncWaiter and mojo/public/environment

mojo/public/tests/bindings/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 <stdlib.h>
 #include <string.h>
 
-#include "mojo/public/bindings/lib/bindings_support.h"
 #include "mojo/public/bindings/lib/connector.h"
 #include "mojo/public/bindings/lib/message_queue.h"
+#include "mojo/public/environment/environment.h"
 #include "mojo/public/system/macros.h"
-#include "mojo/public/tests/bindings/simple_bindings_support.h"
+#include "mojo/public/utility/run_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace test {
 
 class MessageAccumulator : public MessageReceiver {
  public:
   MessageAccumulator() {
   }
 
@@ skipping 29 matching lines @@
   void AllocMessage(const char* text, Message* message) {
     size_t payload_size = strlen(text) + 1;  // Plus null terminator.
     size_t num_bytes = sizeof(MessageHeader) + payload_size;
     message->data = static_cast<MessageData*>(malloc(num_bytes));
     message->data->header.num_bytes = static_cast<uint32_t>(num_bytes);
     message->data->header.name = 1;
     memcpy(message->data->payload, text, payload_size);
   }
 
   void PumpMessages() {
-    bindings_support_.Process();
+    loop_.RunUntilIdle();
   }
 
  protected:
   ScopedMessagePipeHandle handle0_;
   ScopedMessagePipeHandle handle1_;
 
  private:
-  SimpleBindingsSupport bindings_support_;
+  Environment env_;
+  RunLoop loop_;
 };
 
 TEST_F(ConnectorTest, Basic) {
   internal::Connector connector0(handle0_.Pass());
   internal::Connector connector1(handle1_.Pass());
 
   const char kText[] = "hello world";
 
   Message message;
   AllocMessage(kText, &message);
@@ skipping 144 matching lines @@
 
   accumulator.Pop(&message_received);
 
   EXPECT_EQ(std::string(kText),
             std::string(
                 reinterpret_cast<char*>(message_received.data->payload)));
 }
 
 }  // namespace test
 }  // namespace mojo