Revert of Use the desktop GL core profile on Linux when ES3 support is requested.

ui/gl/gl_implementation_x11.cc

 // Copyright (c) 2012 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/command_line.h"
 #include "base/logging.h"
 #include "base/threading/thread_restrictions.h"
 #include "ui/gl/gl_bindings.h"
@@ skipping 25 matching lines @@
 #else
 const char kGLLibraryName[] = "libGL.so.1";
 #endif
 
 const char kGLESv2LibraryName[] = "libGLESv2.so.2";
 const char kEGLLibraryName[] = "libEGL.so.1";
 
 }  // namespace
 
 void GetAllowedGLImplementations(std::vector<GLImplementation>* impls) {
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableUnsafeES3APIs)) {
-    impls->push_back(kGLImplementationDesktopGLCoreProfile);
-  }
   impls->push_back(kGLImplementationDesktopGL);
   impls->push_back(kGLImplementationEGLGLES2);
   impls->push_back(kGLImplementationOSMesaGL);
 }
 
 bool InitializeStaticGLBindings(GLImplementation implementation) {
   // 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.
   DCHECK_EQ(kGLImplementationNone, GetGLImplementation());
 
   // Allow the main thread or another to initialize these bindings
   // after instituting restrictions on I/O. Going forward they will
   // likely be used in the browser process on most platforms. The
   // one-time initialization cost is small, between 2 and 5 ms.
   base::ThreadRestrictions::ScopedAllowIO allow_io;
 
   switch (implementation) {
     case kGLImplementationOSMesaGL:
       return InitializeStaticGLBindingsOSMesaGL();
-    case kGLImplementationDesktopGL:
-    case kGLImplementationDesktopGLCoreProfile: {
+    case kGLImplementationDesktopGL: {
       base::NativeLibrary library = NULL;
       const base::CommandLine* command_line =
           base::CommandLine::ForCurrentProcess();
 
       if (command_line->HasSwitch(switches::kTestGLLib))
         library = LoadLibraryAndPrintError(
             command_line->GetSwitchValueASCII(switches::kTestGLLib).c_str());
 
       if (!library) {
         library = LoadLibraryAndPrintError(kGLLibraryName);
       }
 
       if (!library)
         return false;
 
       GLGetProcAddressProc get_proc_address =
           reinterpret_cast<GLGetProcAddressProc>(
               base::GetFunctionPointerFromNativeLibrary(
                   library, "glXGetProcAddress"));
       if (!get_proc_address) {
         LOG(ERROR) << "glxGetProcAddress not found.";
         base::UnloadNativeLibrary(library);
         return false;
       }
 
       SetGLGetProcAddressProc(get_proc_address);
       AddGLNativeLibrary(library);
-      SetGLImplementation(implementation);
+      SetGLImplementation(kGLImplementationDesktopGL);
 
       InitializeStaticGLBindingsGL();
       InitializeStaticGLBindingsGLX();
       break;
     }
     case kGLImplementationEGLGLES2: {
       base::NativeLibrary gles_library =
           LoadLibraryAndPrintError(kGLESv2LibraryName);
       if (!gles_library)
         return false;
@@ skipping 39 matching lines @@
   }
 
 
   return true;
 }
 
 bool InitializeDynamicGLBindings(GLImplementation implementation,
     GLContext* context) {
   switch (implementation) {
     case kGLImplementationOSMesaGL:
-    case kGLImplementationDesktopGL:
-    case kGLImplementationDesktopGLCoreProfile:
+   case kGLImplementationDesktopGL:
     case kGLImplementationEGLGLES2:
       InitializeDynamicGLBindingsGL(context);
       break;
     case kGLImplementationMockGL:
       if (!context) {
         scoped_refptr<GLContextStubWithExtensions> mock_context(
             new GLContextStubWithExtensions());
         mock_context->SetGLVersionString("3.0");
         InitializeDynamicGLBindingsGL(mock_context.get());
       } else
@@ skipping 19 matching lines @@
   ClearGLBindingsGLX();
   ClearGLBindingsOSMESA();
   SetGLImplementation(kGLImplementationNone);
 
   UnloadGLNativeLibraries();
 }
 
 bool GetGLWindowSystemBindingInfo(GLWindowSystemBindingInfo* info) {
   switch (GetGLImplementation()) {
     case kGLImplementationDesktopGL:
-    case kGLImplementationDesktopGLCoreProfile:
       return GetGLWindowSystemBindingInfoGLX(info);
     case kGLImplementationEGLGLES2:
       return GetGLWindowSystemBindingInfoEGL(info);
     default:
       return false;
   }
   return false;
 }
 
 }  // namespace gfx