Replace base::File wrapping with typemapping.

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"
@@ skipping 10 matching lines @@
     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) {
+base::File GetFileForPath(const base::FilePath& path) {
   if (path.empty())
-    return mojo::ScopedHandle();
+    return base::File();
 
-  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();
-  }
-
-  return mojo::WrapPlatformFile(file.TakePlatformFile());
+  LOG_IF(WARNING, !file.IsValid()) << "file not valid, path=" << path.value();
+  return file;
 }
 
 }  // namespace
 
 namespace font_service {
 
 FontServiceApp::FontServiceApp() {}
 
 FontServiceApp::~FontServiceApp() {}
 
@@ skipping 49 matching lines @@
   mojom::TypefaceStylePtr style(mojom::TypefaceStyle::New());
   style->weight = result_style.weight();
   style->width = result_style.width();
   style->slant = static_cast<mojom::TypefaceSlant>(result_style.slant());
 
   callback.Run(std::move(identity), result_family.c_str(), std::move(style));
 }
 
 void FontServiceApp::OpenStream(uint32_t id_number,
                                 const OpenStreamCallback& callback) {
-  mojo::ScopedHandle handle;
+  base::File file;
   if (id_number < static_cast<uint32_t>(paths_.size())) {
-    handle = GetHandleForPath(base::FilePath(paths_[id_number].c_str()));
+    file = GetFileForPath(base::FilePath(paths_[id_number].c_str()));
   }
 
-  callback.Run(std::move(handle));
+  callback.Run(std::move(file));
 }
 
 int FontServiceApp::FindOrAddPath(const SkString& path) {
   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