Move services/shell to services/service_manager

services/service_manager/public/cpp/identity_struct_traits.h

 // Copyright 2016 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_PUBLIC_CPP_IDENTITY_STRUCT_TRAITS_H_
-#define SERVICES_SHELL_PUBLIC_CPP_IDENTITY_STRUCT_TRAITS_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_IDENTITY_STRUCT_TRAITS_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_IDENTITY_STRUCT_TRAITS_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 mojo {
 
 template <>
 struct StructTraits<shell::mojom::IdentityDataView, shell::Identity> {
   static const std::string& name(const shell::Identity& identity) {
     return identity.name();
   }
   static const std::string& user_id(const shell::Identity& identity) {
     return identity.user_id();
@@ skipping 12 matching lines @@
     if (!data.ReadInstance(&instance))
       return false;
 
     *out = shell::Identity(name, user_id, instance);
     return true;
   }
 };
 
 }  // namespace mojo
 
-#endif  // SERVICES_SHELL_PUBLIC_CPP_IDENTITY_STRUCT_TRAITS_H_
+#endif  // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_IDENTITY_STRUCT_TRAITS_H_