Service Manager: Rework Service and ServiceContext lifetime

services/ui/ime/test_ime_driver/test_ime_application.h

Index: services/ui/ime/test_ime_driver/test_ime_application.h
diff --git a/services/ui/ime/test_ime_driver/test_ime_application.h b/services/ui/ime/test_ime_driver/test_ime_application.h
index 7f5edd7c53ec9c159bcc48c5a7168afa0268a3a0..f62c402756a7513b432dac93ae7a10878edce3fd 100644
--- a/services/ui/ime/test_ime_driver/test_ime_application.h
+++ b/services/ui/ime/test_ime_driver/test_ime_application.h
@@ -5,6 +5,7 @@
 #ifndef SERVICES_UI_IME_TEST_IME_DRIVER_TEST_IME_APPLICATION_H_
 #define SERVICES_UI_IME_TEST_IME_DRIVER_TEST_IME_APPLICATION_H_
 
+#include "base/macros.h"
 #include "services/service_manager/public/cpp/service.h"
 
 namespace ui {
@@ -17,9 +18,9 @@ class TestIMEApplication : public service_manager::Service {
 
  private:
   // service_manager::Service:
+  void OnStart(service_manager::ServiceContext* context) override;
   bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override;
-  void OnStart(const service_manager::ServiceInfo& info) override;
 
   DISALLOW_COPY_AND_ASSIGN(TestIMEApplication);
 };