Snapshot of all changes to get jumbo in blink and content.

ui/base/x/x11_util_internal.h

Index: ui/base/x/x11_util_internal.h
diff --git a/ui/base/x/x11_util_internal.h b/ui/base/x/x11_util_internal.h
index 100d215f6a0d1f7d7d0e1884851f78c88ab026d1..ffd57062290938a6fdde36e60e80b1e2a930b087 100644
--- a/ui/base/x/x11_util_internal.h
+++ b/ui/base/x/x11_util_internal.h
@@ -12,12 +12,33 @@
 // when needed.
 
 extern "C" {
-#include <X11/extensions/Xrender.h>
-#include <X11/extensions/XShm.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
+#define Bool int  // Ironic, but other headers undef Bool
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/XShm.h>
+#include <X11/extensions/Xrender.h>
+#undef None    // Defined by X11/X.h to 0L which collides with other headers
+#undef Status  // Defined by X11/Xlib.h to int which collides with other headers
+#undef True    // Defined by X11/Xlib.h to 1 which collides with other headers
+#undef False   // Defined by X11/Xlib.h to 0 which collides with other headers
+#undef CurrentTime  // Defined by X11/X.h to 0L which collides with other
+                    // headers
+#undef Success      // Defined by X11/X.h to 0 which collides with other headers
+#undef CREATE      // Defined by XInput.h to 1 which collides with other headers
+#undef DestroyAll  // Defined by X11/X.h to 0 which collides with other headers
+#undef COUNT       // Defined by X11/extensions/XI.h to 0 which collides
 }
 
+struct X11Constants {
+  static const long None = 0L;
+  static const long CurrentTime = 0L;
+  static const int False = 0;
+  static const int True = 1;
+  static const int Success = 0;
+  typedef int Status;
+};
+
 #include <memory>
 #include <unordered_map>