2 files changed, 10 insertions, 0 deletions
diff --git a/ui/gfx/compositor/compositor.gyp b/ui/gfx/compositor/compositor.gyp
index c605f7e..d5e38b7 100644
--- a/ui/gfx/compositor/compositor.gyp
+++ b/ui/gfx/compositor/compositor.gyp
@@ -109,6 +109,12 @@
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
       ],
       'conditions': [
+        # osmesa GL implementation is used on linux.
+        ['OS=="linux"', {
+          'dependencies': [
+            '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
+          ],
+        }],
         ['OS!="mac"', {
           'dependencies': [
             '<(DEPTH)/chrome/chrome.gyp:packed_resources',
diff --git a/ui/gfx/compositor/test_suite.cc b/ui/gfx/compositor/test_suite.cc
index 967709a..f26cd31 100644
--- a/ui/gfx/compositor/test_suite.cc
+++ b/ui/gfx/compositor/test_suite.cc
@@ -7,11 +7,15 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/gfx/gfx_paths.h"
+#include "ui/gfx/gl/gl_implementation.h"
 
 CompositorTestSuite::CompositorTestSuite(int argc, char** argv)
     : TestSuite(argc, argv) {}
 
 void CompositorTestSuite::Initialize() {
+#if defined(OS_LINUX)
+  gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL);
+#endif
   base::TestSuite::Initialize();
 
   gfx::RegisterPathProvider();