| Index: services/catalog/public/cpp/resource_loader.cc
|
| diff --git a/services/catalog/public/cpp/resource_loader.cc b/services/catalog/public/cpp/resource_loader.cc
|
| index 4eb8c63e2bab4c48718f649a99f2d62b5ba4fed4..c18a709e22c95d3f98e2f12d702ac220a80cb8c5 100644
|
| --- a/services/catalog/public/cpp/resource_loader.cc
|
| +++ b/services/catalog/public/cpp/resource_loader.cc
|
| @@ -16,18 +16,6 @@
|
|
|
| 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);
|
| - return base::File(platform_file);
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| ResourceLoader::ResourceLoader() {}
|
| ResourceLoader::~ResourceLoader() {}
|
|
|
| @@ -50,7 +38,7 @@ bool ResourceLoader::OpenFiles(filesystem::mojom::DirectoryPtr directory,
|
|
|
| for (const auto& result : results) {
|
| resource_map_[result->path].reset(
|
| - new base::File(GetFileFromHandle(std::move(result->file_handle))));
|
| + new base::File(std::move(result->file_handle)));
|
| }
|
| return true;
|
| }
|
|
|