Abstract OSMesa from the Layout tests

content/public/test/browser_test_base.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_TEST_BROWSER_TEST_BASE_H_
 #define CONTENT_PUBLIC_TEST_BROWSER_TEST_BASE_H_
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/threading/thread.h"
@@ skipping 103 matching lines @@
   // returns.
   void PostTaskToInProcessRendererAndWait(const base::Closure& task);
 
   // Call this before SetUp() to cause the test to generate pixel output.
   void EnablePixelOutput();
 
   // Call this before SetUp() to not use GL, but use software compositing
   // instead.
   void UseSoftwareCompositing();
 
-  // Returns true if the test will be using GL acceleration via OSMesa.
-  bool UsingOSMesa() const;
+  // Returns true if the test will be using GL acceleration via a software GL.
+  bool UsingSoftwareGL() const;
 
  private:
   void ProxyRunTestOnMainThreadLoop();
 
   // Testing server, started on demand.
   std::unique_ptr<net::SpawnedTestServer> spawned_test_server_;
 
   // Embedded test server, cheap to create, started on demand.
   std::unique_ptr<net::EmbeddedTestServer> embedded_test_server_;
 
@@ skipping 16 matching lines @@
   bool set_up_called_;
 
 #if defined(OS_POSIX)
   bool handle_sigterm_;
 #endif
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_BROWSER_TEST_BASE_H_