Add GpuFeatureBrowserTests to gpu bots.

BUG=
TEST=gpu bots
R=jbates
Review URL: https://chromiumcodereview.appspot.com/9562031

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

chrome/chrome_tests.gypi

@@ -4097,6 +4097,7 @@
       'sources': [
         'test/base/chrome_test_launcher.cc',
         'test/gpu/gpu_crash_browsertest.cc',
+        'test/gpu/gpu_feature_browsertest.cc',
         'test/gpu/gpu_pixel_browsertest.cc',
         'test/gpu/webgl_conformance_tests.cc',
         'test/gpu/webgl_conformance_test_list_autogen.h',

chrome/test/gpu/gpu_feature_browsertest.cc

@@ -47,7 +47,7 @@ class GpuFeatureTest : public InProcessBrowserTest {
     InProcessBrowserTest::SetUpCommandLine(command_line);
 
     // Do not use mesa if real GPU is required.
-    if (!command_line->HasSwitch("enable-gpu")) {
+    if (!command_line->HasSwitch("use-gpu-in-tests")) {
 #if !defined(OS_MACOSX)
       CHECK(test_launcher_utils::OverrideGLImplementation(
           command_line, gfx::kGLImplementationOSMesaName)) <<