Re-land: ui: Add GLImage unit test framework.

components/mus/gles2/command_buffer_driver.cc

 // Copyright 2013 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/mus/gles2/command_buffer_driver.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/shared_memory.h"
 #include "components/mus/gles2/command_buffer_type_conversions.h"
@@ skipping 211 matching lines @@
           internal_format, gpu_format)) {
     LOG(ERROR) << "Incompatible image format.";
     return;
   }
 
   if (type != gfx::SHARED_MEMORY_BUFFER) {
     NOTIMPLEMENTED();
     return;
   }
 
-  gfx::GpuMemoryBufferHandle gfx_handle;
-  // TODO(jam): create mojo enum for this and converter
-  gfx_handle.type = static_cast<gfx::GpuMemoryBufferType>(type);
-  gfx_handle.id = gfx::GpuMemoryBufferId(id);
-
   MojoPlatformHandle platform_handle;
   MojoResult extract_result = MojoExtractPlatformHandle(
       memory_handle.release().value(), &platform_handle);
   if (extract_result != MOJO_RESULT_OK) {
     NOTREACHED();
     return;
   }
 
+  base::SharedMemoryHandle handle;
 #if defined(OS_WIN)
-  gfx_handle.handle = platform_handle;
+  handle = platform_handle;
 #else
-  gfx_handle.handle = base::FileDescriptor(platform_handle, false);
+  handle = base::FileDescriptor(platform_handle, false);
 #endif
 
   scoped_refptr<gfx::GLImageSharedMemory> image =
       new gfx::GLImageSharedMemory(gfx_size, internal_format);
   // TODO(jam): also need a mojo enum for this enum
-  if (!image->Initialize(gfx_handle, gpu_format)) {
+  if (!image->Initialize(handle, gfx::GpuMemoryBufferId(id), gpu_format)) {
     NOTREACHED();
     return;
   }
 
   image_manager->AddImage(image.get(), id);
 }
 
 void CommandBufferDriver::DestroyImage(int32_t id) {
   gpu::gles2::ImageManager* image_manager = decoder_->GetImageManager();
   if (!image_manager->LookupImage(id)) {
@@ skipping 37 matching lines @@
 
 void CommandBufferDriver::DestroyDecoder() {
   if (decoder_) {
     bool have_context = decoder_->MakeCurrent();
     decoder_->Destroy(have_context);
     decoder_.reset();
   }
 }
 
 }  // namespace mus