Move shell service to toplevel shell namespace

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

Index: services/shell/public/cpp/lib/capabilities.cc
diff --git a/services/shell/public/cpp/lib/capabilities.cc b/services/shell/public/cpp/lib/capabilities.cc
index ab3c6a059e8bc06fd67888cb61a36af8bacc513f..51dcd0dbfee709c1d901816d693d71f25194e281 100644
--- a/services/shell/public/cpp/lib/capabilities.cc
+++ b/services/shell/public/cpp/lib/capabilities.cc
@@ -4,7 +4,7 @@
 
 #include "services/shell/public/cpp/capabilities.h"
 
-namespace mojo {
+namespace shell {
 
 CapabilityRequest::CapabilityRequest() {}
 CapabilityRequest::CapabilityRequest(const CapabilityRequest& other) = default;
@@ -32,10 +32,14 @@ bool CapabilitySpec::operator<(const CapabilitySpec& other) const {
       std::tie(other.provided, other.required);
 }
 
+}  // namespace shell
+
+namespace mojo {
+
 // static
 shell::mojom::CapabilitySpecPtr
-TypeConverter<shell::mojom::CapabilitySpecPtr, CapabilitySpec>::Convert(
-    const CapabilitySpec& input) {
+TypeConverter<shell::mojom::CapabilitySpecPtr, shell::CapabilitySpec>::Convert(
+    const shell::CapabilitySpec& input) {
   shell::mojom::CapabilitySpecPtr spec(shell::mojom::CapabilitySpec::New());
   spec->provided =
       mojo::Map<mojo::String, mojo::Array<mojo::String>>::From(input.provided);
@@ -46,21 +50,21 @@ TypeConverter<shell::mojom::CapabilitySpecPtr, CapabilitySpec>::Convert(
 }
 
 // static
-CapabilitySpec
-TypeConverter<CapabilitySpec, shell::mojom::CapabilitySpecPtr>::Convert(
+shell::CapabilitySpec
+TypeConverter<shell::CapabilitySpec, shell::mojom::CapabilitySpecPtr>::Convert(
     const shell::mojom::CapabilitySpecPtr& input) {
-  CapabilitySpec spec;
-  spec.provided = input->provided.To<std::map<Class, Interfaces>>();
+  shell::CapabilitySpec spec;
+  spec.provided =
+      input->provided.To<std::map<shell::Class, shell::Interfaces>>();
   spec.required =
-      input->required.To<std::map<Name, CapabilityRequest>>();
+      input->required.To<std::map<shell::Name, shell::CapabilityRequest>>();
   return spec;
 }
 
 // static
-shell::mojom::CapabilityRequestPtr
-TypeConverter<shell::mojom::CapabilityRequestPtr,
-              CapabilityRequest>::Convert(
-    const CapabilityRequest& input) {
+shell::mojom::CapabilityRequestPtr TypeConverter<
+    shell::mojom::CapabilityRequestPtr,
+    shell::CapabilityRequest>::Convert(const shell::CapabilityRequest& input) {
   shell::mojom::CapabilityRequestPtr request(
       shell::mojom::CapabilityRequest::New());
   request->classes = mojo::Array<mojo::String>::From(input.classes);
@@ -69,11 +73,10 @@ TypeConverter<shell::mojom::CapabilityRequestPtr,
 }
 
 // static
-CapabilityRequest
-TypeConverter<CapabilityRequest,
-              shell::mojom::CapabilityRequestPtr>::Convert(
-    const shell::mojom::CapabilityRequestPtr& input) {
-  CapabilityRequest request;
+shell::CapabilityRequest
+TypeConverter<shell::CapabilityRequest, shell::mojom::CapabilityRequestPtr>::
+    Convert(const shell::mojom::CapabilityRequestPtr& input) {
+  shell::CapabilityRequest request;
   request.classes = input->classes.To<std::set<std::string>>();
   request.interfaces = input->interfaces.To<std::set<std::string>>();
   return request;