De-client TestRequestTracker

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 "services/test_service/test_service_impl.h"
 
 #include "base/bind.h"
 #include "base/i18n/time_formatting.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/public/cpp/application/application_connection.h"
-#include "services/test_service/test_request_tracker_client_impl.h"
 #include "services/test_service/test_service_application.h"
 #include "services/test_service/test_time_service_impl.h"
+#include "services/test_service/tracked_service.h"
 
 namespace mojo {
 namespace test {
 
 TestServiceImpl::TestServiceImpl(ApplicationConnection* connection,
                                  TestServiceApplication* application)
     : application_(application), connection_(connection) {
 }
 
 TestServiceImpl::~TestServiceImpl() {
@@ skipping 23 matching lines @@
     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;
   connection_->ConnectToService("mojo:test_request_tracker_app", &tracker);
-  tracking_.reset(
-      new TestRequestTrackerClientImpl(tracker.Pass(), Name_, callback));
+  tracking_.reset(new TrackedService(tracker.Pass(), Name_, callback));
 }
 
 }  // namespace test
 }  // namespace mojo