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

components/web_view/test_runner/test_runner_application_delegate.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__TEST_RUNNER_TEST_RUNNER_APPLICATION_DELEGATE_H_
 #define COMPONENTS_WEB_VIEW__TEST_RUNNER_TEST_RUNNER_APPLICATION_DELEGATE_H_
 
 #include <stdint.h>
 
 #include "base/command_line.h"
@@ skipping 21 matching lines @@
       public mojo::InterfaceFactory<LayoutTestRunner> {
  public:
   TestRunnerApplicationDelegate();
   ~TestRunnerApplicationDelegate() override;
 
  private:
   void LaunchURL(const GURL& test_url);
   void Terminate();
 
   // mojo::ApplicationDelegate:
-  void Initialize(mojo::ApplicationImpl* app) override;
+  void Initialize(mojo::Shell* shell, const std::string& url,
+                  uint32_t id) override;
   bool AcceptConnection(
       mojo::ApplicationConnection* connection) override;
 
   // mus::WindowTreeDelegate:
   void OnEmbed(mus::Window* root) override;
   void OnConnectionLost(mus::WindowTreeConnection* connection) override;
 
   // mojom::WebViewClient:
   void TopLevelNavigateRequest(mojo::URLRequestPtr request) override;
   void TopLevelNavigationStarted(const mojo::String& url) override;
   void LoadingStateChanged(bool is_loading, double progress) override;
   void BackForwardChanged(mojom::ButtonState back_button,
                           mojom::ButtonState forward_button) override;
   void TitleChanged(const mojo::String& title) override;
   void FindInPageMatchCountUpdated(int32_t request_id,
                                    int32_t count,
                                    bool final_update) override {}
   void FindInPageSelectionUpdated(int32_t request_id,
                                   int32_t active_match_ordinal) override {}
 
   // LayoutTestRunner:
   void TestFinished() override;
 
   // mojo::InterfaceFactory<LayoutTestRunner>:
   void Create(mojo::ApplicationConnection* connection,
               mojo::InterfaceRequest<LayoutTestRunner> request) override;
 
-  mojo::ApplicationImpl* app_;
+  mojo::Shell* shell_;
   mus::mojom::WindowTreeHostPtr host_;
 
   mus::Window* root_;
   mus::Window* content_;
   scoped_ptr<WebView> web_view_;
 
   scoped_ptr<test_runner::TestInfoExtractor> test_extractor_;
 
   mojo::WeakBindingSet<LayoutTestRunner> layout_test_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(TestRunnerApplicationDelegate);
 };
 
 }  // namespace web_view
 
 #endif  // COMPONENTS_WEB_VIEW__TEST_RUNNER_TEST_RUNNER_APPLICATION_DELEGATE_H_