Mojo: AsyncWaiter and mojo/public/environment

mojo/shell/service_manager_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 "base/message_loop/message_loop.h"
-#include "mojo/common/bindings_support_impl.h"
 #include "mojo/public/bindings/lib/remote_ptr.h"
 #include "mojo/shell/service_manager.h"
 #include "mojom/shell.h"
 #include "mojom/test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace shell {
 namespace {
 
@@ skipping 57 matching lines @@
 class ServiceManagerTest : public testing::Test,
                            public ServiceManager::Loader {
  public:
   ServiceManagerTest() {
   }
 
   virtual ~ServiceManagerTest() {
   }
 
   virtual void SetUp() OVERRIDE {
-    mojo::BindingsSupport::Set(&support_);
     GURL test_url("test:testService");
     service_manager_.reset(new ServiceManager);
     service_manager_->SetLoaderForURL(this, test_url);
     MessagePipe pipe;
     test_client_.reset(new TestClientImpl(pipe.handle0.Pass()));
     service_manager_->Connect(test_url, pipe.handle1.Pass());
   }
 
   virtual void TearDown() OVERRIDE {
     test_client_.reset(NULL);
     test_app_.reset(NULL);
     service_manager_.reset(NULL);
-    mojo::BindingsSupport::Set(NULL);
   }
 
   virtual void Load(const GURL& url,
                     ScopedMessagePipeHandle shell_handle) OVERRIDE {
     test_app_.reset(new TestApp(shell_handle.Pass()));
   }
 
  protected:
-  common::BindingsSupportImpl support_;
   base::MessageLoop loop_;
   scoped_ptr<TestApp> test_app_;
   scoped_ptr<TestClientImpl> test_client_;
   scoped_ptr<ServiceManager> service_manager_;
   DISALLOW_COPY_AND_ASSIGN(ServiceManagerTest);
 };
 
 TEST_F(ServiceManagerTest, Basic) {
   test_client_->Test("test");
   loop_.Run();
   EXPECT_EQ(std::string("test"), test_app_->GetLastTestString());
 }
 
 }  // namespace
 }  // namespace shell
 }  // namespace mojo