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

gpu/command_buffer/service/shader_manager_unittest.cc

Index: gpu/command_buffer/service/shader_manager_unittest.cc
diff --git a/gpu/command_buffer/service/shader_manager_unittest.cc b/gpu/command_buffer/service/shader_manager_unittest.cc
index 23590b78e1aa4622ddf4c94beb391891aa6a5979..2aed8d9a6428aec02616d3be51a032f4084ed685 100644
--- a/gpu/command_buffer/service/shader_manager_unittest.cc
+++ b/gpu/command_buffer/service/shader_manager_unittest.cc
@@ -2,12 +2,16 @@
 // 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/service/shader_manager.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "gpu/command_buffer/common/gl_mock.h"
 #include "gpu/command_buffer/service/mocks.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::Return;
 using ::testing::ReturnRef;
@@ -242,5 +246,3 @@ TEST_F(ShaderManagerTest, ShaderInfoUseCount) {
 
 }  // namespace gles2
 }  // namespace gpu
-
-