Move services/shell to services/service_manager

services/catalog/instance.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_INSTANCE_H_
 #define SERVICES_CATALOG_INSTANCE_H_
 
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "base/path_service.h"
 #include "base/values.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/catalog/entry.h"
 #include "services/catalog/public/interfaces/catalog.mojom.h"
 #include "services/catalog/store.h"
 #include "services/catalog/types.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/interfaces/resolver.mojom.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/interfaces/resolver.mojom.h"
 
 namespace catalog {
 
 class Reader;
 class Store;
 
 class Instance : public shell::mojom::Resolver,
                  public mojom::Catalog {
  public:
   // |manifest_provider| may be null.
@@ skipping 54 matching lines @@
   std::vector<mojom::CatalogRequest> pending_catalog_requests_;
 
   base::WeakPtrFactory<Instance> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Instance);
 };
 
 }  // namespace catalog
 
 #endif  // SERVICES_CATALOG_INSTANCE_H_