X11: Make the default X11 error handler non-fatal.

chrome/gpu/gpu_main.cc

 // Copyright (c) 2010 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 <stdlib.h>
 
 #include "app/app_switches.h"
 #include "app/gfx/gl/gl_context.h"
 #include "app/gfx/gl/gl_implementation.h"
 #include "base/environment.h"
@@ skipping 12 matching lines @@
 
 #if defined(USE_LINUX_BREAKPAD)
 #include "chrome/app/breakpad_linux.h"
 #endif
 
 #if defined(OS_WIN)
 #include "app/win_util.h"
 #endif
 
 #if defined(USE_X11)
-#include "app/x11_util.h"
-#include "app/x11_util_internal.h"
 #include "gfx/gtk_util.h"
 #endif
 
 namespace {
 
 // 1% per watchdog trial group.
 const int kFieldTrialSize = 1;
 
 // 5 - 20 seconds timeout.
 const int kMinGpuTimeout = 5;
 const int kMaxGpuTimeout = 20;
 
-#if defined(USE_X11)
-int GpuX11ErrorHandler(Display* d, XErrorEvent* error) {
-  LOG(ERROR) << x11_util::GetErrorEventDescription(d, error);
-  return 0;
-}
-
-void SetGpuX11ErrorHandlers() {
-  // Set up the error handlers so that only general errors aren't fatal.
-  x11_util::SetX11ErrorHandlers(GpuX11ErrorHandler, NULL);
-}
-#endif
-
-}
+}  // namespace
 
 // Main function for starting the Gpu process.
 int GpuMain(const MainFunctionParams& parameters) {
   base::Time start_time = base::Time::Now();
 
 #if defined(USE_LINUX_BREAKPAD)
   // Needs to be called after we have chrome::DIR_USER_DATA.
   InitCrashReporter();
 #endif
 
@@ skipping 17 matching lines @@
 #endif
 
 #if defined(USE_X11)
   // The X11 port of the command buffer code assumes it can access the X
   // display via the macro GDK_DISPLAY(), which implies that Gtk has been
   // initialized. This code was taken from PluginThread. TODO(kbr):
   // rethink whether initializing Gtk is really necessary or whether we
   // should just send a raw display connection down to the GPUProcessor.
   g_thread_init(NULL);
   gfx::GtkInitFromCommandLine(command_line);
-  SetGpuX11ErrorHandlers();
 #endif
 
   // Load the GL implementation and locate the bindings before starting the GPU
   // watchdog because this can take a lot of time and the GPU watchdog might
   // terminate the GPU process.
   if (!gfx::GLContext::InitializeOneOff())
     return EXIT_FAILURE;
 
   // Do this soon before running the message loop so accurate
   // initialization time is recorded in the GPU info. Don't do it before
@@ skipping 42 matching lines @@
     watchdog_thread->Start();
   }
 
   main_message_loop.Run();
 
   if (enable_watchdog)
     watchdog_thread->Stop();
 
   return 0;
 }