Make ApplicationTestBase not use ApplicationImpl.

mojo/public/cpp/application/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 "mojo/public/cpp/application/application_test_base.h"
 
 #include <utility>
 
-#include "mojo/public/cpp/application/application_impl.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/public/interfaces/application/application.mojom.h"
 
 namespace mojo {
 namespace test {
 
 namespace {
 
@@ skipping 50 matching lines @@
   }
 
   void RequestQuit() override { MOJO_CHECK(false); }
 
   Array<String>* args_;
   Binding<Application> binding_;
 };
 
 }  // namespace
 
-const Array<String>& Args() {
-  return g_args;
-}
-
 MojoResult RunAllTests(MojoHandle application_request_handle) {
   {
     // This loop is used for init, and then destroyed before running tests.
     Environment::InstantiateDefaultRunLoop();
 
     // Grab the shell handle and GTEST commandline arguments.
     // GTEST command line arguments are supported amid application arguments:
     // $ mojo_shell mojo:example_apptests
     //   --args-for='mojo:example_apptests arg1 --gtest_filter=foo arg2'
     Array<String> args;
@@ skipping 23 matching lines @@
 
   int result = RUN_ALL_TESTS();
 
   // Shut down our message pipes before exiting.
   (void)g_application_request.PassMessagePipe();
   (void)g_shell.PassInterfaceHandle();
 
   return (result == 0) ? MOJO_RESULT_OK : MOJO_RESULT_UNKNOWN;
 }
 
-ApplicationTestBase::ApplicationTestBase() : application_impl_(nullptr) {
-}
+ApplicationTestBase::ApplicationTestBase() {}
 
-ApplicationTestBase::~ApplicationTestBase() {
-}
-
-ApplicationDelegate* ApplicationTestBase::GetApplicationDelegate() {
-  return &default_application_delegate_;
-}
+ApplicationTestBase::~ApplicationTestBase() {}
 
 void ApplicationTestBase::SetUp() {
   // A run loop is recommended for ApplicationImpl initialization and
   // communication.
   if (ShouldCreateDefaultRunLoop())
     Environment::InstantiateDefaultRunLoop();
 
   MOJO_CHECK(g_application_request.is_pending());
   MOJO_CHECK(g_shell);
+  MOJO_CHECK(args_.empty());
 
-  // New applications are constructed for each test to avoid persisting state.
-  application_impl_ = new ApplicationImpl(GetApplicationDelegate(),
-                                          g_application_request.Pass());
-
-  // Fake application initialization with the given command line arguments.
-  application_impl_->Initialize(g_shell.Pass(), g_args.Clone(), g_url);
+  shell_ = g_shell.Pass();
+  for (size_t i = 0; i < g_args.size(); i++)
+    args_.push_back(g_args[i]);
 }
 
 void ApplicationTestBase::TearDown() {
-  MOJO_CHECK(!g_application_request.is_pending());
   MOJO_CHECK(!g_shell);
 
-  application_impl_->UnbindConnections(&g_application_request, &g_shell);
-  delete application_impl_;
+  // TODO(vtl): The straightforward |g_shell = shell_.Pass();| causes tests to
+  // hang. Presumably, it's because there are still requests to the shell
+  // pending. :-(
+  g_shell.Bind(shell_.PassInterfaceHandle());
+  args_.clear();
+
   if (ShouldCreateDefaultRunLoop())
     Environment::DestroyDefaultRunLoop();
 }
 
 bool ApplicationTestBase::ShouldCreateDefaultRunLoop() {
   return true;
 }
 
 }  // namespace test
 }  // namespace mojo