Abstract OSMesa from the Layout tests

content/public/test/browser_test_base.cc

Index: content/public/test/browser_test_base.cc
diff --git a/content/public/test/browser_test_base.cc b/content/public/test/browser_test_base.cc
index 32e954eee9c9fd5cba08946daefe852ed613c992..a562bf0d663a94bc5d2ad41ed10f02c24b0dffdf 100644
--- a/content/public/test/browser_test_base.cc
+++ b/content/public/test/browser_test_base.cc
@@ -236,36 +236,36 @@ void BrowserTestBase::SetUp() {
   aura::test::InitializeAuraEventGeneratorDelegate();
 #endif
 
-  bool use_osmesa = true;
+  bool use_software_gl = true;
 
-  // We usually use OSMesa as this works on all bots. The command line can
-  // override this behaviour to use hardware GL.
+  // We usually use software GL as this works on all bots. The command
+  // line can override this behaviour to use hardware GL.
   if (command_line->HasSwitch(switches::kUseGpuInTests))
-    use_osmesa = false;
+    use_software_gl = false;
 
   // Some bots pass this flag when they want to use hardware GL.
   if (command_line->HasSwitch("enable-gpu"))
-    use_osmesa = false;
+    use_software_gl = false;
 
 #if defined(OS_MACOSX)
   // On Mac we always use hardware GL.
-  use_osmesa = false;
+  use_software_gl = false;
 #endif
 
 #if defined(OS_ANDROID)
   // On Android we always use hardware GL.
-  use_osmesa = false;
+  use_software_gl = false;
 #endif
 
 #if defined(OS_CHROMEOS)
   // If the test is running on the chromeos envrionment (such as
   // device or vm bots), we use hardware GL.
   if (base::SysInfo::IsRunningOnChromeOS())
-    use_osmesa = false;
+    use_software_gl = false;
 #endif
 
-  if (use_osmesa && !use_software_compositing_)
-    command_line->AppendSwitch(switches::kOverrideUseGLWithOSMesaForTests);
+  if (use_software_gl && !use_software_compositing_)
+    command_line->AppendSwitch(switches::kOverrideUseSoftwareGLForTests);
 
   scoped_refptr<net::HostResolverProc> local_resolver =
       new LocalHostResolverProc();
@@ -399,10 +399,10 @@ void BrowserTestBase::UseSoftwareCompositing() {
   use_software_compositing_ = true;
 }
 
-bool BrowserTestBase::UsingOSMesa() const {
+bool BrowserTestBase::UsingSoftwareGL() const {
   base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
   return cmd->GetSwitchValueASCII(switches::kUseGL) ==
-         gl::kGLImplementationOSMesaName;
+         gl::GetGLImplementationName(gl::GetSoftwareGLImplementation());
 }
 
 }  // namespace content