Index: chrome/gpu/gpu_arc_video_service.cc |
diff --git a/chrome/gpu/gpu_arc_video_service.cc b/chrome/gpu/gpu_arc_video_service.cc |
index 3c0c7536aac1b4700ac7208187844ad3dc31d08b..cf0f28aea91f8899ef348b0adba8973ebab865b9 100644 |
--- a/chrome/gpu/gpu_arc_video_service.cc |
+++ b/chrome/gpu/gpu_arc_video_service.cc |
@@ -10,8 +10,8 @@ |
#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() { |
@@ -153,9 +153,9 @@ base::ScopedFD GpuArcVideoService::UnwrapFdFromMojoHandle( |
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; |
Ken Rockot(use gerrit already)
2016/05/30 14:58:51
nit: update log message
kcwu
2016/05/31 03:18:15
Done.
|
client_->OnError( |
@@ -163,7 +163,7 @@ base::ScopedFD GpuArcVideoService::UnwrapFdFromMojoHandle( |
return base::ScopedFD(); |
} |
- return base::ScopedFD(scoped_platform_handle.release().handle); |
+ return base::ScopedFD(platform_file); |
} |
void GpuArcVideoService::BindSharedMemory(::arc::mojom::PortType port, |