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

components/web_view/test_runner/test_runner_application_delegate.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/test_runner/test_runner_application_delegate.h"
 
 #include <iostream>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/location.h"
 #include "base/path_service.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread_restrictions.h"
 #include "build/build_config.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/mus/public/cpp/window_tree_host_factory.h"
 #include "components/test_runner/blink_test_platform_support.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
 #include "mojo/shell/public/cpp/application_connection.h"
-#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/shell.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "url/gurl.h"
 
 #if defined(OS_WIN)
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #endif
 
 namespace web_view {
 
 TestRunnerApplicationDelegate::TestRunnerApplicationDelegate()
-    : app_(nullptr), root_(nullptr), content_(nullptr) {}
+    : shell_(nullptr), root_(nullptr), content_(nullptr) {}
 
 TestRunnerApplicationDelegate::~TestRunnerApplicationDelegate() {
   if (root_)
     mus::ScopedWindowPtr::DeleteWindowOrWindowManager(root_);
 }
 
 void TestRunnerApplicationDelegate::LaunchURL(const GURL& test_url) {
   if (!web_view_) {
     web_view_.reset(new WebView(this));
-    web_view_->Init(app_, content_);
+    web_view_->Init(shell_, content_);
   }
   mojo::URLRequestPtr request(mojo::URLRequest::New());
   request->url = test_url.spec();
   web_view_->web_view()->LoadRequest(std::move(request));
 }
 
 void TestRunnerApplicationDelegate::Terminate() {
   if (root_)
     mus::ScopedWindowPtr::DeleteWindowOrWindowManager(root_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // mojo::ApplicationDelegate implementation:
 
-void TestRunnerApplicationDelegate::Initialize(mojo::ApplicationImpl* app) {
+void TestRunnerApplicationDelegate::Initialize(mojo::Shell* shell,
+                                               const std::string& url,
+                                               uint32_t id) {
   if (!test_runner::BlinkTestPlatformInitialize()) {
     NOTREACHED() << "Test environment could not be properly set up for blink.";
   }
-  app_ = app;
-  mus::CreateWindowTreeHost(app_, this, &host_, nullptr);
+  shell_ = shell;
+  mus::CreateWindowTreeHost(shell_, this, &host_, nullptr);
 }
 
 bool TestRunnerApplicationDelegate::AcceptConnection(
     mojo::ApplicationConnection* connection) {
   connection->AddService<web_view::LayoutTestRunner>(this);
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // mus::WindowTreeDelegate implementation:
@@ skipping 26 matching lines @@
   test_extractor_.reset(new test_runner::TestInfoExtractor(cmdline_args));
 
   scoped_ptr<test_runner::TestInfo> test_info = test_extractor_->GetNextTest();
   if (test_info)
     LaunchURL(test_info->url);
 }
 
 void TestRunnerApplicationDelegate::OnConnectionLost(
     mus::WindowTreeConnection* connection) {
   root_ = nullptr;
-  app_->Quit();
+  shell_->Quit();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // mojom::WebViewClient implementation:
 
 void TestRunnerApplicationDelegate::TopLevelNavigateRequest(
     mojo::URLRequestPtr request) {
   web_view_->web_view()->LoadRequest(std::move(request));
 }
 
@@ skipping 26 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // mojo::InterfaceFactory<LayoutTestRunner> implementation:
 
 void TestRunnerApplicationDelegate::Create(
     mojo::ApplicationConnection* connection,
     mojo::InterfaceRequest<web_view::LayoutTestRunner> request) {
   layout_test_runner_.AddBinding(this, std::move(request));
 }
 
 }  // namespace web_view