Relanding r71472....

app/gfx/gl/gl_context_linux.cc

 // Copyright (c) 2010 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.
 
 // This file implements the ViewGLContext and PbufferGLContext classes.
 
 #include "app/gfx/gl/gl_context.h"
 
 extern "C" {
 #include <X11/Xlib.h>
@@ skipping 170 matching lines @@
     ::XFree(x);
   }
 };
 
 bool GLContext::InitializeOneOff() {
   static bool initialized = false;
   if (initialized)
     return true;
 
   static const GLImplementation kAllowedGLImplementations[] = {
+    kGLImplementationDesktopGL,
     kGLImplementationEGLGLES2,
-    kGLImplementationDesktopGL,
     kGLImplementationOSMesaGL
   };
 
   if (!InitializeBestGLBindings(
            kAllowedGLImplementations,
            kAllowedGLImplementations + arraysize(kAllowedGLImplementations))) {
     LOG(ERROR) << "InitializeBestGLBindings failed.";
     return false;
   }
 
@@ skipping 619 matching lines @@
     }
     case kGLImplementationMockGL:
       return new StubGLContext;
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 }  // namespace gfx