Move services/shell to services/service_manager

services/service_manager/connect_util.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 SERVICES_SHELL_CONNECT_UTIL_H_
-#define SERVICES_SHELL_CONNECT_UTIL_H_
+#ifndef SERVICES_SERVICE_MANAGER_CONNECT_UTIL_H_
+#define SERVICES_SERVICE_MANAGER_CONNECT_UTIL_H_
 
 #include "mojo/public/cpp/bindings/interface_ptr.h"
 #include "mojo/public/cpp/system/handle.h"
-#include "services/shell/public/cpp/identity.h"
-#include "services/shell/public/interfaces/connector.mojom.h"
+#include "services/service_manager/public/cpp/identity.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
 
 namespace shell {
 
 class ServiceManager;
 
 mojo::ScopedMessagePipeHandle ConnectToInterfaceByName(
     ServiceManager* service_manager,
     const Identity& source,
     const Identity& target,
     const std::string& interface_name);
@@ skipping 17 matching lines @@
                                const std::string& name,
                                mojo::InterfacePtr<Interface>* ptr) {
   mojo::ScopedMessagePipeHandle service_handle = ConnectToInterfaceByName(
       service_manager, source, Identity(name, mojom::kInheritUserID),
       Interface::Name_);
   ptr->Bind(mojo::InterfacePtrInfo<Interface>(std::move(service_handle), 0u));
 }
 
 }  // namespace shell
 
-#endif  // SERVICES_SHELL_CONNECT_UTIL_H_
+#endif  // SERVICES_SERVICE_MANAGER_CONNECT_UTIL_H_