Allow overriding of X error functions

chrome/plugin/plugin_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/plugin/plugin_thread.h"
 
 #include "build/build_config.h"
 
 #if defined(USE_X11)
 #include <gtk/gtk.h>
@@ skipping 69 matching lines @@
     // GTK after 2.18 resets the environment variable.  But if we're using
     // nspluginwrapper, that means it'll spawn its subprocess without the
     // environment variable!  So set it again.
     setenv("GDK_NATIVE_WINDOWS", "1", 1);
 
     for (size_t i = 0; i < args.size(); ++i) {
       free(argv[i]);
     }
   }
 
-  x11_util::SetX11ErrorHandlers();
+  x11_util::SetDefaultX11ErrorHandlers();
 #endif
 
   PatchNPNFunctions();
 
   // Preload the library to avoid loading, unloading then reloading
   preloaded_plugin_module_ = base::LoadNativeLibrary(plugin_path_);
 
   ChromePluginLib::Create(plugin_path_, GetCPBrowserFuncsForPlugin());
 
   scoped_refptr<NPAPI::PluginLib> plugin =
@@ skipping 134 matching lines @@
   }
 
   if (!result || net_error != net::OK)
     return false;
 
   *proxy_list = proxy_result;
   return true;
 }
 
 }  // namespace webkit_glue