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

components/font_service/font_service_app.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/font_service_app.h"
 
 #include <utility>
 
 #include "base/files/file.h"
 #include "base/files/file_path.h"
-#include "mojo/platform_handle/platform_handle_functions.h"
+#include "mojo/public/cpp/system/platform_handle.h"
 #include "services/shell/public/cpp/connection.h"
 
 static_assert(
     static_cast<uint32_t>(SkFontStyle::kUpright_Slant) ==
         static_cast<uint32_t>(font_service::mojom::TypefaceSlant::ROMAN),
     "Skia and font service flags must match");
 static_assert(
     static_cast<uint32_t>(SkFontStyle::kItalic_Slant) ==
         static_cast<uint32_t>(font_service::mojom::TypefaceSlant::ITALIC),
     "Skia and font service flags must match");
 static_assert(
     static_cast<uint32_t>(SkFontStyle::kOblique_Slant) ==
         static_cast<uint32_t>(font_service::mojom::TypefaceSlant::OBLIQUE),
     "Skia and font service flags must match");
 
 namespace {
 
 mojo::ScopedHandle GetHandleForPath(const base::FilePath& path) {
   if (path.empty())
     return mojo::ScopedHandle();
 
   mojo::ScopedHandle to_pass;
   base::File file(path, base::File::FLAG_OPEN | base::File::FLAG_READ);
   if (!file.IsValid()) {
     LOG(WARNING) << "file not valid, path=" << path.value();
     return mojo::ScopedHandle();
   }
 
-  MojoHandle mojo_handle;
-  MojoResult create_result =
-      MojoCreatePlatformHandleWrapper(file.TakePlatformFile(), &mojo_handle);
-  if (create_result != MOJO_RESULT_OK) {
-    LOG(WARNING) << "unable to create wrapper, path=" << path.value()
-                 << "result=" << create_result;
-    return mojo::ScopedHandle();
-  }
-
-  return mojo::ScopedHandle(mojo::Handle(mojo_handle));
+  return mojo::WrapPlatformFile(file.TakePlatformFile());
 }
 
 }  // namespace
 
 namespace font_service {
 
 FontServiceApp::FontServiceApp() {}
 
 FontServiceApp::~FontServiceApp() {}
 
@@ skipping 69 matching lines @@
   int count = paths_.size();
   for (int i = 0; i < count; ++i) {
     if (path == paths_[i])
       return i;
   }
   paths_.emplace_back(path);
   return count;
 }
 
 }  // namespace font_service