Share X connection between GLSurfaceGLX/EGL and MessagePumpX/GTK

content/gpu/gpu_main.cc

Index: content/gpu/gpu_main.cc
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 8ecc3f72a636106572ac69f56ef1913a72a753d8..ca26cc978c86da520789e6d14eab269be5d59865 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -30,6 +30,10 @@
 #include "ui/base/x/x11_util.h"
 #endif
 
+#if defined(TOOLKIT_USES_GTK)
+#include "ui/gfx/gtk_util.h"
+#endif
+
 // Main function for starting the Gpu process.
 int GpuMain(const content::MainFunctionParams& parameters) {
   base::Time start_time = base::Time::Now();
@@ -50,6 +54,9 @@ int GpuMain(const content::MainFunctionParams& parameters) {
 #elif defined(USE_X11)
     ui::SetDefaultX11ErrorHandlers();
 #endif
+#if defined(TOOLKIT_USES_GTK)
+    gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess());
+#endif
   }
 
   // Initialization of the OpenGL bindings may fail, in which case we