[mojo-edk] Expose portable API for platform handle wrapping

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/platform_handle/platform_handle_functions.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"
 
 namespace catalog {
+
 namespace {
+
 base::File GetFileFromHandle(mojo::ScopedHandle handle) {
   CHECK(handle.is_valid());
-  MojoPlatformHandle platform_handle;
-  CHECK(MojoExtractPlatformHandle(handle.release().value(),
-                                  &platform_handle) == MOJO_RESULT_OK);
-  return base::File(platform_handle);
+  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() {}
 
 bool ResourceLoader::OpenFiles(filesystem::mojom::DirectoryPtr directory,
                                const std::set<std::string>& paths) {
   mojo::Array<filesystem::mojom::FileOpenDetailsPtr> details(
       mojo::Array<filesystem::mojom::FileOpenDetailsPtr>::New(paths.size()));
   size_t i = 0;
   for (const auto& path : paths) {
@@ skipping 17 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