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

mash/shelf/shelf_tooltip_manager.cc

 // Copyright 2013 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 "mash/shelf/shelf_tooltip_manager.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "mash/shelf/shelf_view.h"
 #include "mash/wm/public/interfaces/container.mojom.h"
-#include "mojo/shell/public/cpp/application_impl.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/mus/native_widget_mus.h"
 #include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/widget/widget.h"
@@ skipping 92 matching lines @@
     views::Widget::InitParams* params,
     views::Widget* widget) const {
   // Ensure the widget is treated as a tooltip by the window manager.
   std::map<std::string, std::vector<uint8_t>> properties;
   properties[mash::wm::mojom::kWindowContainer_Property] =
       mojo::TypeConverter<const std::vector<uint8_t>, int32_t>::Convert(
           static_cast<int32_t>(mash::wm::mojom::Container::TOOLTIPS));
   mus::Window* window =
       views::WindowManagerConnection::Get()->NewWindow(properties);
   params->native_widget = new views::NativeWidgetMus(
-      widget, host_->shelf_view()->app()->shell(), window,
+      widget, host_->shelf_view()->shell(), window,
       mus::mojom::SurfaceType::DEFAULT);
 }
 
 void ShelfTooltipManager::ShelfTooltipBubble::WindowClosing() {
   views::BubbleDelegateView::WindowClosing();
   if (host_)
     host_->OnBubbleClosed(this);
 }
 
 bool ShelfTooltipManager::ShelfTooltipBubble::ShouldShowWindowTitle() const {
@@ skipping 214 matching lines @@
   base::OneShotTimer* new_timer = new base::OneShotTimer();
   new_timer->Start(FROM_HERE,
                    base::TimeDelta::FromMilliseconds(delay_in_ms),
                    this,
                    &ShelfTooltipManager::ShowInternal);
   timer_.reset(new_timer);
 }
 
 }  // namespace shelf
 }  // namespace mash