Make Service own ServiceContext.

ash/sysui/sysui_application.cc

 // Copyright 2016 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 "ash/sysui/sysui_application.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 295 matching lines @@
   std::unique_ptr<NativeWidgetFactory> native_widget_factory_;
   std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
 
   DISALLOW_COPY_AND_ASSIGN(AshInit);
 };
 
 SysUIApplication::SysUIApplication() {}
 
 SysUIApplication::~SysUIApplication() {}
 
-void SysUIApplication::OnStart(::shell::Connector* connector,
-                               const ::shell::Identity& identity,
-                               uint32_t id) {
+void SysUIApplication::OnStart(const ::shell::Identity& identity) {
   ash_init_.reset(new AshInit());
-  ash_init_->Initialize(connector, identity);
+  ash_init_->Initialize(connector(), identity);
 
   ui::mojom::InputDeviceServerPtr server;
-  connector->ConnectToInterface("mojo:ui", &server);
+  connector()->ConnectToInterface("mojo:ui", &server);
   input_device_client_.Connect(std::move(server));
 }
 
 bool SysUIApplication::OnConnect(::shell::Connection* connection) {
   connection->AddInterface<mash::shelf::mojom::ShelfController>(this);
   connection->AddInterface<mojom::WallpaperController>(this);
   return true;
 }
 
 void SysUIApplication::Create(
     const ::shell::Identity& remote_identity,
     mash::shelf::mojom::ShelfControllerRequest request) {
   mash::shelf::mojom::ShelfController* shelf_controller =
       static_cast<ShelfDelegateMus*>(WmShell::Get()->shelf_delegate());
   DCHECK(shelf_controller);
   shelf_controller_bindings_.AddBinding(shelf_controller, std::move(request));
 }
 
 void SysUIApplication::Create(const ::shell::Identity& remote_identity,
                               mojom::WallpaperControllerRequest request) {
   mojom::WallpaperController* wallpaper_controller =
       static_cast<UserWallpaperDelegateMus*>(
           Shell::GetInstance()->user_wallpaper_delegate());
   wallpaper_controller_bindings_.AddBinding(wallpaper_controller,
                                             std::move(request));
 }
 
 }  // namespace sysui
 }  // namespace ash