Move shell service to toplevel shell namespace

services/shell/public/cpp/lib/identity.cc

 // 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.
 
 #include "services/shell/public/cpp/identity.h"
 
 #include "base/guid.h"
 #include "services/shell/public/cpp/names.h"
 
-namespace mojo {
+namespace shell {
 
 Identity::Identity() {}
 
 Identity::Identity(const std::string& name, const std::string& user_id)
     : Identity(name, user_id, "") {}
 
 Identity::Identity(const std::string& name, const std::string& user_id,
                    const std::string& instance)
     : name_(name),
       user_id_(user_id),
@@ skipping 12 matching lines @@
   if (instance_ != other.instance_)
     return instance_ < other.instance_;
   return user_id_ < other.user_id_;
 }
 
 bool Identity::operator==(const Identity& other) const {
   return other.name_ == name_ && other.instance_ == instance_ &&
          other.user_id_ == user_id_;
 }
 
+}  // namespace shell
+
+namespace mojo {
+
 // static
 shell::mojom::IdentityPtr
-    TypeConverter<shell::mojom::IdentityPtr, Identity>::Convert(
-        const Identity& input) {
+TypeConverter<shell::mojom::IdentityPtr, shell::Identity>::Convert(
+    const shell::Identity& input) {
   shell::mojom::IdentityPtr identity(shell::mojom::Identity::New());
   identity->name = input.name();
   identity->user_id = input.user_id();
   identity->instance = input.instance();
   return identity;
 }
 
 // static
-Identity TypeConverter<Identity, shell::mojom::IdentityPtr>::Convert(
+shell::Identity
+TypeConverter<shell::Identity, shell::mojom::IdentityPtr>::Convert(
     const shell::mojom::IdentityPtr& input) {
-  return Identity(input->name, input->user_id, input->instance);
+  return shell::Identity(input->name, input->user_id, input->instance);
 }
 
 }  // namespace mojo