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

gpu/command_buffer/service/framebuffer_manager_unittest.cc

Index: gpu/command_buffer/service/framebuffer_manager_unittest.cc
diff --git a/gpu/command_buffer/service/framebuffer_manager_unittest.cc b/gpu/command_buffer/service/framebuffer_manager_unittest.cc
index 77c6622ae829f9e75d6b20d3636b419518d58a88..3bc761053118c7a3eeb2862f57d37b62853d55c1 100644
--- a/gpu/command_buffer/service/framebuffer_manager_unittest.cc
+++ b/gpu/command_buffer/service/framebuffer_manager_unittest.cc
@@ -6,6 +6,13 @@
 #include "gpu/command_buffer/service/feature_info.h"
 
 #include "gpu/command_buffer/common/gl_mock.h"
+
+#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.

+// This is defined by both gtest and Xlib so we need to undefine it before
+// including the gtest header. Obviously the gtest definition will replace the
+// Xlib one for the remainder of this file.
+#undef Bool
+#endif
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gpu {
@@ -364,5 +371,3 @@ TEST_F(FramebufferInfoTest, AttachTexture) {
 
 }  // namespace gles2
 }  // namespace gpu
-
-