Revert 102978 - Change X11 error handler override to allow easy X11 error checking.

gpu/command_buffer/service/shader_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 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;
 
 namespace gpu {
 namespace gles2 {
 
 class ShaderManagerTest : public testing::Test {
  public:
   ShaderManagerTest() {
@@ skipping 214 matching lines @@
   EXPECT_FALSE(info1->InUse());
   info2 = manager_.GetShaderInfo(kClient1Id);
   EXPECT_EQ(info1, info2);
   manager_.MarkAsDeleted(info1);  // this should delete the shader.
   info2 = manager_.GetShaderInfo(kClient1Id);
   EXPECT_TRUE(info2 == NULL);
 }
 
 }  // namespace gles2
 }  // namespace gpu
+
+