Move shell service to toplevel shell namespace

mash/session/session.cc

 // Copyright 2015 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 "mash/session/session.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "mash/login/public/interfaces/login.mojom.h"
 #include "services/shell/public/cpp/connection.h"
 #include "services/shell/public/cpp/connector.h"
 
 namespace {
 
 void LogAndCallServiceRestartCallback(const std::string& url,
                                       const base::Closure& callback) {
   LOG(ERROR) << "Restarting service: " << url;
   callback.Run();
 }
 
 }  // namespace
 
 namespace mash {
 namespace session {
 
 Session::Session() : connector_(nullptr), screen_locked_(false) {}
 Session::~Session() {}
 
-void Session::Initialize(mojo::Connector* connector,
-                         const mojo::Identity& identity,
+void Session::Initialize(shell::Connector* connector,
+                         const shell::Identity& identity,
                          uint32_t id) {
   connector_ = connector;
   StartBrowserDriver();
   StartWindowManager();
   StartSystemUI();
   StartQuickLaunch();
 }
 
-bool Session::AcceptConnection(mojo::Connection* connection) {
+bool Session::AcceptConnection(shell::Connection* connection) {
   connection->AddInterface<mojom::Session>(this);
   return true;
 }
 
 void Session::Logout() {
   // TODO(beng): Notify connected listeners that login is happening, potentially
   // give them the option to stop it.
   mash::login::mojom::LoginPtr login;
   connector_->ConnectToInterface("mojo:login", &login);
   login->ShowLoginUI();
@@ skipping 27 matching lines @@
   if (!screen_locked_)
     return;
   screen_locked_ = false;
   screenlock_listeners_.ForAllPtrs(
       [](mojom::ScreenlockStateListener* listener) {
         listener->ScreenlockStateChanged(false);
       });
   StopScreenlock();
 }
 
-void Session::Create(mojo::Connection* connection,
+void Session::Create(shell::Connection* connection,
                      mojom::SessionRequest request) {
   bindings_.AddBinding(this, std::move(request));
 }
 
 void Session::StartWindowManager() {
   StartRestartableService(
       "mojo:desktop_wm",
       base::Bind(&Session::StartWindowManager,
                  base::Unretained(this)));
 }
@@ skipping 29 matching lines @@
   auto connection = connections_.find("mojo:screenlock");
   DCHECK(connections_.end() != connection);
   connections_.erase(connection);
 }
 
 void Session::StartRestartableService(
     const std::string& url,
     const base::Closure& restart_callback) {
   // TODO(beng): This would be the place to insert logic that counted restarts
   //             to avoid infinite crash-restart loops.
-  std::unique_ptr<mojo::Connection> connection = connector_->Connect(url);
+  std::unique_ptr<shell::Connection> connection = connector_->Connect(url);
   // Note: |connection| may be null if we've lost our connection to the shell.
   if (connection) {
     connection->SetConnectionLostClosure(
         base::Bind(&LogAndCallServiceRestartCallback, url, restart_callback));
     connection->AddInterface<mojom::Session>(this);
     connections_[url] = std::move(connection);
   }
 }
 
 }  // namespace session
 }  // namespace main