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

components/font_service/public/cpp/font_service_thread.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 "components/font_service/public/cpp/font_service_thread.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/file.h"
 #include "base/synchronization/waitable_event.h"
 #include "components/font_service/public/cpp/mapped_font_file.h"
-#include "mojo/platform_handle/platform_handle_functions.h"
+#include "mojo/public/cpp/system/platform_handle.h"
 
 namespace font_service {
 namespace internal {
 
 namespace {
 const char kFontThreadName[] = "Font_Proxy_Thread";
 }  // namespace
 
 FontServiceThread::FontServiceThread(mojom::FontServicePtr font_service)
     : base::Thread(kFontThreadName),
@@ skipping 126 matching lines @@
   font_service_->OpenStream(
       id_number, base::Bind(&FontServiceThread::OnOpenStreamComplete, this,
                             done_event, output_file));
 }
 
 void FontServiceThread::OnOpenStreamComplete(base::WaitableEvent* done_event,
                                              base::File* output_file,
                                              mojo::ScopedHandle handle) {
   pending_waitable_events_.erase(done_event);
   if (handle.is_valid()) {
-    MojoPlatformHandle platform_handle;
-    CHECK(MojoExtractPlatformHandle(handle.release().value(),
-                                    &platform_handle) == MOJO_RESULT_OK);
-    *output_file = base::File(platform_handle);
+    base::PlatformFile platform_file;
+    CHECK_EQ(mojo::UnwrapPlatformFile(std::move(handle), &platform_file),
+             MOJO_RESULT_OK);
+    *output_file = base::File(platform_file);
   }
 
   done_event->Signal();
 }
 
 void FontServiceThread::OnFontServiceConnectionError() {
   std::set<base::WaitableEvent*> events;
   events.swap(pending_waitable_events_);
   for (base::WaitableEvent* event : events)
     event->Signal();
 }
 
 void FontServiceThread::Init() {
   font_service_.Bind(std::move(font_service_info_));
   font_service_.set_connection_error_handler(
       base::Bind(&FontServiceThread::OnFontServiceConnectionError,
                  weak_factory_.GetWeakPtr()));
 }
 
 void FontServiceThread::CleanUp() {
   font_service_.reset();
 }
 
 }  // namespace internal
 }  // namespace font_service