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

components/html_viewer/html_frame_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 <stddef.h>
 #include <stdint.h>
 #include <utility>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 10 matching lines @@
 #include "components/html_viewer/public/interfaces/test_html_viewer.mojom.h"
 #include "components/mus/public/cpp/tests/window_server_test_base.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/web_view/frame.h"
 #include "components/web_view/frame_connection.h"
 #include "components/web_view/frame_tree.h"
 #include "components/web_view/public/interfaces/frame.mojom.h"
 #include "components/web_view/test_frame_tree_delegate.h"
 #include "mojo/services/accessibility/public/interfaces/accessibility.mojom.h"
-#include "mojo/shell/public/cpp/application_impl.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
 using mus::mojom::WindowTreeClientPtr;
 using mus::WindowServerTestBase;
 using web_view::Frame;
 using web_view::FrameConnection;
 using web_view::FrameTree;
 using web_view::FrameTreeDelegate;
 using web_view::mojom::FrameClient;
 
@@ skipping 40 matching lines @@
     ASSERT_TRUE(WindowServerTestBase::QuitRunLoop());
   });
   if (!WindowServerTestBase::DoRunLoopWithTimeout())
     ADD_FAILURE() << "Timed out waiting for execute to complete";
   return result;
 }
 
 // FrameTreeDelegate that can block waiting for navigation to start.
 class TestFrameTreeDelegateImpl : public web_view::TestFrameTreeDelegate {
  public:
-  explicit TestFrameTreeDelegateImpl(mojo::ApplicationImpl* app)
-      : TestFrameTreeDelegate(app), frame_tree_(nullptr) {}
+  explicit TestFrameTreeDelegateImpl(mojo::Shell* shell)
+      : TestFrameTreeDelegate(shell), frame_tree_(nullptr) {}
   ~TestFrameTreeDelegateImpl() override {}
 
   void set_frame_tree(FrameTree* frame_tree) { frame_tree_ = frame_tree; }
 
   // Resets the navigation state for |frame|.
   void ClearGotNavigate(Frame* frame) { frames_navigated_.erase(frame); }
 
   // Waits until |frame| has |count| children and the last child has navigated.
   bool WaitForChildFrameCount(Frame* frame, size_t count) {
     if (DidChildNavigate(frame, count))
@@ skipping 65 matching lines @@
 class HTMLFrameTest : public WindowServerTestBase {
  public:
   HTMLFrameTest() {}
   ~HTMLFrameTest() override {}
 
  protected:
   // Creates the frame tree showing an empty page at the root and adds (via
   // script) a frame showing the same empty page.
   Frame* LoadEmptyPageAndCreateFrame() {
     mus::Window* embed_window = window_manager()->NewWindow();
-    frame_tree_delegate_.reset(
-        new TestFrameTreeDelegateImpl(application_impl()));
+    frame_tree_delegate_.reset(new TestFrameTreeDelegateImpl(shell()));
     FrameConnection* root_connection = InitFrameTree(
         embed_window, "http://127.0.0.1:%u/empty_page2.html");
     if (!root_connection) {
       ADD_FAILURE() << "unable to establish root connection";
       return nullptr;
     }
     const std::string frame_text =
         GetFrameText(root_connection->application_connection());
     if (frame_text != "child2") {
       ADD_FAILURE() << "unexpected text " << frame_text;
@@ skipping 23 matching lines @@
   }
 
   mojo::URLRequestPtr BuildRequestForURL(const std::string& url_string) {
     mojo::URLRequestPtr request(mojo::URLRequest::New());
     request->url = mojo::String::From(AddPortToString(url_string));
     return request;
   }
 
   FrameConnection* InitFrameTree(mus::Window* view,
                                  const std::string& url_string) {
-    frame_tree_delegate_.reset(
-        new TestFrameTreeDelegateImpl(application_impl()));
+    frame_tree_delegate_.reset(new TestFrameTreeDelegateImpl(shell()));
     scoped_ptr<FrameConnection> frame_connection(new FrameConnection);
     bool got_callback = false;
     frame_connection->Init(
-        application_impl(), BuildRequestForURL(url_string),
+        shell(), BuildRequestForURL(url_string),
         base::Bind(&OnGotContentHandlerForRoot, &got_callback));
     ignore_result(WindowServerTestBase::DoRunLoopWithTimeout());
     if (!got_callback)
       return nullptr;
     FrameConnection* result = frame_connection.get();
     FrameClient* frame_client = frame_connection->frame_client();
     WindowTreeClientPtr tree_client = frame_connection->GetWindowTreeClient();
     frame_tree_.reset(new FrameTree(
         result->GetContentHandlerID(), view, std::move(tree_client),
         frame_tree_delegate_.get(), frame_client, std::move(frame_connection),
@@ skipping 251 matching lines @@
         script_value_as_list->GetString(0u, &message_in_child);
       }
     }
   } while (message_in_child != "hello from parent" &&
            base::TimeTicks::Now() - start_time <
                TestTimeouts::action_timeout());
   EXPECT_EQ("hello from parent", message_in_child);
 }
 
 }  // namespace mojo