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

gpu/command_buffer/service/framebuffer_manager_unittest.cc

 // 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.
 
 #include "gpu/command_buffer/service/framebuffer_manager.h"
 #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 {
 namespace gles2 {
 
 class FramebufferManagerTest : public testing::Test {
  public:
   FramebufferManagerTest() {
   }
   ~FramebufferManagerTest() {
@@ skipping 338 matching lines @@
   // Check removing it.
   info_->AttachTexture(GL_COLOR_ATTACHMENT0, NULL, 0, 0);
   EXPECT_TRUE(info_->GetAttachment(GL_COLOR_ATTACHMENT0) == NULL);
   EXPECT_EQ(static_cast<GLenum>(0), info_->GetColorAttachmentFormat());
 
   tex_manager.Destroy(false);
 }
 
 }  // namespace gles2
 }  // namespace gpu
-
-