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

gpu/command_buffer/service/gles2_cmd_decoder.cc

Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
===================================================================
--- gpu/command_buffer/service/gles2_cmd_decoder.cc	(revision 102984)
+++ gpu/command_buffer/service/gles2_cmd_decoder.cc	(working copy)
@@ -15,7 +15,6 @@
 #include "base/atomicops.h"
 #include "base/at_exit.h"
 #include "base/callback.h"
-#include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "build/build_config.h"
@@ -41,13 +40,6 @@
 #include "ui/gfx/gl/gl_implementation.h"
 #include "ui/gfx/gl/gl_surface.h"
 
-#if defined(USE_X11)
-#include "ui/base/x/x11_util_internal.h"
-#define CHECK_X_ERROR() ui::CheckForReportedX11Error()
-#else   // USE_X11
-#define CHECK_X_ERROR() void(0)
-#endif  // USE_X11
-
 #if !defined(GL_DEPTH24_STENCIL8)
 #define GL_DEPTH24_STENCIL8 0x88F0
 #endif
@@ -1740,8 +1732,6 @@
   // Take ownership of the GLContext.
   context_ = context;
 
-  CHECK_X_ERROR();
-
   if (!MakeCurrent()) {
     LOG(ERROR) << "GLES2DecoderImpl::Initialize failed because "
                << "MakeCurrent failed.";
@@ -1756,7 +1746,6 @@
     return false;
   }
 
-  CHECK_X_ERROR();
   CHECK_GL_ERROR();
   disallowed_features_ = disallowed_features;