ShellConnection -> ServiceContext

content/common/mojo/mojo_shell_connection_impl.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 "content/common/mojo/mojo_shell_connection_impl.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_local.h"
 #include "content/common/mojo/embedded_application_runner.h"
 #include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/shell_connection.h"
+#include "services/shell/public/cpp/service_context.h"
 #include "services/shell/runner/common/client_util.h"
 
 namespace content {
 namespace {
 
 using MojoShellConnectionPtr =
     base::ThreadLocalPointer<MojoShellConnection>;
 
 // Env is thread local so that aura may be used on multiple threads.
 base::LazyInstance<MojoShellConnectionPtr>::Leaky lazy_tls_ptr =
@@ skipping 39 matching lines @@
   return base::WrapUnique(new MojoShellConnectionImpl(std::move(request)));
 }
 
 MojoShellConnection::~MojoShellConnection() {}
 
 ////////////////////////////////////////////////////////////////////////////////
 // MojoShellConnectionImpl, public:
 
 MojoShellConnectionImpl::MojoShellConnectionImpl(
     shell::mojom::ServiceRequest request)
-    : shell_connection_(new shell::ShellConnection(this, std::move(request))) {}
+    : shell_connection_(new shell::ServiceContext(this, std::move(request))) {}
 
 MojoShellConnectionImpl::~MojoShellConnectionImpl() {}
 
 ////////////////////////////////////////////////////////////////////////////////
 // MojoShellConnectionImpl, shell::Service implementation:
 
 void MojoShellConnectionImpl::OnStart(shell::Connector* connector,
                                       const shell::Identity& identity,
                                       uint32_t id) {
   for (auto& client : embedded_services_)
@@ skipping 59 matching lines @@
     shell::mojom::ServiceRequest request,
     const mojo::String& name) {
   auto it = request_handlers_.find(name);
   if (it != request_handlers_.end())
     it->second.Run(std::move(request));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // MojoShellConnectionImpl, MojoShellConnection implementation:
 
-shell::ShellConnection* MojoShellConnectionImpl::GetShellConnection() {
+shell::ServiceContext* MojoShellConnectionImpl::GetShellConnection() {
   return shell_connection_.get();
 }
 
 shell::Connector* MojoShellConnectionImpl::GetConnector() {
   DCHECK(shell_connection_);
   return shell_connection_->connector();
 }
 
 const shell::Identity& MojoShellConnectionImpl::GetIdentity() const {
   DCHECK(shell_connection_);
@@ skipping 29 matching lines @@
 }
 
 void MojoShellConnectionImpl::AddServiceRequestHandler(
     const std::string& name,
     const ServiceRequestHandler& handler) {
   auto result = request_handlers_.insert(std::make_pair(name, handler));
   DCHECK(result.second);
 }
 
 }  // namespace content