Service Manager: Rework Service and ServiceContext lifetime

services/service_manager/public/cpp/lib/service_runner.cc

 // Copyright 2014 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 "services/service_manager/public/cpp/service_runner.h"
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 19 matching lines @@
 }
 
 void ServiceRunner::set_message_loop_type(base::MessageLoop::Type type) {
   DCHECK_NE(base::MessageLoop::TYPE_CUSTOM, type);
   DCHECK(!has_run_);
 
   message_loop_type_ = type;
 }
 
 MojoResult ServiceRunner::Run(MojoHandle service_request_handle,
-                                  bool init_base) {
+                              bool init_base) {
   DCHECK(!has_run_);
   has_run_ = true;
 
   std::unique_ptr<base::AtExitManager> at_exit;
   if (init_base) {
     InitBaseCommandLine();
     at_exit.reset(new base::AtExitManager);
   }
 
   {
     std::unique_ptr<base::MessageLoop> loop;
     loop.reset(new base::MessageLoop(message_loop_type_));
 
-    std::unique_ptr<ServiceContext> context(new ServiceContext(
-        service_.get(),
+    context_.reset(new ServiceContext(
+        std::move(service_),
         mojo::MakeRequest<mojom::Service>(mojo::MakeScopedHandle(
             mojo::MessagePipeHandle(service_request_handle)))));
     base::RunLoop run_loop;
-    context->SetConnectionLostClosure(run_loop.QuitClosure());
-    service_->set_context(std::move(context));
+    context_->SetConnectionLostClosure(run_loop.QuitClosure());
     run_loop.Run();
     // It's very common for the service to cache the app and terminate on
     // errors. If we don't delete the service before the app we run the risk of
     // the service having a stale reference to the app and trying to use it.
     // Note that we destruct the message loop first because that might trigger
     // connection error handlers and they might access objects created by the
     // service.
     loop.reset();
-    service_.reset();
+    context_.reset();
   }
   return MOJO_RESULT_OK;
 }
 
 MojoResult ServiceRunner::Run(MojoHandle service_request_handle) {
   bool init_base = true;
   if (base::CommandLine::InitializedForCurrentProcess()) {
     init_base =
         !base::CommandLine::ForCurrentProcess()->HasSwitch("single-process");
   }
   return Run(service_request_handle, init_base);
 }
 
-void ServiceRunner::DestroyServiceContext() {
-  service_->set_context(std::unique_ptr<ServiceContext>());
-}
-
 void ServiceRunner::Quit() {
   base::MessageLoop::current()->QuitWhenIdle();
 }
 
 }  // namespace service_manager