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

gpu/command_buffer/common/gl_mock.h

 // 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.
 
 // This file implements mock GL Interface for unit testing. It has to mock
 // Desktop GL, not GLES2 as it is used to test the service side code.
 
 #ifndef GPU_COMMAND_BUFFER_COMMON_GL_MOCK_H_
 #define GPU_COMMAND_BUFFER_COMMON_GL_MOCK_H_
 #pragma once
 
-// 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 "testing/gmock/include/gmock/gmock.h"
 #include "ui/gfx/gl/gl_interface.h"
 
 namespace gfx {
 
 class MockGLInterface : public GLInterface {
  public:
   MockGLInterface();
   virtual ~MockGLInterface();
 
@@ skipping 421 matching lines @@
   MOCK_METHOD3(GetFenceivNV, void(GLuint fence, GLenum pname, GLint *params));
 
   MOCK_METHOD1(SetSurfaceCHROMIUM, void(GLuint));
 
   MOCK_METHOD0(GetGraphicsResetStatusARB, GLenum());
 };
 
 }  // namespace gfx
 
 #endif  // GPU_COMMAND_BUFFER_COMMON_GL_MOCK_H_
+