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, 2 insertions, 12 deletions

diff --git a/app/x11_util_internal.h b/app/x11_util_internal.h
index ea3bd3d..9b65dcd 100644
--- a/app/x11_util_internal.h
+++ b/app/x11_util_internal.h
@@ -20,9 +20,9 @@ extern "C" {
 }
 
 namespace x11_util {
-  // --------------------------------------------------------------------------
-  // NOTE: these functions cache the results and must be called from the UI
+  // NOTE: these function caches the results and must be called from the UI
   // thread.
+
   // Get the XRENDER format id for ARGB32 (Skia's format).
   //
   // NOTE:Currently this don't support multiple screens/displays.
@@ -31,16 +31,6 @@ namespace x11_util {
   // Get the XRENDER format id for the default visual on the first screen. This
   // is the format which our GTK window will have.
   XRenderPictFormat* GetRenderVisualFormat(Display* dpy, Visual* visual);
-
-  // --------------------------------------------------------------------------
-  // X11 error handling.
-  // Sets the X Error Handlers. Passing NULL for either will enable the default
-  // error handler, which if called will log the error and abort the process.
-  void SetX11ErrorHandlers(XErrorHandler error_handler,
-                           XIOErrorHandler io_error_handler);
-
-  // Returns a string suitable for logging the error event.
-  std::string GetErrorEventDescription(XErrorEvent* error_event);
 };
 
 #endif  // APP_X11_UTIL_INTERNAL_H_