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

components/web_view/web_view_impl.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_WEB_VIEW_WEB_VIEW_IMPL_H_
 #define COMPONENTS_WEB_VIEW_WEB_VIEW_IMPL_H_
 
 #include <stdint.h>
 
 #include <deque>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/mus/public/cpp/window_observer.h"
 #include "components/mus/public/cpp/window_tree_delegate.h"
 #include "components/web_view/find_controller.h"
 #include "components/web_view/find_controller_delegate.h"
 #include "components/web_view/frame_devtools_agent_delegate.h"
 #include "components/web_view/frame_tree_delegate.h"
 #include "components/web_view/navigation_controller.h"
 #include "components/web_view/navigation_controller_delegate.h"
 #include "components/web_view/public/interfaces/frame.mojom.h"
 #include "components/web_view/public/interfaces/web_view.mojom.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 
 namespace mojo {
-class ApplicationImpl;
+class Shell;
 }
 
 namespace web_view {
 
 class Frame;
 class FrameDevToolsAgent;
 class FrameTree;
 class PendingWebViewLoad;
 class URLRequestCloneable;
 
 namespace mojom {
 class HTMLMessageEvent;
 }
 
 class WebViewImpl : public mojom::WebView,
                     public mus::WindowTreeDelegate,
                     public mus::WindowObserver,
                     public FrameTreeDelegate,
                     public FrameDevToolsAgentDelegate,
                     public NavigationControllerDelegate,
                     public FindControllerDelegate {
  public:
-  WebViewImpl(mojo::ApplicationImpl* app,
+  WebViewImpl(mojo::Shell* shell,
               mojom::WebViewClientPtr client,
               mojo::InterfaceRequest<WebView> request);
   ~WebViewImpl() override;
 
  private:
   friend class PendingWebViewLoad;
 
   // See description above |pending_load_| for details.
   void OnLoad(const GURL& pending_url);
 
@@ skipping 47 matching lines @@
   void HandlePageNavigateRequest(const GURL& url) override;
 
   // Overridden from NavigationControllerDelegate:
   void OnNavigate(mojo::URLRequestPtr request) override;
   void OnDidNavigate() override;
 
   // Overridden from FindControllerDelegate:
   std::vector<Frame*> GetAllFrames() override;
   mojom::WebViewClient* GetWebViewClient() override;
 
-  mojo::ApplicationImpl* app_;
+  mojo::Shell* shell_;
   mojom::WebViewClientPtr client_;
   mojo::StrongBinding<WebView> binding_;
   mus::Window* root_;
   mus::Window* content_;
   // |find_controller_| is referenced by frame_tree_'s frames at destruction.
   FindController find_controller_;
   scoped_ptr<FrameTree> frame_tree_;
 
   // When LoadRequest() is called a PendingWebViewLoad is created to wait for
   // state needed to process the request. When the state is obtained OnLoad()
   // is invoked.
   scoped_ptr<PendingWebViewLoad> pending_load_;
 
   scoped_ptr<FrameDevToolsAgent> devtools_agent_;
 
   NavigationController navigation_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(WebViewImpl);
 };
 
 }  // namespace web_view
 
 #endif  // COMPONENTS_WEB_VIEW_WEB_VIEW_IMPL_H_