Revert 119457 - --test-gl-lib for GpuPixelBrowserTests

This CL causes the GpuPixelBrowserTests to load libllvmpipe.so (if it is available) and fallback to standard libGL.so otherwise. This is so that we can (ultimately) do a smoke test of the GPU accelerated display path on the Aura dbg bot on the Chromium waterfall.

BUG=none
TEST=none


Review URL: http://codereview.chromium.org/9169100

TBR=backer@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9225029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119468 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 5 insertions, 21 deletions

diff --git a/ui/gfx/gl/gl_implementation_linux.cc b/ui/gfx/gl/gl_implementation_linux.cc
index b2f81a0..9819b2b 100644
--- a/ui/gfx/gl/gl_implementation_linux.cc
+++ b/ui/gfx/gl/gl_implementation_linux.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -13,7 +13,6 @@
 #include "base/threading/thread_restrictions.h"
 #include "ui/gfx/gl/gl_bindings.h"
 #include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_switches.h"
 
 namespace gfx {
 namespace {
@@ -70,8 +69,6 @@ bool InitializeGLBindings(GLImplementation implementation) {
   // one-time initialization cost is small, between 2 and 5 ms.
   base::ThreadRestrictions::ScopedAllowIO allow_io;
 
-  const CommandLine* command_line = CommandLine::ForCurrentProcess();
-
   switch (implementation) {
 #if !defined(USE_WAYLAND)
     case kGLImplementationOSMesaGL: {
@@ -105,19 +102,11 @@ bool InitializeGLBindings(GLImplementation implementation) {
       break;
     }
     case kGLImplementationDesktopGL: {
-      base::NativeLibrary library = NULL;
-      if (command_line->HasSwitch(switches::kTestGLLib))
-        library = LoadLibrary(command_line->GetSwitchValueASCII(
-            switches::kTestGLLib).c_str());
-
-      if (!library) {
 #if defined(OS_OPENBSD)
-        library = LoadLibrary("libGL.so");
+      base::NativeLibrary library = LoadLibrary("libGL.so");
 #else
-        library = LoadLibrary("libGL.so.1");
+      base::NativeLibrary library = LoadLibrary("libGL.so.1");
 #endif
-      }
-
       if (!library)
         return false;
 
diff --git a/ui/gfx/gl/gl_switches.cc b/ui/gfx/gl/gl_switches.cc
index eb095eb..2fed5ee 100644
--- a/ui/gfx/gl/gl_switches.cc
+++ b/ui/gfx/gl/gl_switches.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -39,8 +39,4 @@ const char kSwiftShaderPath[]               = "swiftshader-path";
 // context will never be lost in any situations, say, a GPU reset.
 const char kGpuNoContextLost[]              = "gpu-no-context-lost";
 
-// Flag used for Linux tests: for desktop GL bindings, try to load this GL
-// library first, but fall back to regular library if loading fails.
-const char kTestGLLib[]                        = "test-gl-lib";
-
 }  // namespace switches
diff --git a/ui/gfx/gl/gl_switches.h b/ui/gfx/gl/gl_switches.h
index 6f4460e..ed6df57 100644
--- a/ui/gfx/gl/gl_switches.h
+++ b/ui/gfx/gl/gl_switches.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -30,7 +30,6 @@ GL_EXPORT extern const char kEnableGPUClientLogging[];
 GL_EXPORT extern const char kGpuNoContextLost[];
 GL_EXPORT extern const char kUseGL[];
 GL_EXPORT extern const char kSwiftShaderPath[];
-GL_EXPORT extern const char kTestGLLib[];
 
 }  // namespace switches