Service Manager: Rework Service and ServiceContext lifetime

chrome/app/mash/mash_runner.h

Index: chrome/app/mash/mash_runner.h
diff --git a/chrome/app/mash/mash_runner.h b/chrome/app/mash/mash_runner.h
index ac1a13cf45bd79171dd203f65f127e17c53ccd33..70296f8bd53ccdad27df2c0a96840fa8a7d83d69 100644
--- a/chrome/app/mash/mash_runner.h
+++ b/chrome/app/mash/mash_runner.h
@@ -11,7 +11,7 @@
 #include "services/service_manager/public/interfaces/service.mojom.h"
 
 namespace service_manager {
-class Service;
+class ServiceContext;
 }
 
 // Responsible for running mash, both child and main processes.
@@ -28,7 +28,7 @@ class MashRunner {
 
   void StartChildApp(service_manager::mojom::ServiceRequest service_request);
 
-  std::unique_ptr<service_manager::Service> service_;
+  std::unique_ptr<service_manager::ServiceContext> context_;
 
   DISALLOW_COPY_AND_ASSIGN(MashRunner);
 };