Utilize new mojo::UnwrapPlatformFile function

chrome/gpu/gpu_arc_video_service.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 "chrome/gpu/gpu_arc_video_service.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/gpu/arc_gpu_video_decode_accelerator.h"
-#include "mojo/edk/embedder/embedder.h"
 #include "mojo/public/cpp/bindings/type_converter.h"
+#include "mojo/public/cpp/system/platform_handle.h"
 
 namespace {
 void OnConnectionError() {
   DVLOG(2) << "OnConnectionError";
 }
 }  // namespace
 
 namespace mojo {
 
 template <>
@@ skipping 121 matching lines @@
 
 base::ScopedFD GpuArcVideoService::UnwrapFdFromMojoHandle(
     mojo::ScopedHandle handle) {
   if (!handle.is_valid()) {
     LOG(ERROR) << "handle is invalid";
     client_->OnError(
         ::arc::mojom::VideoAcceleratorServiceClient::Error::INVALID_ARGUMENT);
     return base::ScopedFD();
   }
 
-  mojo::edk::ScopedPlatformHandle scoped_platform_handle;
-  MojoResult mojo_result = mojo::edk::PassWrappedPlatformHandle(
-      handle.release().value(), &scoped_platform_handle);
+  base::PlatformFile platform_file;
+  MojoResult mojo_result =
+      mojo::UnwrapPlatformFile(std::move(handle), &platform_file);
   if (mojo_result != MOJO_RESULT_OK) {
-    LOG(ERROR) << "PassWrappedPlatformHandle failed: " << mojo_result;
+    LOG(ERROR) << "UnwrapPlatformFile failed: " << mojo_result;
     client_->OnError(
         ::arc::mojom::VideoAcceleratorServiceClient::Error::PLATFORM_FAILURE);
     return base::ScopedFD();
   }
 
-  return base::ScopedFD(scoped_platform_handle.release().handle);
+  return base::ScopedFD(platform_file);
 }
 
 void GpuArcVideoService::BindSharedMemory(::arc::mojom::PortType port,
                                           uint32_t index,
                                           mojo::ScopedHandle ashmem_handle,
                                           uint32_t offset,
                                           uint32_t length) {
   DVLOG(2) << "BindSharedMemoryCallback port=" << port << ", index=" << index
            << ", offset=" << offset << ", length=" << length;
 
@@ skipping 35 matching lines @@
   accelerator_->Reset();
 }
 
 void GpuArcVideoService::Flush() {
   DVLOG(2) << "Flush";
   accelerator_->Flush();
 }
 
 }  // namespace arc
 }  // namespace chromeos