Service Manager: Rework Service and ServiceContext lifetime

chrome/app/mash/mash_runner.cc

 // Copyright 2016 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 "chrome/app/mash/mash_runner.h"
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
@@ skipping 114 matching lines @@
 void MashRunner::RunMain() {
   // TODO(sky): refactor BackgroundServiceManager so can supply own context, we
   // shouldn't we using context as it has a lot of stuff we don't really want
   // in chrome.
   NativeRunnerDelegateImpl native_runner_delegate;
   service_manager::BackgroundServiceManager background_service_manager;
   std::unique_ptr<service_manager::BackgroundServiceManager::InitParams>
       init_params(new service_manager::BackgroundServiceManager::InitParams);
   init_params->native_runner_delegate = &native_runner_delegate;
   background_service_manager.Init(std::move(init_params));
-  service_.reset(new mash::MashPackagedService);
-  service_->set_context(base::MakeUnique<service_manager::ServiceContext>(
-      service_.get(),
+  context_.reset(new service_manager::ServiceContext(
+      base::MakeUnique<mash::MashPackagedService>(),
       background_service_manager.CreateServiceRequest(kChromeMashServiceName)));
 
   // We need to send a sync messages to the Catalog, so we wait for a completed
   // connection first.
   std::unique_ptr<service_manager::Connection> catalog_connection =
-      service_->connector()->Connect("service:catalog");
+      context_->connector()->Connect("service:catalog");
   {
     base::RunLoop run_loop;
     catalog_connection->AddConnectionCompletedClosure(run_loop.QuitClosure());
     run_loop.Run();
   }
 
   // Synchronously override manifests needed for content process services.
   catalog::mojom::CatalogControlPtr catalog_control;
   catalog_connection->GetInterface(&catalog_control);
   CHECK(catalog_control->OverrideManifestPath(
       content::kBrowserServiceName,
       GetPackageManifestPath(kChromeMashContentBrowserPackageName)));
   CHECK(catalog_control->OverrideManifestPath(
       content::kGpuServiceName,
       GetPackageManifestPath(kChromeContentGpuPackageName)));
   CHECK(catalog_control->OverrideManifestPath(
       content::kRendererServiceName,
       GetPackageManifestPath(kChromeContentRendererPackageName)));
   CHECK(catalog_control->OverrideManifestPath(
       content::kUtilityServiceName,
       GetPackageManifestPath(kChromeContentUtilityPackageName)));
 
   // Ping mash_session to ensure an instance is brought up
-  service_->connector()->Connect("service:mash_session");
+  context_->connector()->Connect("service:mash_session");
   base::RunLoop().Run();
 }
 
 void MashRunner::RunChild() {
   base::i18n::InitializeICU();
   InitializeResources();
   service_manager::ChildProcessMainWithCallback(
       base::Bind(&MashRunner::StartChildApp, base::Unretained(this)));
 }
 
 void MashRunner::StartChildApp(
     service_manager::mojom::ServiceRequest service_request) {
   // TODO(sad): Normally, this would be a TYPE_DEFAULT message loop. However,
   // TYPE_UI is needed for mojo:ui. But it is not known whether the child app is
   // going to be mojo:ui at this point. So always create a TYPE_UI message loop
   // for now.
   base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
-  service_.reset(new mash::MashPackagedService);
-  service_->set_context(base::MakeUnique<service_manager::ServiceContext>(
-      service_.get(), std::move(service_request)));
+  context_.reset(new service_manager::ServiceContext(
+      base::MakeUnique<mash::MashPackagedService>(),
+      std::move(service_request)));
   base::RunLoop().Run();
 }
 
 int MashMain() {
 #if defined(OS_WIN)
   base::RouteStdioToConsole(false);
 #endif
   // TODO(sky): wire this up correctly.
   logging::LoggingSettings settings;
   settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
@@ skipping 17 matching lines @@
         tracing::GetConfigForTraceToConsole();
     base::trace_event::TraceLog::GetInstance()->SetEnabled(
         trace_config,
         base::trace_event::TraceLog::RECORDING_MODE);
   }
 
   MashRunner mash_runner;
   mash_runner.Run();
   return 0;
 }