Allow overriding of X error functions

chrome/gpu/gpu_thread.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 "chrome/gpu/gpu_thread.h"
 
 #include <string>
 #include <vector>
 
 #include "app/gfx/gl/gl_context.h"
 #include "base/command_line.h"
 #include "build/build_config.h"
 #include "chrome/common/child_process.h"
 #include "chrome/common/gpu_info.h"
 #include "chrome/common/gpu_messages.h"
 #include "chrome/gpu/gpu_info_collector.h"
 #include "ipc/ipc_channel_handle.h"
 
 #if defined(OS_WIN)
 #include "chrome/gpu/gpu_view_win.h"
 #elif defined(GPU_USE_GLX)
 #include "chrome/gpu/gpu_backing_store_glx_context.h"
 #include "chrome/gpu/gpu_view_x.h"
 
 #include <X11/Xutil.h>  // Must be last.
 #endif
 
 #if defined(OS_LINUX)
+#include "app/x11_util.h"
 #include <gtk/gtk.h>
 #endif
 
 GpuThread::GpuThread() {
 #if defined(GPU_USE_GLX)
   display_ = ::XOpenDisplay(NULL);
 #endif
 #if defined(OS_LINUX)
   {
     // The X11 port of the command buffer code assumes it can access the X
@@ skipping 11 matching lines @@
       // here.
       argv[i] = strdup(args[i].c_str());
     }
     argv[argc] = NULL;
     char **argv_pointer = argv.get();
 
     gtk_init(&argc, &argv_pointer);
     for (size_t i = 0; i < args.size(); ++i) {
       free(argv[i]);
     }
-    x11_util::SetX11ErrorHandlers();
+    x11_util::SetDefaultX11ErrorHandlers();
   }
 #endif
 }
 
 GpuThread::~GpuThread() {
 }
 
 #if defined(GPU_USE_GLX)
 GpuBackingStoreGLXContext* GpuThread::GetGLXContext() {
   if (!glx_context_.get())
@@ skipping 68 matching lines @@
   // message to destroy the GpuRWHView when necessary. So we don't manage the
   // lifetime of this object.
 #if defined(OS_WIN)
   new GpuViewWin(this, parent_window, routing_id);
 #elif defined(GPU_USE_GLX)
   new GpuViewX(this, parent_window, routing_id);
 #else
   NOTIMPLEMENTED();
 #endif
 }