Move services/shell to services/service_manager

services/catalog/public/cpp/resource_loader.cc

 // 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.
 
 #include "services/catalog/public/cpp/resource_loader.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/file.h"
 #include "components/filesystem/public/interfaces/directory.mojom.h"
 #include "mojo/public/cpp/system/platform_handle.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/interfaces/interface_provider.mojom.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/interfaces/interface_provider.mojom.h"
 
 namespace catalog {
 
 namespace {
 
 base::File GetFileFromHandle(mojo::ScopedHandle handle) {
   CHECK(handle.is_valid());
   base::PlatformFile platform_file;
   CHECK_EQ(mojo::UnwrapPlatformFile(std::move(handle), &platform_file),
            MOJO_RESULT_OK);
@@ skipping 31 matching lines @@
   return true;
 }
 
 base::File ResourceLoader::TakeFile(const std::string& path) {
   std::unique_ptr<base::File> file_wrapper(std::move(resource_map_[path]));
   resource_map_.erase(path);
   return std::move(*file_wrapper);
 }
 
 }  // namespace catalog