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

components/web_view/web_view_apptest.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/public/cpp/web_view.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/base_paths.h"
@@ skipping 79 matching lines @@
 
  private:
   void QuitNestedRunLoop() {
     if (run_loop_) {
       quit_condition_ = NO_QUIT;
       run_loop_->Quit();
     }
   }
 
   // Overridden from ApplicationDelegate:
-  void Initialize(mojo::ApplicationImpl* app) override {
-    WindowServerTestBase::Initialize(app);
-    app_ = app;
+  void Initialize(mojo::Shell* shell, const std::string& url,
+                  uint32_t id) override {
+    WindowServerTestBase::Initialize(shell, url, id);
+    shell_ = shell;
   }
 
   // Overridden from WindowTreeDelegate:
   void OnEmbed(mus::Window* root) override {
     content_ = root->connection()->NewWindow();
     content_->SetBounds(root->bounds());
     root->AddChild(content_);
     content_->SetVisible(true);
 
-    web_view_.Init(app_, content_);
+    web_view_.Init(shell_, content_);
 
     WindowServerTestBase::OnEmbed(root);
   }
 
   void TearDown() override {
     ASSERT_EQ(1u, window_manager()->GetRoots().size());
     mus::ScopedWindowPtr::DeleteWindowOrWindowManager(
         *window_manager()->GetRoots().begin());
     WindowServerTestBase::TearDown();
   }
@@ skipping 22 matching lines @@
     if (final_update && quit_condition_ == FINAL_FIND_UPATE)
       QuitNestedRunLoop();
   }
   void FindInPageSelectionUpdated(int32_t request_id,
                                   int32_t active_match_ordinal) override {
     active_find_match_ = active_match_ordinal;
     if (quit_condition_ == ACTIVE_FIND_UPDATE)
       QuitNestedRunLoop();
   }
 
-  mojo::ApplicationImpl* app_;
+  mojo::Shell* shell_;
 
   mus::Window* content_;
 
   web_view::WebView web_view_;
 
   scoped_ptr<base::RunLoop> run_loop_;
 
   std::string navigation_url_;
   std::string last_title_;
   mojom::ButtonState last_back_button_state_;
@@ skipping 142 matching lines @@
     EXPECT_EQ(i, active_find_match());
   }
 
   // We should wrap around.
   web_view()->Find("Green", true);
   StartNestedRunLoopUntil(ACTIVE_FIND_UPDATE);
   EXPECT_EQ(1, active_find_match());
 }
 
 }  // namespace web_view