Move services/shell to services/service_manager

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"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
 
 namespace {
 
 void LogAndCallServiceRestartCallback(const std::string& url,
                                       const base::Closure& callback) {
   LOG(ERROR) << "Restarting service: " << url;
   callback.Run();
 }
 
 }  // namespace
@@ skipping 109 matching lines @@
   // Note: |connection| may be null if we've lost our connection to the shell.
   if (connection) {
     connection->SetConnectionLostClosure(
         base::Bind(&LogAndCallServiceRestartCallback, url, restart_callback));
     connections_[url] = std::move(connection);
   }
 }
 
 }  // namespace session
 }  // namespace main