Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / mojo / services / gles2 / command_buffer_type_conversions.h

diff --git a/src/mojo/services/gles2/command_buffer_type_conversions.h b/src/mojo/services/gles2/command_buffer_type_conversions.h
index 911bd70..b2c471c 100644 (file)
--- a/src/mojo/services/gles2/command_buffer_type_conversions.h
+++ b/src/mojo/services/gles2/command_buffer_type_conversions.h
@@ -5,30 +5,22 @@
 #ifndef MOJO_SERVICES_GLES2_COMMAND_BUFFER_TYPE_CONVERSIONS_H_
 #define MOJO_SERVICES_GLES2_COMMAND_BUFFER_TYPE_CONVERSIONS_H_
 
-#include "base/memory/shared_memory.h"
 #include "gpu/command_buffer/common/command_buffer.h"
-#include "mojo/public/bindings/type_converter.h"
+#include "mojo/public/cpp/bindings/type_converter.h"
 
 namespace mojo {
 
-class ShmHandle;
 class CommandBufferState;
 class Buffer;
 
 template <>
-class TypeConverter<ShmHandle, base::SharedMemoryHandle> {
- public:
-  static ShmHandle ConvertFrom(const base::SharedMemoryHandle& input,
-                               Buffer* buffer);
-  static base::SharedMemoryHandle ConvertTo(const ShmHandle& input);
-};
-
-template <>
 class TypeConverter<CommandBufferState, gpu::CommandBuffer::State> {
  public:
   static CommandBufferState ConvertFrom(const gpu::CommandBuffer::State& input,
                                         Buffer* buffer);
   static gpu::CommandBuffer::State ConvertTo(const CommandBufferState& input);
+
+  MOJO_ALLOW_IMPLICIT_TYPE_CONVERSION();
 };
 
 }  // namespace mojo