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

gpu/command_buffer/service/framebuffer_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/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 {
 
 class FramebufferManagerTest : public testing::Test {
  public:
   FramebufferManagerTest() {
   }
   ~FramebufferManagerTest() {
     manager_.Destroy(false);
   }
@@ skipping 336 matching lines @@
   // Check removing it.
   info_->AttachTexture(GL_COLOR_ATTACHMENT0, NULL, 0, 0);
   EXPECT_TRUE(info_->GetAttachment(GL_COLOR_ATTACHMENT0) == NULL);
   EXPECT_EQ(static_cast<GLenum>(0), info_->GetColorAttachmentFormat());
 
   tex_manager.Destroy(false);
 }
 
 }  // namespace gles2
 }  // namespace gpu
+
+