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

components/html_viewer/ax_provider_apptest.cc

 // Copyright 2015 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 <stddef.h>
 #include <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/test_timeouts.h"
 #include "base/time/time.h"
 #include "components/mus/public/cpp/tests/window_server_test_base.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/web_view/public/interfaces/frame.mojom.h"
 #include "mojo/converters/network/network_type_converters.h"
 #include "mojo/services/accessibility/public/interfaces/accessibility.mojom.h"
-#include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/shell/public/cpp/application_test_base.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 
 namespace {
 
 // Returns true if the tree contains a text node with contents matching |text|.
 bool AxTreeContainsText(const Array<AxNodePtr>& tree, const String& text) {
@@ skipping 44 matching lines @@
 using AXProviderTest = mus::WindowServerTestBase;
 
 TEST_F(AXProviderTest, HelloWorld) {
   // Start a test server for net/data/test.html access.
   net::EmbeddedTestServer server;
   server.ServeFilesFromSourceDirectory("net/data");
   ASSERT_TRUE(server.Start());
 
   // Connect to the URL through the mojo:html_viewer content handler.
   scoped_ptr<ApplicationConnection> connection =
-      application_impl()->ConnectToApplication(
-          server.GetURL("/test.html").spec());
+      shell()->ConnectToApplication(server.GetURL("/test.html").spec());
 
   // Embed the html_viewer in a Window.
   mus::mojom::WindowTreeClientPtr tree_client;
   connection->ConnectToService(&tree_client);
   mus::Window* embed_window = window_manager()->NewWindow();
   embed_window->Embed(std::move(tree_client));
 
   TestFrame frame;
   web_view::mojom::FramePtr frame_ptr;
   mojo::Binding<web_view::mojom::Frame> frame_binding(&frame);
@@ skipping 20 matching lines @@
     EXPECT_TRUE(QuitRunLoop());
   });
   ASSERT_TRUE(DoRunLoopWithTimeout());
 
   EXPECT_TRUE(AxTreeContainsText(ax_tree, "Hello "));
   EXPECT_TRUE(AxTreeContainsText(ax_tree, "World!"));
   EXPECT_FALSE(AxTreeContainsText(ax_tree, "foo"));
 }
 
 }  // namespace mojo