Revert of mojo: Delay ApplicationTestBase shell disconnection.

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/strings/utf_string_conversions.h"
 #include "mojo/public/cpp/bindings/binding.h"
@@ skipping 117 matching lines @@
   // TODO: commented out until http://crbug.com/533107 is solved.
   // {
   // ShellConnection::TestApi test_api(shell_connection_);
   // test_api.UnbindConnections(&g_shell_client_request, &g_shell);
   // }
   // We may have supplied a member as the client. Delete |shell_connection_|
   // while still valid.
   shell_connection_.reset();
 }
 
-ApplicationTestBase::ApplicationTestBase() {}
+ApplicationTestBase::ApplicationTestBase() : test_helper_(nullptr) {}
 
 ApplicationTestBase::~ApplicationTestBase() {
-  CHECK(!g_shell_client_request.is_pending());
-  CHECK(!g_shell);
-
-  test_helper_.reset();
-
-  if (use_default_run_loop_)
-    Environment::DestroyDefaultRunLoop();
 }
 
 ShellClient* ApplicationTestBase::GetShellClient() {
   return nullptr;
 }
 
 void ApplicationTestBase::SetUp() {
   // A run loop is recommended for ShellConnection initialization and
   // communication.
-  // Check this in SetUp() instead of in the constructor because we cannot call
-  // virtual methods in the constructor.
-  if (ShouldCreateDefaultRunLoop()) {
-    use_default_run_loop_ = true;
+  if (ShouldCreateDefaultRunLoop())
     Environment::InstantiateDefaultRunLoop();
-  }
 
   CHECK(g_shell_client_request.is_pending());
   CHECK(g_shell);
 
   // 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_shell);
+
+  test_helper_.reset();
+
+  if (ShouldCreateDefaultRunLoop())
+    Environment::DestroyDefaultRunLoop();
 }
 
 bool ApplicationTestBase::ShouldCreateDefaultRunLoop() {
   return true;
 }
 
 }  // namespace test
 }  // namespace mojo