Make Service own ServiceContext.

services/ui/service.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_UI_SERVICE_H_
 #define SERVICES_UI_SERVICE_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 81 matching lines @@
 
   // Returns the user specific state for the user id of |remote_identity|.
   // Service owns the return value.
   // TODO(sky): if we allow removal of user ids then we need to close anything
   // associated with the user (all incoming pipes...) on removal.
   UserState* GetUserState(const shell::Identity& remote_identity);
 
   void AddUserIfNecessary(const shell::Identity& remote_identity);
 
   // shell::Service:
-  void OnStart(shell::Connector* connector,
-               const shell::Identity& identity,
-               uint32_t id) override;
+  void OnStart(const shell::Identity& identity) override;
   bool OnConnect(shell::Connection* connection) override;
 
   // WindowServerDelegate:
   void OnFirstDisplayReady() override;
   void OnNoMoreDisplays() override;
   bool IsTestConfig() const override;
   void CreateDefaultDisplays() override;
 
   // shell::InterfaceFactory<mojom::AccessibilityManager> implementation.
   void Create(const shell::Identity& remote_identity,
@@ skipping 68 matching lines @@
   std::unique_ptr<ws::TouchController> touch_controller_;
 
   base::WeakPtrFactory<Service> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Service);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_SERVICE_H_