ShellConnection -> ServiceContext

services/shell/service_manager.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/shell/service_manager.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/process/process.h"
 #include "base/process/process_handle.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/trace_event/trace_event.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/shell/connect_util.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/names.h"
-#include "services/shell/public/cpp/shell_connection.h"
+#include "services/shell/public/cpp/service_context.h"
 #include "services/shell/public/interfaces/connector.mojom.h"
 #include "services/shell/public/interfaces/service.mojom.h"
 #include "services/shell/public/interfaces/service_manager.mojom.h"
 
 namespace shell {
 
 namespace {
 
 const char kCatalogName[] = "mojo:catalog";
 const char kServiceManagerName[] = "mojo:shell";
@@ skipping 453 matching lines @@
     std::unique_ptr<NativeRunnerFactory> native_runner_factory,
     mojom::ServicePtr catalog)
     : native_runner_factory_(std::move(native_runner_factory)),
       weak_ptr_factory_(this) {
   mojom::ServicePtr service;
   mojom::ServiceRequest request = mojo::GetProxy(&service);
   Instance* instance = CreateInstance(
       Identity(), CreateServiceManagerIdentity(), GetPermissiveCapabilities());
   instance->StartWithService(std::move(service));
   singletons_.insert(kServiceManagerName);
-  shell_connection_.reset(new ShellConnection(this, std::move(request)));
+  service_context_.reset(new ServiceContext(this, std::move(request)));
 
   if (catalog)
     InitCatalog(std::move(catalog));
 }
 
 ServiceManager::~ServiceManager() {
   TerminateServiceManagerConnections();
   // Terminate any remaining instances.
   while (!identity_to_instance_.empty())
     OnInstanceError(identity_to_instance_.begin()->second);
@@ skipping 287 matching lines @@
   // Now that the instance has a Service, we can connect to it.
   bool connected = instance->ConnectToService(&params);
   DCHECK(connected);
 }
 
 base::WeakPtr<ServiceManager> ServiceManager::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 }  // namespace shell