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

mojo/shell/capability_filter_test.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 "mojo/shell/capability_filter_test.h"
 
 #include <utility>
 
 #include "base/macros.h"
 #include "base/stl_util.h"
@@ skipping 95 matching lines @@
 };
 
 // This class models a system service that exposes two interfaces, Safe and
 // Unsafe. The interface Unsafe is not to be exposed to untrusted applications.
 class ServiceApplication : public ApplicationDelegate,
                            public InterfaceFactory<Safe>,
                            public InterfaceFactory<Unsafe>,
                            public Safe,
                            public Unsafe {
  public:
-  ServiceApplication() : app_(nullptr) {}
+  ServiceApplication() : shell_(nullptr) {}
   ~ServiceApplication() override {}
 
  private:
   // Overridden from ApplicationDelegate:
-  void Initialize(ApplicationImpl* app) override {
-    app_ = app;
+  void Initialize(Shell* shell, const std::string& url, uint32_t id) override {
+    shell_ = shell;
     // ServiceApplications have no capability filter and can thus connect
     // directly to the validator application.
-    app_->ConnectToService("test:validator", &validator_);
+    shell_->ConnectToService("test:validator", &validator_);
   }
   bool AcceptConnection(ApplicationConnection* connection) override {
     AddService<Safe>(connection);
     AddService<Unsafe>(connection);
     return true;
   }
 
   // Overridden from InterfaceFactory<Safe>:
   void Create(ApplicationConnection* connection,
               InterfaceRequest<Safe> request) override {
     safe_bindings_.AddBinding(this, std::move(request));
   }
 
   // Overridden from InterfaceFactory<Unsafe>:
   void Create(ApplicationConnection* connection,
               InterfaceRequest<Unsafe> request) override {
     unsafe_bindings_.AddBinding(this, std::move(request));
   }
 
   template <typename Interface>
   void AddService(ApplicationConnection* connection) {
     validator_->AddServiceCalled(connection->GetRemoteApplicationURL(),
                                  connection->GetConnectionURL(),
                                  Interface::Name_,
                                  !connection->AddService<Interface>(this));
   }
 
-  ApplicationImpl* app_;
+  Shell* shell_;
   ValidatorPtr validator_;
   WeakBindingSet<Safe> safe_bindings_;
   WeakBindingSet<Unsafe> unsafe_bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceApplication);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // TestApplication:
 
-TestApplication::TestApplication() : app_(nullptr) {}
+TestApplication::TestApplication() : shell_(nullptr) {}
 TestApplication::~TestApplication() {}
 
-void TestApplication::Initialize(ApplicationImpl* app) {
-  app_ = app;
+void TestApplication::Initialize(Shell* shell, const std::string& url,
+                                 uint32_t id) {
+  shell_ = shell;
+  url_ = url;
 }
 bool TestApplication::AcceptConnection(
     ApplicationConnection* connection) {
   // TestApplications receive their Validator via the inbound connection.
   connection->ConnectToService(&validator_);
 
-  connection1_ = app_->ConnectToApplication("test:service");
+  connection1_ = shell_->ConnectToApplication("test:service");
   connection1_->SetRemoteServiceProviderConnectionErrorHandler(
       base::Bind(&TestApplication::ConnectionClosed,
                   base::Unretained(this), "test:service"));
 
-  connection2_ = app_->ConnectToApplication("test:service2");
+  connection2_ = shell_->ConnectToApplication("test:service2");
   connection2_->SetRemoteServiceProviderConnectionErrorHandler(
       base::Bind(&TestApplication::ConnectionClosed,
                   base::Unretained(this), "test:service2"));
   return true;
 }
 
 void TestApplication::ConnectionClosed(const std::string& service_url) {
-  validator_->ConnectionClosed(app_->url(), service_url);
+  validator_->ConnectionClosed(url_, service_url);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TestLoader:
 
 TestLoader::TestLoader(ApplicationDelegate* delegate) : delegate_(delegate) {}
 TestLoader::~TestLoader() {}
 
 void TestLoader::Load(const GURL& url,
                       InterfaceRequest<mojom::Application> request) {
@@ skipping 122 matching lines @@
 void CapabilityFilterTest::RunTest() {
   loop()->Run();
   EXPECT_TRUE(validator_->expectations_met());
   if (!validator_->expectations_met())
     validator_->PrintUnmetExpectations();
 }
 
 }  // namespace test
 }  // namespace shell
 }  // namespace mojo