Revert of Service Manager: Remove ServiceContext* arg from Service::OnStart()

ash/mus/window_manager_application.h

 // 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.
 
 #ifndef ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
 #define ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 11 matching lines @@
 namespace base {
 class SequencedWorkerPool;
 }
 
 namespace chromeos {
 namespace system {
 class ScopedFakeStatisticsProvider;
 }
 }
 
+namespace service_manager {
+class ServiceContext;
+}
+
 namespace views {
 class AuraInit;
 class SurfaceContextFactory;
 }
 
 namespace ui {
 class Event;
 class GpuService;
 class WindowTreeClient;
 }
@@ skipping 23 matching lines @@
 
   void InitWindowManager(
       std::unique_ptr<ui::WindowTreeClient> window_tree_client,
       const scoped_refptr<base::SequencedWorkerPool>& blocking_pool);
 
   // Initializes lower-level OS-specific components (e.g. D-Bus services).
   void InitializeComponents();
   void ShutdownComponents();
 
   // service_manager::Service:
-  void OnStart() override;
+  void OnStart(service_manager::ServiceContext* context) override;
   bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override;
 
   // session::mojom::ScreenlockStateListener:
   void ScreenlockStateChanged(bool locked) override;
 
+  service_manager::ServiceContext* context_ = nullptr;
+
   tracing::Provider tracing_;
 
   std::unique_ptr<views::AuraInit> aura_init_;
   std::unique_ptr<NativeWidgetFactoryMus> native_widget_factory_mus_;
 
   std::unique_ptr<ui::GpuService> gpu_service_;
   std::unique_ptr<views::SurfaceContextFactory> compositor_context_factory_;
   std::unique_ptr<WindowManager> window_manager_;
 
   // A blocking pool used by the WindowManager's shell; not used in tests.
@@ skipping 10 matching lines @@
       statistics_provider_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_