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

mojo/services/test_service/test_service_impl.h

 // Copyright 2014 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.
 
 #ifndef SERVICES_TEST_SERVICE_TEST_SERVICE_IMPL_H_
 #define SERVICES_TEST_SERVICE_TEST_SERVICE_IMPL_H_
 
 #include <stdint.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/services/test_service/test_service.mojom.h"
 
 namespace mojo {
-class ApplicationImpl;
+class Shell;
 namespace test {
 
 class TrackedService;
 class TestServiceApplication;
 
 class TestServiceImpl : public TestService {
  public:
-  TestServiceImpl(ApplicationImpl* app_impl,
+  TestServiceImpl(Shell* shell,
                   TestServiceApplication* application,
                   InterfaceRequest<TestService> request);
   ~TestServiceImpl() override;
 
   // |TestService| methods:
   void Ping(const mojo::Callback<void()>& callback) override;
   void ConnectToAppAndGetTime(
       const mojo::String& app_url,
       const mojo::Callback<void(int64_t)>& callback) override;
   void StartTrackingRequests(const mojo::Callback<void()>& callback) override;
 
  private:
   TestServiceApplication* const application_;
-  ApplicationImpl* const app_impl_;
+  Shell* const shell_;
   TestTimeServicePtr time_service_;
   scoped_ptr<TrackedService> tracking_;
   StrongBinding<TestService> binding_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(TestServiceImpl);
 };
 
 }  // namespace test
 }  // namespace mojo
 
 #endif  // SERVICES_TEST_SERVICE_TEST_SERVICE_IMPL_H_