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

gpu/command_buffer/service/id_manager_unittest.cc

Index: gpu/command_buffer/service/id_manager_unittest.cc
diff --git a/gpu/command_buffer/service/id_manager_unittest.cc b/gpu/command_buffer/service/id_manager_unittest.cc
index 015a44252eebd8f87a01f2d5aabe40d7b70057ff..de11ee94d80bc8a5dbe477c4e6e95e6b9bd1356d 100644
--- a/gpu/command_buffer/service/id_manager_unittest.cc
+++ b/gpu/command_buffer/service/id_manager_unittest.cc
@@ -3,6 +3,14 @@
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/id_manager.h"
+#if defined(USE_X11)
+// These are defined by both gtest and Xlib so we need to undefine them before

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

An alternative is to #include gtest early, as in 
http://codesearch.google.com/codesearch#OAMlx_jo-ck/src/content/common/gpu/me...
Saves you an #if-defined and the explicit enumeration of conflicts.

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

Done.

+// 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/gtest/include/gtest/gtest.h"
 
 namespace gpu {
@@ -72,5 +80,3 @@ TEST_F(IdManagerTest, Basic) {
 
 }  // namespace gles2
 }  // namespace gpu
-
-