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

mojo/shell/application_manager_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/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/process_handle.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/converters/network/network_type_converters.h"
 #include "mojo/shell/application_manager_apptests.mojom.h"
-#include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/shell/public/cpp/application_test_base.h"
 #include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/cpp/shell.h"
 #include "mojo/shell/public/interfaces/application_manager.mojom.h"
 
 using mojo::shell::test::mojom::CreateInstanceForHandleTest;
 
 namespace mojo {
 namespace shell {
 namespace {
 
 class ApplicationManagerAppTestDelegate
     : public ApplicationDelegate,
       public InterfaceFactory<CreateInstanceForHandleTest>,
       public CreateInstanceForHandleTest {
  public:
   ApplicationManagerAppTestDelegate()
       : target_id_(mojom::Shell::kInvalidApplicationID),
         binding_(this) {}
   ~ApplicationManagerAppTestDelegate() override {}
 
   uint32_t target_id() const { return target_id_; }
 
  private:
   // ApplicationDelegate:
-  void Initialize(ApplicationImpl* app) override {}
+  void Initialize(Shell* shell, const std::string& url, uint32_t id) override {}
   bool AcceptConnection(ApplicationConnection* connection) override {
     connection->AddService<CreateInstanceForHandleTest>(this);
     return true;
   }
 
   // InterfaceFactory<CreateInstanceForHandleTest>:
   void Create(
       ApplicationConnection* connection,
       InterfaceRequest<CreateInstanceForHandleTest> request) override {
     binding_.Bind(std::move(request));
@@ skipping 32 matching lines @@
         : id(id), url(url), pid(base::kNullProcessId), name(name) {}
 
     uint32_t id;
     std::string url;
     base::ProcessId pid;
     std::string name;
   };
 
   void AddListenerAndWaitForApplications() {
     mojom::ApplicationManagerPtr application_manager;
-    application_impl()->ConnectToService("mojo:shell", &application_manager);
+    shell()->ConnectToService("mojo:shell", &application_manager);
 
     application_manager->AddListener(binding_.CreateInterfacePtrAndBind());
     binding_.WaitForIncomingMethodCall();
   }
 
   bool ContainsApplicationNamed(const std::string& name) const {
     for (const auto& application : initial_applications_) {
       if (application.name == name)
         return true;
     }
@@ skipping 62 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ApplicationManagerAppTest);
 };
 
 TEST_F(ApplicationManagerAppTest, CreateInstanceForHandle) {
   AddListenerAndWaitForApplications();
 
   // 1. Launch a process. (Actually, have the runner launch a process that
   //    launches a process. #becauselinkerrors).
   mojo::shell::test::mojom::DriverPtr driver;
   scoped_ptr<ApplicationConnection> connection =
-      application_impl()->ConnectToApplication(
-          "exe:application_manager_apptest_driver");
+      shell()->ConnectToApplication("exe:application_manager_apptest_driver");
   connection->ConnectToService(&driver);
 
   // 2. Wait for the target to connect to us. (via
   //    mojo:application_manager_apptests)
   base::MessageLoop::current()->Run();
 
   uint32_t remote_id = mojom::Shell::kInvalidApplicationID;
   EXPECT_TRUE(connection->GetRemoteApplicationID(&remote_id));
   EXPECT_NE(mojom::Shell::kInvalidApplicationID, remote_id);
 
@@ skipping 21 matching lines @@
 
   driver.set_connection_error_handler(
       base::Bind(&ApplicationManagerAppTest::OnDriverQuit,
                  base::Unretained(this)));
   driver->QuitDriver();
   base::MessageLoop::current()->Run();
 }
 
 }  // namespace shell
 }  // namespace mojo