Service Manager: Rework Service and ServiceContext lifetime

services/ui/demo/mus_demo.cc

Index: services/ui/demo/mus_demo.cc
diff --git a/services/ui/demo/mus_demo.cc b/services/ui/demo/mus_demo.cc
index d151d9d0b64cb0e00acb908f0d52c4abcfaa25b4..5190e90f32c038038ae9855e935fe025aa766f05 100644
--- a/services/ui/demo/mus_demo.cc
+++ b/services/ui/demo/mus_demo.cc
@@ -7,6 +7,7 @@
 #include "base/memory/ptr_util.h"
 #include "base/time/time.h"
 #include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/service_context.h"
 #include "services/ui/demo/bitmap_uploader.h"
 #include "services/ui/public/cpp/gpu_service.h"
 #include "services/ui/public/cpp/window.h"
@@ -63,10 +64,10 @@ MusDemo::MusDemo() {}
 
 MusDemo::~MusDemo() {}
 
-void MusDemo::OnStart(const service_manager::ServiceInfo& info) {
-  gpu_service_ = GpuService::Create(connector());
+void MusDemo::OnStart(service_manager::ServiceContext* context) {
+  gpu_service_ = GpuService::Create(context->connector());
   window_tree_client_ = base::MakeUnique<WindowTreeClient>(this, this);
-  window_tree_client_->ConnectAsWindowManager(connector());
+  window_tree_client_->ConnectAsWindowManager(context->connector());
 }
 
 bool MusDemo::OnConnect(const service_manager::ServiceInfo& remote_info,