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

ui/views/mus/screen_mus.cc

 // Copyright 2016 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 "ui/views/mus/screen_mus.h"
 
 // #include "components/mus/public/interfaces/window_manager_constants.mojom.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/shell.h"
 #include "ui/gfx/display_finder.h"
 #include "ui/gfx/display_observer.h"
 #include "ui/views/mus/screen_mus_delegate.h"
 #include "ui/views/mus/window_manager_frame_values.h"
 
 namespace mojo {
 
 template <>
 struct TypeConverter<gfx::Display, mus::mojom::DisplayPtr> {
   static gfx::Display Convert(const mus::mojom::DisplayPtr& input) {
@@ skipping 47 matching lines @@
 
 namespace views {
 
 ScreenMus::ScreenMus(ScreenMusDelegate* delegate)
     : delegate_(delegate),
       primary_display_index_(0),
       display_manager_observer_binding_(this) {}
 
 ScreenMus::~ScreenMus() {}
 
-void ScreenMus::Init(mojo::ApplicationImpl* app) {
+void ScreenMus::Init(mojo::Shell* shell) {
   gfx::Screen::SetScreenInstance(this);
 
-  app->ConnectToService("mojo:mus", &display_manager_);
+  shell->ConnectToService("mojo:mus", &display_manager_);
 
   display_manager_->AddObserver(
       display_manager_observer_binding_.CreateInterfacePtrAndBind());
   // We need the set of displays before we can continue. Wait for it.
   display_manager_observer_binding_.WaitForIncomingMethodCall();
 
   // The WaitForIncomingMethodCall() should have supplied the set of Displays.
   DCHECK(displays_.size());
 }
 
@@ skipping 133 matching lines @@
   DCHECK_NE(-1, index);
   // Another display must become primary before the existing primary is
   // removed.
   DCHECK_NE(index, primary_display_index_);
   const gfx::Display display = displays_[index];
   FOR_EACH_OBSERVER(gfx::DisplayObserver, observers_,
                     OnDisplayRemoved(display));
 }
 
 }  // namespace views