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..7bd4872273e9bb3f059e72e88f98bd93df4606cc 100644
--- a/gpu/command_buffer/service/framebuffer_manager_unittest.cc
+++ b/gpu/command_buffer/service/framebuffer_manager_unittest.cc
@@ -2,12 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// Include gtest.h out of order because <X11/X.h> #define's Bool & None, which
+// gtest uses as struct names (inside a namespace).  This means that
+// #include'ing gtest after anything that pulls in X.h fails to compile.
+// This is http://code.google.com/p/googletest/issues/detail?id=371
+#include "testing/gtest/include/gtest/gtest.h"
+#include "gpu/command_buffer/common/gl_mock.h"
 #include "gpu/command_buffer/service/framebuffer_manager.h"
 #include "gpu/command_buffer/service/feature_info.h"
 
-#include "gpu/command_buffer/common/gl_mock.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
 namespace gpu {
 namespace gles2 {
 
@@ -364,5 +367,3 @@ TEST_F(FramebufferInfoTest, AttachTexture) {
 
 }  // namespace gles2
 }  // namespace gpu
-
-