Move services/shell to services/service_manager

mash/session/session.h

 // 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.
 
 #ifndef MASH_SESSION_SESSION_H_
 #define MASH_SESSION_SESSION_H_
 
 #include <map>
 #include <memory>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "mash/session/public/interfaces/session.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/bindings/interface_ptr_set.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/service.h"
 
 namespace mojo {
 class Connection;
 }
 
 namespace mash {
 namespace session {
 
 class Session : public shell::Service,
                 public mojom::Session,
@@ skipping 37 matching lines @@
   mojo::BindingSet<mojom::Session> bindings_;
   mojo::InterfacePtrSet<mojom::ScreenlockStateListener> screenlock_listeners_;
 
   DISALLOW_COPY_AND_ASSIGN(Session);
 };
 
 }  // namespace session
 }  // namespace mash
 
 #endif  // MASH_SESSION_SESSION_H_