Rename shell namespace to service_manager

services/catalog/instance.h

Index: services/catalog/instance.h
diff --git a/services/catalog/instance.h b/services/catalog/instance.h
index d7b5f73362fcffcfdf014fd9fea1039e8e68b005..e81f2d6792c8dfad3205dd0632d65ab1c36b4b5b 100644
--- a/services/catalog/instance.h
+++ b/services/catalog/instance.h
@@ -22,21 +22,21 @@ namespace catalog {
 class Reader;
 class Store;
 
-class Instance : public shell::mojom::Resolver,
+class Instance : public service_manager::mojom::Resolver,
                  public mojom::Catalog {
  public:
   // |manifest_provider| may be null.
   Instance(std::unique_ptr<Store> store, Reader* system_reader);
   ~Instance() override;
 
-  void BindResolver(shell::mojom::ResolverRequest request);
+  void BindResolver(service_manager::mojom::ResolverRequest request);
   void BindCatalog(mojom::CatalogRequest request);
 
   // Called when |cache| has been populated by a directory scan.
   void CacheReady(EntryCache* cache);
 
  private:
-  // shell::mojom::Resolver:
+  // service_manager::mojom::Resolver:
   void ResolveMojoName(const std::string& mojo_name,
                        const ResolveMojoNameCallback& callback) override;
 
@@ -62,12 +62,12 @@ class Instance : public shell::mojom::Resolver,
   static void OnReadManifest(base::WeakPtr<Instance> instance,
                              const std::string& mojo_name,
                              const ResolveMojoNameCallback& callback,
-                             shell::mojom::ResolveResultPtr result);
+                             service_manager::mojom::ResolveResultPtr result);
 
   // User-specific persistent storage of package manifests and other settings.
   std::unique_ptr<Store> store_;
 
-  mojo::BindingSet<shell::mojom::Resolver> resolver_bindings_;
+  mojo::BindingSet<service_manager::mojom::Resolver> resolver_bindings_;
   mojo::BindingSet<mojom::Catalog> catalog_bindings_;
 
   Reader* system_reader_;
@@ -79,7 +79,8 @@ class Instance : public shell::mojom::Resolver,
 
   // We only bind requests for these interfaces once the catalog has been
   // populated. These data structures queue requests until that happens.
-  std::vector<shell::mojom::ResolverRequest> pending_resolver_requests_;
+  std::vector<service_manager::mojom::ResolverRequest>
+      pending_resolver_requests_;
   std::vector<mojom::CatalogRequest> pending_catalog_requests_;
 
   base::WeakPtrFactory<Instance> weak_factory_;