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

ui/gl/gl_implementation_x11.cc

Index: ui/gl/gl_implementation_x11.cc
diff --git a/ui/gl/gl_implementation_x11.cc b/ui/gl/gl_implementation_x11.cc
index 32fd369f6fb9a7a06a3d178abbf0c9584e671dd9..b8a724649f8c0cfe91e10586718d78e7695acd8a 100644
--- a/ui/gl/gl_implementation_x11.cc
+++ b/ui/gl/gl_implementation_x11.cc
@@ -43,10 +43,6 @@
 }  // 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);
@@ -67,8 +63,7 @@
   switch (implementation) {
     case kGLImplementationOSMesaGL:
       return InitializeStaticGLBindingsOSMesaGL();
-    case kGLImplementationDesktopGL:
-    case kGLImplementationDesktopGLCoreProfile: {
+    case kGLImplementationDesktopGL: {
       base::NativeLibrary library = NULL;
       const base::CommandLine* command_line =
           base::CommandLine::ForCurrentProcess();
@@ -96,7 +91,7 @@
 
       SetGLGetProcAddressProc(get_proc_address);
       AddGLNativeLibrary(library);
-      SetGLImplementation(implementation);
+      SetGLImplementation(kGLImplementationDesktopGL);
 
       InitializeStaticGLBindingsGL();
       InitializeStaticGLBindingsGLX();
@@ -156,8 +151,7 @@
     GLContext* context) {
   switch (implementation) {
     case kGLImplementationOSMesaGL:
-    case kGLImplementationDesktopGL:
-    case kGLImplementationDesktopGLCoreProfile:
+   case kGLImplementationDesktopGL:
     case kGLImplementationEGLGLES2:
       InitializeDynamicGLBindingsGL(context);
       break;
@@ -197,7 +191,6 @@
 bool GetGLWindowSystemBindingInfo(GLWindowSystemBindingInfo* info) {
   switch (GetGLImplementation()) {
     case kGLImplementationDesktopGL:
-    case kGLImplementationDesktopGLCoreProfile:
       return GetGLWindowSystemBindingInfoGLX(info);
     case kGLImplementationEGLGLES2:
       return GetGLWindowSystemBindingInfoEGL(info);