Change glimage to accept a type.

cc/test/test_gles2_interface.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 "cc/test/test_gles2_interface.h"
 
 #include "base/logging.h"
 #include "cc/test/test_web_graphics_context_3d.h"
 
 namespace cc {
@@ skipping 257 matching lines @@
   test_context_->compressedTexImage2D(
       target, level, internalformat, width, height, border, image_size, data);
 }
 
 void TestGLES2Interface::WaitAsyncTexImage2DCHROMIUM(GLenum target) {
   test_context_->waitAsyncTexImage2DCHROMIUM(target);
 }
 
 GLuint TestGLES2Interface::CreateImageCHROMIUM(GLsizei width,
                                                GLsizei height,
-                                               GLenum internalformat) {
-  return test_context_->createImageCHROMIUM(width, height, internalformat);
+                                               GLenum internalformat,
+                                               GLenum usage) {
+  return test_context_->createImageCHROMIUM(
+      width, height, internalformat, usage);
 }
 
 void TestGLES2Interface::DestroyImageCHROMIUM(GLuint image_id) {
   test_context_->destroyImageCHROMIUM(image_id);
 }
 
-void* TestGLES2Interface::MapImageCHROMIUM(GLuint image_id, GLenum access) {
-  return test_context_->mapImageCHROMIUM(image_id, access);
+void* TestGLES2Interface::MapImageCHROMIUM(GLuint image_id) {
+  return test_context_->mapImageCHROMIUM(image_id);
 }
 
 void TestGLES2Interface::GetImageParameterivCHROMIUM(GLuint image_id,
                                                      GLenum pname,
                                                      GLint* params) {
   test_context_->getImageParameterivCHROMIUM(image_id, pname, params);
 }
 
 void TestGLES2Interface::UnmapImageCHROMIUM(GLuint image_id) {
   test_context_->unmapImageCHROMIUM(image_id);
@@ skipping 69 matching lines @@
                                         GLuint height,
                                         float device_scale) {
   test_context_->reshapeWithScaleFactor(width, height, device_scale);
 }
 
 void TestGLES2Interface::LoseContextCHROMIUM(GLenum current, GLenum other) {
   test_context_->loseContextCHROMIUM(current, other);
 }
 
 }  // namespace cc