Replace remaining shell references with service manager

services/catalog/catalog.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_CATALOG_CATALOG_H_
 #define SERVICES_CATALOG_CATALOG_H_
 
 #include <map>
 #include <memory>
 #include <string>
@@ skipping 23 matching lines @@
 }
 
 namespace catalog {
 
 class Instance;
 class ManifestProvider;
 class Reader;
 class Store;
 
 // Creates and owns an instance of the catalog. Exposes a ServicePtr that
-// can be passed to the Shell, potentially in a different process.
+// can be passed to the service manager, potentially in a different process.
 class Catalog
     : public service_manager::Service,
       public service_manager::InterfaceFactory<mojom::Catalog>,
       public service_manager::InterfaceFactory<filesystem::mojom::Directory>,
       public service_manager::InterfaceFactory<
           service_manager::mojom::Resolver>,
       public service_manager::InterfaceFactory<mojom::CatalogControl>,
       public mojom::CatalogControl {
  public:
   // |manifest_provider| may be null.
@@ skipping 65 matching lines @@
   mojo::BindingSet<mojom::CatalogControl> control_bindings_;
 
   base::WeakPtrFactory<Catalog> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Catalog);
 };
 
 }  // namespace catalog
 
 #endif  // SERVICES_CATALOG_CATALOG_H_