Move shell service to toplevel shell namespace

services/shell/public/cpp/lib/connection_impl.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/public/cpp/lib/connection_impl.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "services/shell/public/cpp/connection.h"
 #include "services/shell/public/cpp/interface_binder.h"
 
-namespace mojo {
+namespace shell {
 namespace internal {
 
 ////////////////////////////////////////////////////////////////////////////////
 // ConnectionImpl, public:
 
 ConnectionImpl::ConnectionImpl(
     const std::string& connection_name,
     const Identity& remote,
     uint32_t remote_id,
     shell::mojom::InterfaceProviderPtr remote_interfaces,
@@ skipping 31 matching lines @@
 }
 
 const std::string& ConnectionImpl::GetConnectionName() {
   return connection_name_;
 }
 
 const Identity& ConnectionImpl::GetRemoteIdentity() const {
   return remote_;
 }
 
-void ConnectionImpl::SetConnectionLostClosure(const Closure& handler) {
+void ConnectionImpl::SetConnectionLostClosure(const mojo::Closure& handler) {
   remote_interfaces_.set_connection_error_handler(handler);
 }
 
 shell::mojom::ConnectResult ConnectionImpl::GetResult() const {
   return result_;
 }
 
 bool ConnectionImpl::IsPending() const {
   return state_ == State::PENDING;
 }
 
 uint32_t ConnectionImpl::GetRemoteInstanceID() const {
   return remote_id_;
 }
 
-void ConnectionImpl::AddConnectionCompletedClosure(const Closure& callback) {
+void ConnectionImpl::AddConnectionCompletedClosure(
+    const mojo::Closure& callback) {
   if (IsPending())
     connection_completed_callbacks_.push_back(callback);
   else
     callback.Run();
 }
 
 bool ConnectionImpl::AllowsInterface(const std::string& interface_name) const {
   return allow_all_interfaces_ ||
          capability_request_.interfaces.count(interface_name);
 }
@@ skipping 16 matching lines @@
 void ConnectionImpl::OnConnectionCompleted(shell::mojom::ConnectResult result,
                                            const std::string& target_user_id,
                                            uint32_t target_application_id) {
   DCHECK(State::PENDING == state_);
 
   result_ = result;
   state_ = result_ == shell::mojom::ConnectResult::SUCCEEDED ?
       State::CONNECTED : State::DISCONNECTED;
   remote_id_ = target_application_id;
   remote_.set_user_id(target_user_id);
-  std::vector<Closure> callbacks;
+  std::vector<mojo::Closure> callbacks;
   callbacks.swap(connection_completed_callbacks_);
   for (auto callback : callbacks)
     callback.Run();
 }
 
 }  // namespace internal
-}  // namespace mojo
+}  // namespace shell