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

components/web_view/web_view_impl.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 "components/web_view/web_view_impl.h"
 
 #include <queue>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "components/mus/public/cpp/scoped_window_ptr.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/web_view/client_initiated_frame_connection.h"
 #include "components/web_view/frame.h"
 #include "components/web_view/frame_connection.h"
 #include "components/web_view/frame_devtools_agent.h"
 #include "components/web_view/frame_tree.h"
 #include "components/web_view/navigation_entry.h"
 #include "components/web_view/pending_web_view_load.h"
 #include "components/web_view/url_request_cloneable.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
-#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/shell.h"
 #include "url/gurl.h"
 
 namespace web_view {
 
 using web_view::mojom::ButtonState;
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebViewImpl, public:
 
-WebViewImpl::WebViewImpl(mojo::ApplicationImpl* app,
+WebViewImpl::WebViewImpl(mojo::Shell* shell,
                          mojom::WebViewClientPtr client,
                          mojo::InterfaceRequest<mojom::WebView> request)
-    : app_(app),
+    : shell_(shell),
       client_(std::move(client)),
       binding_(this, std::move(request)),
       root_(nullptr),
       content_(nullptr),
       find_controller_(this),
       navigation_controller_(this) {
-  devtools_agent_.reset(new FrameDevToolsAgent(app_, this));
+  devtools_agent_.reset(new FrameDevToolsAgent(shell_, this));
   OnDidNavigate();
 }
 
 WebViewImpl::~WebViewImpl() {
   if (content_)
     content_->RemoveObserver(this);
   if (root_) {
     root_->RemoveObserver(this);
     mus::ScopedWindowPtr::DeleteWindowOrWindowManager(root_);
   }
@@ skipping 140 matching lines @@
 }
 
 void WebViewImpl::NavigateTopLevel(Frame* source, mojo::URLRequestPtr request) {
   client_->TopLevelNavigateRequest(std::move(request));
 }
 
 void WebViewImpl::CanNavigateFrame(Frame* target,
                                    mojo::URLRequestPtr request,
                                    const CanNavigateFrameCallback& callback) {
   FrameConnection::CreateConnectionForCanNavigateFrame(
-      app_, target, std::move(request), callback);
+      shell_, target, std::move(request), callback);
 }
 
 void WebViewImpl::DidStartNavigation(Frame* frame) {}
 
 void WebViewImpl::DidCommitProvisionalLoad(Frame* frame) {
   navigation_controller_.FrameDidCommitProvisionalLoad(frame);
 }
 
 void WebViewImpl::DidNavigateLocally(Frame* source,
                                      const GURL& url) {
@@ skipping 53 matching lines @@
   std::vector<Frame*> all_frames;
   PreOrderDepthFirstTraverseTree(frame_tree_->root(), &all_frames);
   return all_frames;
 }
 
 mojom::WebViewClient* WebViewImpl::GetWebViewClient() {
   return client_.get();
 }
 
 }  // namespace web_view