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

mojo/gles2/command_buffer_client_impl.cc

 // Copyright 2014 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 "mojo/gles2/command_buffer_client_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/process/process_handle.h"
 #include "base/threading/thread_restrictions.h"
 #include "components/mus/gles2/command_buffer_type_conversions.h"
 #include "components/mus/gles2/mojo_buffer_backing.h"
 #include "components/mus/gles2/mojo_gpu_memory_buffer.h"
 #include "gpu/command_buffer/client/gpu_control_client.h"
 #include "gpu/command_buffer/common/command_buffer_id.h"
 #include "gpu/command_buffer/common/gpu_memory_buffer_support.h"
 #include "gpu/command_buffer/common/sync_token.h"
-#include "mojo/platform_handle/platform_handle_functions.h"
+#include "mojo/public/cpp/system/platform_handle.h"
 
 namespace gles2 {
 
 namespace {
 
 bool CreateMapAndDupSharedBuffer(size_t size,
                                  void** memory,
                                  mojo::ScopedSharedBufferHandle* handle,
                                  mojo::ScopedSharedBufferHandle* duped) {
   MojoResult result = mojo::CreateSharedBuffer(NULL, size, handle);
@@ skipping 196 matching lines @@
   }
 
   base::SharedMemoryHandle dupd_handle =
       base::SharedMemory::DuplicateHandle(handle.handle);
 #if defined(OS_WIN)
   HANDLE platform_handle = dupd_handle.GetHandle();
 #else
   int platform_handle = dupd_handle.fd;
 #endif
 
-  MojoHandle mojo_handle = MOJO_HANDLE_INVALID;
-  MojoResult create_result = MojoCreatePlatformHandleWrapper(
-      platform_handle, &mojo_handle);
-  if (create_result != MOJO_RESULT_OK) {
-    NOTIMPLEMENTED();
-    return -1;
-  }
-  mojo::ScopedHandle scoped_handle;
-  scoped_handle.reset(mojo::Handle(mojo_handle));
+  mojo::ScopedHandle scoped_handle = mojo::WrapPlatformFile(platform_handle);
   command_buffer_->CreateImage(
       new_id, std::move(scoped_handle), handle.type, std::move(size),
       static_cast<int32_t>(gpu_memory_buffer->GetFormat()), internalformat);
   if (requires_sync_point) {
     NOTIMPLEMENTED();
     // TODO(jam): need to support this if we support types other than
     // SHARED_MEMORY_BUFFER.
     //gpu_memory_buffer_manager->SetDestructionSyncPoint(gpu_memory_buffer,
     //                                                   InsertSyncPoint());
   }
@@ skipping 125 matching lines @@
 
   // It is also safe to wait on the same context.
   if (sync_token->namespace_id() == gpu::CommandBufferNamespace::MOJO &&
       sync_token->command_buffer_id() == GetCommandBufferID())
     return true;
 
   return false;
 }
 
 }  // namespace gles2