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

components/mus/ws/window_manager_client_apptest.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 <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "components/mus/common/util.h"
 #include "components/mus/public/cpp/tests/window_server_test_base.h"
 #include "components/mus/public/cpp/window_observer.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/cpp/window_tree_connection_observer.h"
 #include "components/mus/public/cpp/window_tree_delegate.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/shell/public/cpp/application_connection.h"
-#include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/shell/public/cpp/application_test_base.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/mojo/geometry/geometry_util.h"
 
 namespace mus {
 namespace ws {
 
 namespace {
 
 int ValidIndexOf(const Window::Children& windows, Window* window) {
@@ skipping 240 matching lines @@
                              embed_details_->connection_id);
     embed_details_.reset();
     return result;
   }
 
   // Establishes a connection to this application and asks for a
   // WindowTreeClient.
   mus::mojom::WindowTreeClientPtr
   ConnectToApplicationAndGetWindowServerClient() {
     mus::mojom::WindowTreeClientPtr client;
-    application_impl()->ConnectToService(application_impl()->url(), &client);
+    shell()->ConnectToService(shell_url(), &client);
     return client;
   }
 
   // WindowServerTestBase:
   void OnEmbed(Window* root) override {
     if (!embed_details_) {
       WindowServerTestBase::OnEmbed(root);
       return;
     }
 
@@ skipping 857 matching lines @@
   scoped_ptr<base::RunLoop> run_loop_;
   Window* created_window_;
 
   DISALLOW_COPY_AND_ASSIGN(EstablishConnectionViaFactoryDelegate);
 };
 
 TEST_F(WindowServerTest, EstablishConnectionViaFactory) {
   EstablishConnectionViaFactoryDelegate delegate(window_manager());
   set_window_manager_delegate(&delegate);
   scoped_ptr<WindowTreeConnection> second_connection(
-      WindowTreeConnection::Create(this, application_impl()));
+      WindowTreeConnection::Create(this, shell()));
   Window* window_in_second_connection =
       second_connection->NewTopLevelWindow(nullptr);
   ASSERT_TRUE(window_in_second_connection);
   ASSERT_TRUE(second_connection->GetRoots().count(window_in_second_connection) >
               0);
   // Wait for the window to appear in the wm.
   ASSERT_TRUE(delegate.QuitOnCreate());
 
   Window* window_in_wm = delegate.created_window();
   ASSERT_TRUE(window_in_wm);
 
   // Change the bounds in the wm, and make sure the child sees it.
   window_in_wm->SetBounds(gfx::Rect(1, 11, 12, 101));
   ASSERT_TRUE(WaitForBoundsToChange(window_in_second_connection));
   EXPECT_EQ(gfx::Rect(1, 11, 12, 101), window_in_second_connection->bounds());
 }
 
 }  // namespace ws
 }  // namespace mus