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

components/html_viewer/html_frame.h

 // 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.
 
 #ifndef COMPONENTS_HTML_VIEWER_HTML_FRAME_H_
 #define COMPONENTS_HTML_VIEWER_HTML_FRAME_H_
 
 #include <stdint.h>
 
 #include <vector>
@@ skipping 19 matching lines @@
 namespace cc_blink {
 class WebLayerImpl;
 }
 
 namespace blink {
 class WebFrame;
 class WebWidget;
 }
 
 namespace mojo {
-class ApplicationImpl;
 class Rect;
+class Shell;
 }
 
 namespace mus {
 class ScopedWindowPtr;
 class Window;
 }
 
 namespace html_viewer {
 
 class DevToolsAgentImpl;
@@ skipping 172 matching lines @@
 
   // Sets the appropriate value from the client property. |name| identifies
   // the property and |new_data| the new value.
   void SetValueFromClientProperty(const std::string& name,
                                   mojo::Array<uint8_t> new_data);
 
   // The local root is the first ancestor (starting at this) that has its own
   // delegate.
   HTMLFrame* GetFirstAncestorWithDelegate();
 
-  // Returns the ApplicationImpl from the first ancestor with a delegate.
-  mojo::ApplicationImpl* GetApp();
+  // Returns the Shell from the first ancestor with a delegate.
+  mojo::Shell* GetShell();
 
   // Gets the server Frame to use for this frame.
   web_view::mojom::Frame* GetServerFrame();
 
   void SetWindow(mus::Window* window);
 
   // Creates the appropriate WebWidget implementation for the Frame.
   void CreateRootWebWidget();
   void CreateLocalRootWebWidget(blink::WebLocalFrame* local_frame);
 
@@ skipping 134 matching lines @@
   base::TimeTicks navigation_start_time_;
 
   base::WeakPtrFactory<HTMLFrame> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(HTMLFrame);
 };
 
 }  // namespace html_viewer
 
 #endif  // COMPONENTS_HTML_VIEWER_HTML_FRAME_H_