Mojo: AsyncWaiter and mojo/public/environment

mojo/public/tests/bindings/sample_service_unittests.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 <algorithm>
 #include <ostream>
 #include <string>
 
-#include "mojo/public/tests/bindings/simple_bindings_support.h"
+#include "mojo/public/environment/environment.h"
 #include "mojom/sample_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 
 template <>
 class TypeConverter<sample::Bar, int32_t> {
  public:
   static int32_t ConvertTo(const sample::Bar& bar) {
     return static_cast<int32_t>(bar.alpha()) << 16 |
@@ skipping 259 matching lines @@
     ServiceImpl impl;
 
     ServiceStub stub(&impl);
     return stub.Accept(message);
   }
 };
 
 }  // namespace
 
 TEST(BindingsSampleTest, Basic) {
-  mojo::test::SimpleBindingsSupport bindings_support;
+  mojo::Environment env;
   SimpleMessageReceiver receiver;
 
   // User has a proxy to a Service somehow.
   Service* service = new ServiceProxy(&receiver);
 
   // User constructs a message to send.
 
   // Notice that it doesn't matter in what order the structs / arrays are
   // allocated. Here, the various members of Foo are allocated before Foo is
   // allocated.
 
   mojo::AllocationScope scope;
 
   Foo foo = MakeFoo();
   CheckFoo(foo);
 
   mojo::ScopedMessagePipeHandle port0, port1;
   mojo::CreateMessagePipe(&port0, &port1);
 
   service->Frobinate(foo, Service::BAZ_EXTRA, port0.Pass());
 }
 
 }  // namespace sample