Make Service own ServiceContext.

components/font_service/font_service_app.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 "components/font_service/font_service_app.h"
 
 #include <utility>
 
 #include "base/files/file.h"
 #include "base/files/file_path.h"
@@ skipping 30 matching lines @@
 }
 
 }  // namespace
 
 namespace font_service {
 
 FontServiceApp::FontServiceApp() {}
 
 FontServiceApp::~FontServiceApp() {}
 
-void FontServiceApp::OnStart(shell::Connector* connector,
-                             const shell::Identity& identity,
-                             uint32_t id) {
-  tracing_.Initialize(connector, identity.name());
+void FontServiceApp::OnStart(const shell::Identity& identity) {
+  tracing_.Initialize(connector(), identity.name());
 }
 
 bool FontServiceApp::OnConnect(shell::Connection* connection) {
   connection->AddInterface(this);
   return true;
 }
 
 void FontServiceApp::Create(
     const shell::Identity& remote_identity,
     mojo::InterfaceRequest<mojom::FontService> request) {
@@ skipping 55 matching lines @@
   int count = paths_.size();
   for (int i = 0; i < count; ++i) {
     if (path == paths_[i])
       return i;
   }
   paths_.emplace_back(path);
   return count;
 }
 
 }  // namespace font_service