On Linux rework driver_version/vendor extraction from gl version

content/test/gpu/page_sets/gpu_process_tests.py

 # Copyright 2014 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.
 import sys
 from telemetry.story import story_set as story_set_module
 from telemetry.page import page_test
 
 from gpu_tests import gpu_test_base
 
 class GpuProcessSharedPageState(gpu_test_base.GpuSharedPageState):
@@ skipping 201 matching lines @@
 
 class SoftwareGpuProcessSharedPageState(GpuProcessSharedPageState):
   def __init__(self, test, finder_options, story_set):
     super(SoftwareGpuProcessSharedPageState, self).__init__(
       test, finder_options, story_set)
     options = finder_options.browser_options
     options.AppendExtraBrowserArgs('--gpu-testing-vendor-id=0x10de')
     options.AppendExtraBrowserArgs('--gpu-testing-device-id=0x0de1')
     options.AppendExtraBrowserArgs('--gpu-testing-gl-vendor=VMware')
     options.AppendExtraBrowserArgs('--gpu-testing-gl-renderer=SVGA3D')
-    options.AppendExtraBrowserArgs('--gpu-testing-gl-version="2.1 Mesa 10.1"')
+    options.AppendExtraBrowserArgs('--gpu-testing-gl-version=2.1 Mesa 10.1')
 
 
 class SoftwareGpuProcessPage(gpu_test_base.PageBase):
 
   def __init__(self, story_set, expectations):
     super(SoftwareGpuProcessPage, self).__init__(
       url='about:blank',
       name='GpuProcess.software_gpu_process',
       page_set=story_set,
       shared_page_state_class=SoftwareGpuProcessSharedPageState,
@@ skipping 57 matching lines @@
       # Hit id 51 and 87 from kGpuDriverBugListJson.
       options.AppendExtraBrowserArgs('--gpu-testing-vendor-id=0x1002')
       options.AppendExtraBrowserArgs('--gpu-testing-device-id=0x6779')
       options.AppendExtraBrowserArgs('--gpu-testing-driver-date=11-20-2014')
       options.AppendExtraBrowserArgs('--gpu-testing-gl-vendor=Google Inc.')
       options.AppendExtraBrowserArgs('--gpu-testing-gl-renderer=ANGLE ' \
         '(AMD Radeon HD 6450 Direct3D11 vs_5_0 ps_5_0)')
       options.AppendExtraBrowserArgs('--gpu-testing-gl-version=OpenGL ES 2.0 ' \
         '(ANGLE 2.1.0.0c0d8006a9dd)')
     elif sys.platform.startswith('linux'):
-      # Hit id 153 from kGpuDriverBugListJson.
+      # Hit id 40 from kGpuDriverBugListJson.
       options.AppendExtraBrowserArgs('--gpu-testing-vendor-id=0x0101')
       options.AppendExtraBrowserArgs('--gpu-testing-device-id=0x0102')
-      options.AppendExtraBrowserArgs('--gpu-testing-gl-vendor=Vivante ' \
-        'Corporation')
-      options.AppendExtraBrowserArgs('--gpu-testing-gl-renderer=Vivante GC1000')
+      options.AppendExtraBrowserArgs('--gpu-testing-gl-vendor=ARM')
+      options.AppendExtraBrowserArgs('--gpu-testing-gl-renderer=Mali-400 MP')
     elif sys.platform == 'darwin':
       # Currently on osx no workaround relies on gl-renderer.
       pass
 
 
 class DriverBugWorkaroundsUponGLRendererPage(DriverBugWorkaroundsTestsPage):
   def __init__(self, story_set, expectations):
     self.expected_workaround = None
     self.unexpected_workaround = None
 
     if sys.platform in ('cygwin', 'win32'):
       self.expected_workaround = "texsubimage_faster_than_teximage"
       self.unexpected_workaround = "disable_d3d11"
     elif sys.platform.startswith('linux'):
-      self.expected_workaround = "disable_transparent_visuals"
+      self.expected_workaround = "disable_discard_framebuffer"
     elif sys.platform == 'darwin':
       pass
     super(DriverBugWorkaroundsUponGLRendererPage, self).__init__(
       name='GpuProcess.driver_bug_workarounds_upon_gl_renderer',
       page_set=story_set,
       shared_page_state_class=DriverBugWorkaroundsUponGLRendererShared,
       expectations=expectations,
       expected_workaround=self.expected_workaround,
       unexpected_workaround=self.unexpected_workaround)
 
@@ skipping 275 matching lines @@
     if not is_platform_android:
       self.AddStory(SkipGpuProcessPage(self, expectations))
       self.AddStory(HasTransparentVisualsGpuProcessPage(self, expectations))
       self.AddStory(NoTransparentVisualsGpuProcessPage(self, expectations))
 
   @property
   def allow_mixed_story_states(self):
     # Return True here in order to be able to run pages with different browser
     # command line arguments.
     return True