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

mojo/shell/package_manager/capability_filter_content_handler_unittest.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 <stdint.h>
 
 #include <utility>
 
 #include "base/macros.h"
 #include "base/path_service.h"
@@ skipping 63 matching lines @@
     new TestFetcher(GURL(request->url.get()), loader_callback);
   }
 
   DISALLOW_COPY_AND_ASSIGN(TestPackageManager);
 };
 
 class TestContentHandler : public ApplicationDelegate,
                            public InterfaceFactory<mojom::ContentHandler>,
                            public mojom::ContentHandler {
  public:
-  TestContentHandler() : app_(nullptr) {}
+  TestContentHandler() {}
   ~TestContentHandler() override {}
 
  private:
   // Overridden from ApplicationDelegate:
-  void Initialize(ApplicationImpl* app) override {
-    app_ = app;
-  }
+  void Initialize(Shell* shell, const std::string& url, uint32_t id) override {}
   bool AcceptConnection(ApplicationConnection* connection) override {
     connection->AddService<mojom::ContentHandler>(this);
     return true;
   }
 
   // Overridden from InterfaceFactory<mojom::ContentHandler>:
   void Create(ApplicationConnection* connection,
               InterfaceRequest<mojom::ContentHandler> request) override {
     bindings_.AddBinding(this, std::move(request));
   }
 
   // Overridden from mojom::ContentHandler:
   void StartApplication(
       InterfaceRequest<mojom::Application> application,
       URLResponsePtr response,
       const Callback<void()>& destruct_callback) override {
     scoped_ptr<ApplicationDelegate> delegate(new test::TestApplication);
     embedded_apps_.push_back(
         new ApplicationImpl(delegate.get(), std::move(application)));
     embedded_app_delegates_.push_back(std::move(delegate));
     destruct_callback.Run();
   }
 
-  ApplicationImpl* app_;
   WeakBindingSet<mojom::ContentHandler> bindings_;
   ScopedVector<ApplicationDelegate> embedded_app_delegates_;
   ScopedVector<ApplicationImpl> embedded_apps_;
 
   DISALLOW_COPY_AND_ASSIGN(TestContentHandler);
 };
 
 }  // namespace
 
 class CapabilityFilterContentHandlerTest : public test::CapabilityFilterTest {
@@ skipping 30 matching lines @@
   RunBlockingTest();
 }
 
 TEST_F(CapabilityFilterContentHandlerTest, Wildcards) {
   RunWildcardTest();
 }
 
 }  // namespace test
 }  // namespace shell
 }  // namespace mojo