Revert 59147 - Allow overriding of X error functions

BUG=50006 (and various other reports)
TEST=Run chrome under nested window manager using Xephyr (see
http://code.google.com/p/chromium/wiki/LayoutTestsLinux)

use --enable-logging=stderr --log-level=0
kill xephyr
examine log. You should see
X IO Error detected
followed (not necessarily immediately) by
successfully saved /tmp/tx/Default/Preferences
successfully saved /tmp/tx/Local State
successfully saved /tmp/tx/Local State
successfully saved /tmp/tx/Default/Preferences
along with no crash.

There is a high ranking crash report on both linux and chromeos that happens whenever X sends an error to chrome. This change causes us to log and continue when we get a regular error from X. When we get an IO error, indicating X is gone, we attempt to shut down gracefully.

Review URL: http://codereview.chromium.org/3175038

TBR=davemoore@chromium.org
Review URL: http://codereview.chromium.org/3332019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59175 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 2 deletions

diff --git a/chrome/gpu/gpu_thread.cc b/chrome/gpu/gpu_thread.cc
index f1e5148..a949e3b 100644
--- a/chrome/gpu/gpu_thread.cc
+++ b/chrome/gpu/gpu_thread.cc
@@ -26,7 +26,6 @@
 #endif
 
 #if defined(OS_LINUX)
-#include "app/x11_util.h"
 #include <gtk/gtk.h>
 #endif
 
@@ -58,7 +57,7 @@ GpuThread::GpuThread() {
     for (size_t i = 0; i < args.size(); ++i) {
       free(argv[i]);
     }
-    x11_util::SetDefaultX11ErrorHandlers();
+    x11_util::SetX11ErrorHandlers();
   }
 #endif
 }