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

gpu/command_buffer/service/id_manager_unittest.cc

 // Copyright (c) 2010 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/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 {
 namespace gles2 {
 
 class IdManagerTest : public testing::Test {
  public:
   IdManagerTest() {
   }
 
@@ skipping 49 matching lines @@
   EXPECT_FALSE(manager_.RemoveMapping(kClientId1, kServiceId1));
   EXPECT_FALSE(manager_.RemoveMapping(kClientId2, kServiceId1));
   EXPECT_FALSE(manager_.RemoveMapping(kClientId1, kServiceId2));
   // Check we get an error if we try to map an existing id.
   EXPECT_FALSE(manager_.AddMapping(kClientId2, kServiceId2));
   EXPECT_FALSE(manager_.AddMapping(kClientId2, kServiceId1));
 }
 
 }  // namespace gles2
 }  // namespace gpu
-
-