ShellConnection -> ServiceContext

services/shell/public/cpp/lib/shell_connection.cc

Index: services/shell/public/cpp/lib/shell_connection.cc
diff --git a/services/shell/public/cpp/lib/shell_connection.cc b/services/shell/public/cpp/lib/shell_connection.cc
deleted file mode 100644
index 173f6a3e8901ff474f3e11d3eefb6b3f135362e2..0000000000000000000000000000000000000000
--- a/services/shell/public/cpp/lib/shell_connection.cc
+++ /dev/null
@@ -1,129 +0,0 @@
-// 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/public/cpp/shell_connection.h"
-
-#include "base/bind.h"
-#include "base/logging.h"
-#include "base/message_loop/message_loop.h"
-#include "mojo/public/cpp/bindings/interface_ptr.h"
-#include "mojo/public/cpp/bindings/interface_request.h"
-#include "services/shell/public/cpp/capabilities.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/lib/connection_impl.h"
-#include "services/shell/public/cpp/lib/connector_impl.h"
-#include "services/shell/public/cpp/service.h"
-
-namespace shell {
-
-////////////////////////////////////////////////////////////////////////////////
-// ShellConnection, public:
-
-ShellConnection::ShellConnection(shell::Service* client,
-                                 mojom::ServiceRequest request)
-    : client_(client), binding_(this) {
-  mojom::ConnectorPtr connector;
-  pending_connector_request_ = GetProxy(&connector);
-  connector_.reset(new ConnectorImpl(std::move(connector)));
-
-  DCHECK(request.is_pending());
-  binding_.Bind(std::move(request));
-}
-
-ShellConnection::~ShellConnection() {}
-
-void ShellConnection::set_initialize_handler(const base::Closure& callback) {
-  initialize_handler_ = callback;
-}
-
-void ShellConnection::SetAppTestConnectorForTesting(
-    mojom::ConnectorPtr connector) {
-  pending_connector_request_ = nullptr;
-  connector_.reset(new ConnectorImpl(std::move(connector)));
-}
-
-void ShellConnection::SetConnectionLostClosure(const base::Closure& closure) {
-  connection_lost_closure_ = closure;
-  if (should_run_connection_lost_closure_ &&
-      !connection_lost_closure_.is_null())
-    connection_lost_closure_.Run();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// ShellConnection, mojom::Service implementation:
-
-void ShellConnection::OnStart(mojom::IdentityPtr identity,
-                              uint32_t id,
-                              const OnStartCallback& callback) {
-  identity_ = identity.To<Identity>();
-  if (!initialize_handler_.is_null())
-    initialize_handler_.Run();
-
-  callback.Run(std::move(pending_connector_request_));
-
-  DCHECK(binding_.is_bound());
-  binding_.set_connection_error_handler(
-      base::Bind(&ShellConnection::OnConnectionError, base::Unretained(this)));
-
-  client_->OnStart(connector_.get(), identity_, id);
-}
-
-void ShellConnection::OnConnect(
-    mojom::IdentityPtr source,
-    uint32_t source_id,
-    mojom::InterfaceProviderRequest local_interfaces,
-    mojom::InterfaceProviderPtr remote_interfaces,
-    mojom::CapabilityRequestPtr allowed_capabilities,
-    const mojo::String& name) {
-  std::unique_ptr<internal::ConnectionImpl> registry(
-      new internal::ConnectionImpl(name, source.To<Identity>(), source_id,
-                                   allowed_capabilities.To<CapabilityRequest>(),
-                                   Connection::State::CONNECTED));
-
-  InterfaceRegistry* exposed_interfaces =
-      client_->GetInterfaceRegistryForConnection();
-  if (exposed_interfaces) {
-    exposed_interfaces->Bind(std::move(local_interfaces));
-    registry->set_exposed_interfaces(exposed_interfaces);
-  } else {
-    std::unique_ptr<InterfaceRegistry> interfaces(
-        new InterfaceRegistry(registry.get()));
-    interfaces->Bind(std::move(local_interfaces));
-    registry->SetExposedInterfaces(std::move(interfaces));
-  }
-  shell::InterfaceProvider* remote_interface_provider =
-    client_->GetInterfaceProviderForConnection();
-  if (remote_interface_provider) {
-    remote_interface_provider->Bind(std::move(remote_interfaces));
-    registry->set_remote_interfaces(remote_interface_provider);
-  } else {
-    std::unique_ptr<InterfaceProvider> interfaces(new InterfaceProvider);
-    interfaces->Bind(std::move(remote_interfaces));
-    registry->SetRemoteInterfaces(std::move(interfaces));
-  }
-
-  if (!client_->OnConnect(registry.get()))
-    return;
-
-  // TODO(beng): it appears we never prune this list. We should, when the
-  //             connection's remote service provider pipe breaks.
-  incoming_connections_.push_back(std::move(registry));
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// ShellConnection, private:
-
-void ShellConnection::OnConnectionError() {
-  // Note that the Service doesn't technically have to quit now, it may live
-  // on to service existing connections. All existing Connectors however are
-  // invalid.
-  should_run_connection_lost_closure_ = client_->OnStop();
-  if (should_run_connection_lost_closure_ &&
-      !connection_lost_closure_.is_null())
-    connection_lost_closure_.Run();
-  // We don't reset the connector as clients may have taken a raw pointer to it.
-  // Connect() will return nullptr if they try to connect to anything.
-}
-
-}  // namespace shell