wayland: Fix GL extension binding init to work again for use_wayland

ui/gfx/gl/gl_implementation_linux.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <vector>
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/lazy_instance.h"
@@ skipping 39 matching lines @@
 // race in the bindings initialization.
 #if (defined(TOOLKIT_VIEWS) && !defined(OS_CHROMEOS)) || defined(TOUCH_UI)
 base::LazyInstance<base::Lock,
                    base::LeakyLazyInstanceTraits<base::Lock> >
     g_lock(base::LINKER_INITIALIZED);
 #endif
 
 }  // namespace anonymous
 
 void GetAllowedGLImplementations(std::vector<GLImplementation>* impls) {
+#if !defined(USE_WAYLAND)
+  impls->push_back(kGLImplementationOSMesaGL);
   impls->push_back(kGLImplementationDesktopGL);
+#endif
   impls->push_back(kGLImplementationEGLGLES2);
-  impls->push_back(kGLImplementationOSMesaGL);
 }
 
 bool InitializeGLBindings(GLImplementation implementation) {
 #if (defined(TOOLKIT_VIEWS) && !defined(OS_CHROMEOS)) || defined(TOUCH_UI)
   base::AutoLock locked(g_lock.Get());
 #endif
   // Prevent reinitialization with a different implementation. Once the gpu
   // unit tests have initialized with kGLImplementationMock, we don't want to
   // later switch to another GL implementation.
   if (GetGLImplementation() != kGLImplementationNone)
@@ skipping 110 matching lines @@
       return false;
   }
 
 
   return true;
 }
 
 bool InitializeGLExtensionBindings(GLImplementation implementation,
     GLContext* context) {
   switch (implementation) {
+#if !defined(USE_WAYLAND)
     case kGLImplementationOSMesaGL:
       InitializeGLExtensionBindingsGL(context);
       InitializeGLExtensionBindingsOSMESA(context);
       break;
     case kGLImplementationDesktopGL:
       InitializeGLExtensionBindingsGL(context);
       InitializeGLExtensionBindingsGLX(context);
       break;
+#endif
     case kGLImplementationEGLGLES2:
       InitializeGLExtensionBindingsGL(context);
       InitializeGLExtensionBindingsEGL(context);
       break;
     case kGLImplementationMockGL:
       InitializeGLExtensionBindingsGL(context);
       break;
     default:
       return false;
   }
@@ skipping 16 matching lines @@
 #if !defined(USE_WAYLAND)
   ClearGLBindingsGLX();
   ClearGLBindingsOSMESA();
 #endif
   SetGLImplementation(kGLImplementationNone);
 
   UnloadGLNativeLibraries();
 }
 
 }  // namespace gfx