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

mojo/services/test_service/test_service_impl.cc

 // 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.
 
 #include "mojo/services/test_service/test_service_impl.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/i18n/time_formatting.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/services/test_service/test_service_application.h"
 #include "mojo/services/test_service/test_time_service_impl.h"
 #include "mojo/services/test_service/tracked_service.h"
-#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/shell.h"
 
 namespace mojo {
 namespace test {
 
-TestServiceImpl::TestServiceImpl(ApplicationImpl* app_impl,
+TestServiceImpl::TestServiceImpl(Shell* shell,
                                  TestServiceApplication* application,
                                  InterfaceRequest<TestService> request)
     : application_(application),
-      app_impl_(app_impl),
+      shell_(shell),
       binding_(this, std::move(request)) {
   binding_.set_connection_error_handler(
       [this]() { application_->ReleaseRef(); });
 }
 
 TestServiceImpl::~TestServiceImpl() {
 }
 
 void TestServiceImpl::Ping(const mojo::Callback<void()>& callback) {
   if (tracking_)
     tracking_->RecordNewRequest();
   callback.Run();
 }
 
 void SendTimeResponse(
     const mojo::Callback<void(int64_t)>& requestor_callback,
     int64_t time_usec) {
   requestor_callback.Run(time_usec);
 }
 
 void TestServiceImpl::ConnectToAppAndGetTime(
     const mojo::String& app_url,
     const mojo::Callback<void(int64_t)>& callback) {
-  app_impl_->ConnectToService(app_url.get(), &time_service_);
+  shell_->ConnectToService(app_url.get(), &time_service_);
   if (tracking_) {
     tracking_->RecordNewRequest();
     time_service_->StartTrackingRequests(mojo::Callback<void()>());
   }
   time_service_->GetPartyTime(base::Bind(&SendTimeResponse, callback));
 }
 
 void TestServiceImpl::StartTrackingRequests(
     const mojo::Callback<void()>& callback) {
   TestRequestTrackerPtr tracker;
-  app_impl_->ConnectToService("mojo:test_request_tracker_app", &tracker);
+  shell_->ConnectToService("mojo:test_request_tracker_app", &tracker);
   tracking_.reset(new TrackedService(std::move(tracker), Name_, callback));
 }
 
 }  // namespace test
 }  // namespace mojo