Adds a GLMock object so we can check the code is...

gpu/command_buffer/common/gles2_cmd_format.h

 // Copyright (c) 2009 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.
 
 // This file defines the GLES2 command buffer commands.
 
 #ifndef GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_H_
 #define GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_H_
 
 // This is here because service side code must include the system's version of
-// the GL headers where as client side code includes the Chrome version.
-#ifdef GLES2_GPU_SERVICE
+// the GL headers where as client side code includes the Chrome version. Also
+// the unit test code must include a mock GL header.
+#if defined(UNIT_TEST)
+#include "gpu/command_buffer/service/gl_mock.h"
+#elif defined(GLES2_GPU_SERVICE)
 #include <GL/glew.h>
 #if defined(OS_WIN)
 #include <GL/wglew.h>
 #endif
 #else
 #include <GLES2/gl2types.h>
 #endif
 
 #include "base/basictypes.h"
 #include "gpu/command_buffer/common/types.h"
 #include "gpu/command_buffer/common/bitfield_helpers.h"
 #include "gpu/command_buffer/common/cmd_buffer_common.h"
 #include "gpu/command_buffer/common/gles2_cmd_ids.h"
 
 namespace gpu {
 namespace gles2 {
 
+#pragma pack(push, 1)
+
 #include "gpu/command_buffer/common/gles2_cmd_format_autogen.h"
 
 // These are hand written commands.
 // TODO(gman): Attempt to make these auto-generated.
 
 struct GetAttribLocation {
   typedef GetAttribLocation ValueType;
   static const CommandId kCmdId = kGetAttribLocation;
   static const cmd::ArgFlags kArgFlags = cmd::kFixed;
 
@@ skipping 226 matching lines @@
 COMPILE_ASSERT(offsetof(GetUniformLocationImmediate, program) == 4,
                OffsetOf_GetUniformLocationImmediate_program_not_4);
 COMPILE_ASSERT(offsetof(GetUniformLocationImmediate, location_shm_id) == 8,
                OffsetOf_GetUniformLocationImmediate_location_shm_id_not_8);
 COMPILE_ASSERT(
     offsetof(GetUniformLocationImmediate, location_shm_offset) == 12,
                OffsetOf_GetUniformLocationImmediate_location_shm_offset_not_12);
 COMPILE_ASSERT(offsetof(GetUniformLocationImmediate, data_size) == 16,
                OffsetOf_GetUniformLocationImmediate_data_size_not_16);
 
+#pragma pack(pop)
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_H_