Change X11 error handler override to allow easy X11 error checking.

gpu/command_buffer/common/gl_mock.h

 // Copyright (c) 2011 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 implements mock GL Interface for unit testing. It has to mock
 // Desktop GL, not GLES2 as it is used to test the service side code.
 
 #ifndef GPU_COMMAND_BUFFER_COMMON_GL_MOCK_H_
 #define GPU_COMMAND_BUFFER_COMMON_GL_MOCK_H_
 #pragma once
 
+#if defined(USE_X11)

[Ami GONE FROM CHROMIUM, 2011/09/21 22:21:42]

Ditto comment on id_manager_unittest.cc.

[dominich, 2011/09/22 17:00:15]

Done.

+// These are defined by both gtest and Xlib so we need to undefine them before
+// including the gtest header. Obviously the gtest definition will replace the
+// Xlib one for the remainder of this file.
+#undef Bool
+#undef None
+#undef Status
+#endif
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/gfx/gl/gl_interface.h"
 
 namespace gfx {
 
 class MockGLInterface : public GLInterface {
  public:
   MockGLInterface();
   virtual ~MockGLInterface();
 
@@ skipping 418 matching lines @@
   MOCK_METHOD3(GetFenceivNV, void(GLuint fence, GLenum pname, GLint *params));
 
   MOCK_METHOD1(SetSurfaceCHROMIUM, void(GLuint));
 
   MOCK_METHOD0(GetGraphicsResetStatusARB, GLenum());
 };
 
 }  // namespace gfx
 
 #endif  // GPU_COMMAND_BUFFER_COMMON_GL_MOCK_H_
-