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

mojo/services/test_service/test_time_service_impl.cc

Index: mojo/services/test_service/test_time_service_impl.cc
diff --git a/mojo/services/test_service/test_time_service_impl.cc b/mojo/services/test_service/test_time_service_impl.cc
index 485be0075a559202b814e20145c6c4d9d598a418..c69673d502c1c08752b4ff2ab7d66e0ce86c193e 100644
--- a/mojo/services/test_service/test_time_service_impl.cc
+++ b/mojo/services/test_service/test_time_service_impl.cc
@@ -11,15 +11,15 @@
 #include "base/time/time.h"
 #include "mojo/services/test_service/test_request_tracker.mojom.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 {
 
 TestTimeServiceImpl::TestTimeServiceImpl(
-    ApplicationImpl* app_impl,
-    InterfaceRequest<TestTimeService> request)
-    : app_impl_(app_impl), binding_(this, std::move(request)) {}
+      Shell* shell,
+      InterfaceRequest<TestTimeService> request)
+    : shell_(shell), binding_(this, std::move(request)) {}
 
 TestTimeServiceImpl::~TestTimeServiceImpl() {
 }
@@ -27,7 +27,7 @@ TestTimeServiceImpl::~TestTimeServiceImpl() {
 void TestTimeServiceImpl::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));
 }