Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead.

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/strings/utf_string_conversions.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/environment/environment.h"
@@ skipping 98 matching lines @@
   // Shut down our message pipes before exiting.
   (void)g_application_request.PassMessagePipe();
   g_shell.reset();
 
   return (result == 0) ? MOJO_RESULT_OK : MOJO_RESULT_UNKNOWN;
 }
 
 TestHelper::TestHelper(ApplicationDelegate* delegate)
     : application_impl_(new ApplicationImpl(
           delegate == nullptr ? &default_application_delegate_ : delegate,
-          std::move(g_application_request))) {
+          std::move(g_application_request))),
+      url_(g_url) {
   // Fake application initialization.
   shell::mojom::Application* application = application_impl_.get();
   application->Initialize(std::move(g_shell), g_url, g_id);
 }
 
 TestHelper::~TestHelper() {
   // TODO: commented out until http://crbug.com/533107 is solved.
   // {
   // ApplicationImpl::TestApi test_api(application_impl_);
   // test_api.UnbindConnections(&g_application_request, &g_shell);
@@ skipping 34 matching lines @@
   if (ShouldCreateDefaultRunLoop())
     Environment::DestroyDefaultRunLoop();
 }
 
 bool ApplicationTestBase::ShouldCreateDefaultRunLoop() {
   return true;
 }
 
 }  // namespace test
 }  // namespace mojo