Remove Mojo bindings environment.

mojo/shell/public/cpp/lib/application_test_base.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 <utility>
 
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "mojo/shell/public/cpp/application_test_base.h"
 #include "mojo/shell/public/cpp/shell_connection.h"
 #include "mojo/shell/public/interfaces/shell_client.mojom.h"
 
 namespace mojo {
 namespace test {
 
 namespace {
 // Share the application name with multiple application tests.
@@ skipping 41 matching lines @@
   }
 
   Binding<ShellClient> binding_;
 };
 
 }  // namespace
 
 MojoResult RunAllTests(MojoHandle shell_client_request_handle) {
   {
     // This loop is used for init, and then destroyed before running tests.
-    Environment::InstantiateDefaultRunLoop();
+    base::MessageLoop message_loop;
 
     // Grab the shell handle.
     ShellGrabber grabber(
         MakeRequest<shell::mojom::ShellClient>(MakeScopedHandle(
             MessagePipeHandle(shell_client_request_handle))));
     grabber.WaitForInitialize();
     CHECK(g_connector);
     CHECK(g_shell_client_request.is_pending());
 
     int argc = 0;
     base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
     const char** argv = new const char* [cmd_line->argv().size() + 1];
 #if defined(OS_WIN)
     std::vector<std::string> local_strings;
 #endif
     for (auto& arg : cmd_line->argv()) {
 #if defined(OS_WIN)
       local_strings.push_back(base::WideToUTF8(arg));
       argv[argc++] = local_strings.back().c_str();
 #else
       argv[argc++] = arg.c_str();
 #endif
     }
     argv[argc] = nullptr;
 
     testing::InitGoogleTest(&argc, const_cast<char**>(&(argv[0])));
-
-    Environment::DestroyDefaultRunLoop();
   }
 
   int result = RUN_ALL_TESTS();
 
   // Shut down our message pipes before exiting.
   (void)g_shell_client_request.PassMessagePipe();
   g_connector.reset();
 
   return (result == 0) ? MOJO_RESULT_OK : MOJO_RESULT_UNKNOWN;
 }
@@ skipping 21 matching lines @@
 ApplicationTestBase::~ApplicationTestBase() {
 }
 
 ShellClient* ApplicationTestBase::GetShellClient() {
   return nullptr;
 }
 
 void ApplicationTestBase::SetUp() {
   // A run loop is recommended for ShellConnection initialization and
   // communication.
-  if (ShouldCreateDefaultRunLoop())
-    Environment::InstantiateDefaultRunLoop();
+  if (ShouldCreateDefaultRunLoop()) {
+    CHECK(!base::MessageLoop::current());
+    // Not leaked: accessible from |base::MessageLoop::current()|.
+    base::MessageLoop* message_loop = new base::MessageLoop();
+    CHECK_EQ(message_loop, base::MessageLoop::current());
+  }
 
   CHECK(g_shell_client_request.is_pending());
   CHECK(g_connector);
 
   // New applications are constructed for each test to avoid persisting state.
   test_helper_.reset(new TestHelper(GetShellClient()));
 }
 
 void ApplicationTestBase::TearDown() {
   CHECK(!g_shell_client_request.is_pending());
   CHECK(!g_connector);
 
   test_helper_.reset();
 
-  if (ShouldCreateDefaultRunLoop())
-    Environment::DestroyDefaultRunLoop();
+  if (ShouldCreateDefaultRunLoop()) {
+    CHECK(base::MessageLoop::current());
+    delete base::MessageLoop::current();
+    CHECK(!base::MessageLoop::current());
+  }
 }
 
 bool ApplicationTestBase::ShouldCreateDefaultRunLoop() {
   return true;
 }
 
 }  // namespace test
 }  // namespace mojo