Change CHROMIUM_image declarations to support multi planar input.

gpu/command_buffer/client/client_test_helper.h

 // Copyright (c) 2012 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.
 
 // Helper classes for implementing gpu client side unit tests.
 
 #ifndef GPU_COMMAND_BUFFER_CLIENT_CLIENT_TEST_HELPER_H_
 #define GPU_COMMAND_BUFFER_CLIENT_CLIENT_TEST_HELPER_H_
 
 #include "base/compiler_specific.h"
@@ skipping 74 matching lines @@
 
   void DelegateToFake();
 };
 
 class MockClientGpuControl : public GpuControl {
  public:
   MockClientGpuControl();
   virtual ~MockClientGpuControl();
 
   MOCK_METHOD0(GetCapabilities, Capabilities());
-  MOCK_METHOD4(CreateImage,
-               int32(ClientBuffer buffer,
-                     size_t width,
-                     size_t height,
-                     unsigned internalformat));
+  // Workaround for MSVC warning on mock methods, see http://crbug.com/466689
+  int32_t CreateImage(ClientBuffer* const buffers,
+                      size_t width,
+                      size_t height,
+                      unsigned internalformat);
+  MOCK_METHOD0(DoCreateImage, int32());
   MOCK_METHOD1(DestroyImage, void(int32 id));
   MOCK_METHOD4(CreateGpuMemoryBufferImage,
                int32(size_t width,
                      size_t height,
                      unsigned internalformat,
                      unsigned usage));
   MOCK_METHOD0(InsertSyncPoint, uint32());
   MOCK_METHOD0(InsertFutureSyncPoint, uint32());
   MOCK_METHOD1(RetireSyncPoint, void(uint32 id));
   MOCK_METHOD2(SignalSyncPoint, void(uint32 id, const base::Closure& callback));
   MOCK_METHOD2(SignalQuery, void(uint32 query, const base::Closure& callback));
   MOCK_METHOD1(SetSurfaceVisible, void(bool visible));
   MOCK_METHOD1(CreateStreamTexture, uint32(uint32));
   MOCK_METHOD1(SetLock, void(base::Lock*));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockClientGpuControl);
 };
 
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_CLIENT_TEST_HELPER_H_