Rename shell namespace to service_manager

services/catalog/reader.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_READER_H_
 #define SERVICES_CATALOG_READER_H_
 
 #include <map>
 #include <memory>
 #include <string>
@@ skipping 13 matching lines @@
 namespace catalog {
 
 class Entry;
 class ManifestProvider;
 
 // Responsible for loading manifests & building the Entry data structures.
 class Reader {
  public:
   using ReadManifestCallback = base::Callback<void(std::unique_ptr<Entry>)>;
   using CreateEntryForNameCallback =
-      base::Callback<void(shell::mojom::ResolveResultPtr)>;
+      base::Callback<void(service_manager::mojom::ResolveResultPtr)>;
 
   Reader(base::SequencedWorkerPool* worker_pool,
          ManifestProvider* manifest_provider);
   Reader(base::SingleThreadTaskRunner* task_runner,
          ManifestProvider* manifest_provider);
   ~Reader();
 
   // Scans the contents of |package_dir|, reading all application manifests and
   // populating |cache|. Runs |read_complete_closure| when done.
   void Read(const base::FilePath& package_dir,
@@ skipping 28 matching lines @@
   std::map<std::string, std::string> package_name_overrides_;
   std::map<std::string, base::FilePath> manifest_path_overrides_;
   base::WeakPtrFactory<Reader> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Reader);
 };
 
 }  // namespace catalog
 
 #endif  // SERVICES_CATALOG_READER_H_