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

chrome/browser/ui/views/frame/browser_frame_mus.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 "chrome/browser/ui/views/frame/browser_frame_mus.h"
 
 #include <stdint.h>
 
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
-#include "mojo/shell/public/cpp/application_impl.h"
 #include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/mus/window_manager_frame_values.h"
 
 namespace {
 
 views::Widget::InitParams GetWidgetParamsImpl(BrowserView* browser_view) {
   views::Widget::InitParams params;
   params.bounds = gfx::Rect(10, 10, 640, 480);
   params.delegate = browser_view;
   return params;
 }
 
 mus::Window* CreateMusWindow(BrowserView* browser_view) {
   std::map<std::string, std::vector<uint8_t>> properties;
   views::NativeWidgetMus::ConfigurePropertiesForNewWindow(
       GetWidgetParamsImpl(browser_view), &properties);
   return views::WindowManagerConnection::Get()->NewWindow(properties);
 }
 
 }  // namespace
 
 BrowserFrameMus::BrowserFrameMus(BrowserFrame* browser_frame,
                                  BrowserView* browser_view)
     : views::NativeWidgetMus(
           browser_frame,
-          views::WindowManagerConnection::Get()->app()->shell(),
+          views::WindowManagerConnection::Get()->shell(),
           CreateMusWindow(browser_view),
           mus::mojom::SurfaceType::DEFAULT),
       browser_view_(browser_view) {}
 
 BrowserFrameMus::~BrowserFrameMus() {}
 
 views::Widget::InitParams BrowserFrameMus::GetWidgetParams() {
   views::Widget::InitParams params(GetWidgetParamsImpl(browser_view_));
   params.native_widget = this;
   return params;
@@ skipping 18 matching lines @@
 }
 
 int BrowserFrameMus::GetMinimizeButtonOffset() const {
   return 0;
 }
 
 void BrowserFrameMus::UpdateClientArea() {
   // BrowserNonClientFrameViewMus::OnBoundsChanged() takes care of updating
   // the insets.
 }