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

components/filesystem/file_impl_unittest.cc

 // Copyright 2015 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 <stddef.h>
 #include <stdint.h>
 #include <utility>
 #include <vector>
 
 #include "base/files/file.h"
 #include "components/filesystem/files_test_base.h"
-#include "mojo/platform_handle/platform_handle_functions.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/type_converter.h"
+#include "mojo/public/cpp/system/platform_handle.h"
 #include "mojo/util/capture_util.h"
 
 using mojo::Capture;
 
 namespace filesystem {
 namespace {
 
 using FileImplTest = FilesTestBase;
 
 TEST_F(FileImplTest, CreateWriteCloseRenameOpenRead) {
@@ skipping 638 matching lines @@
     EXPECT_EQ(mojom::FileError::OK, error);
 
     // Fetch the handle
     error = mojom::FileError::FAILED;
     mojo::ScopedHandle handle;
     file1->AsHandle(Capture(&error, &handle));
     ASSERT_TRUE(file1.WaitForIncomingResponse());
     EXPECT_EQ(mojom::FileError::OK, error);
 
     // Pull a file descriptor out of the scoped handle.
-    MojoPlatformHandle platform_handle;
-    MojoResult extract_result =
-        MojoExtractPlatformHandle(handle.release().value(), &platform_handle);
-    EXPECT_EQ(MOJO_RESULT_OK, extract_result);
+    base::PlatformFile platform_file;
+    MojoResult unwrap_result = mojo::UnwrapPlatformFile(std::move(handle),
+                                                        &platform_file);
+    EXPECT_EQ(MOJO_RESULT_OK, unwrap_result);
 
     // Pass this raw file descriptor to a base::File.
-    base::File raw_file(platform_handle);
+    base::File raw_file(platform_file);
     ASSERT_TRUE(raw_file.IsValid());
     EXPECT_EQ(5, raw_file.WriteAtCurrentPos("hello", 5));
   }
 
   {
     // Reopen my_file.
     mojom::FilePtr file2;
     error = mojom::FileError::FAILED;
     directory->OpenFile("my_file", GetProxy(&file2),
                         mojom::kFlagRead | mojom::kFlagOpen, Capture(&error));
@@ skipping 106 matching lines @@
     // The file shouldn't be locked (and we check by trying to lock it).
     error = mojom::FileError::FAILED;
     file->Lock(Capture(&error));
     ASSERT_TRUE(file.WaitForIncomingResponse());
     EXPECT_EQ(mojom::FileError::OK, error);
   }
 }
 
 }  // namespace
 }  // namespace filesystem