Fix ineffective --disable-gpu-driver-bug-workarounds

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 551 matching lines @@
       shared_page_state_class=NoTransparentVisualsShared,
       expectations=expectations,
       expected_workaround='disable_transparent_visuals',
       unexpected_workaround=None)
 
   def Validate(self, tab, results):
     if sys.platform.startswith('linux'):
       super(NoTransparentVisualsGpuProcessPage, self).Validate(tab, results)
 
 
+class OnlyOneWorkaroundSharedPageState(GpuProcessSharedPageState):
+  def __init__(self, test, finder_options, story_set):
+    super(OnlyOneWorkaroundSharedPageState, self).__init__(
+      test, finder_options, story_set)
+    options = finder_options.browser_options
+    options.AppendExtraBrowserArgs('--disable-gpu-driver-bug-workarounds')
+    options.AppendExtraBrowserArgs('--use_gpu_driver_workaround_for_testing')
+
+class OnlyOneWorkaroundPage(gpu_test_base.PageBase):
+  def __init__(self, story_set, expectations):
+    super(OnlyOneWorkaroundPage, self).__init__(
+      url='chrome:gpu',
+      name='GpuProcess.only_one_workaround',
+      page_set=story_set,
+      shared_page_state_class=OnlyOneWorkaroundSharedPageState,
+      expectations=expectations)
+
+  def Validate(self, tab, results):
+    browser_list = tab.EvaluateJavaScript('GetDriverBugWorkarounds()')
+    gpu_list = tab.EvaluateJavaScript( \
+      'chrome.gpuBenchmarking.getGpuDriverBugWorkarounds()')
+
+    if browser_list != ['use_gpu_driver_workaround_for_testing'] or \
+       gpu_list != browser_list:
+      print 'Test failed. Printing page contents:'
+      print tab.EvaluateJavaScript('document.body.innerHTML')
+      raise page_test.Failure('Browser or GPU process lists are not reduced ' \
+        'to only force_discrete_gpu workaround: %s != %s' % \

[Ken Russell (switch to Gerrit), 2016/08/01 21:53:50]

Should this be "to only use_gpu_driver_workaround_for_testing"?

[Julien Isorce Samsung, 2016/08/02 13:12:19]

Done, thx!

+        (browser_list, gpu_list))
+
+
 class GpuProcessTestsStorySet(story_set_module.StorySet):
 
   """ Tests that accelerated content triggers the creation of a GPU process """
 
   def __init__(self, expectations, is_platform_android):
     super(GpuProcessTestsStorySet, self).__init__(
       serving_dirs=set(['../../../../content/test/data']))
 
     urls_and_names_list = [
       ('file://../../data/gpu/functional_canvas_demo.html',
@@ skipping 13 matching lines @@
     self.AddStory(SoftwareGpuProcessPage(self, expectations))
     self.AddStory(DriverBugWorkaroundsInGpuProcessPage(self, expectations))
     self.AddStory(IdentifyActiveGpuPage1(self, expectations))
     self.AddStory(IdentifyActiveGpuPage2(self, expectations))
     self.AddStory(IdentifyActiveGpuPage3(self, expectations))
     self.AddStory(IdentifyActiveGpuPage4(self, expectations))
     self.AddStory(ReadbackWebGLGpuProcessPage(self, expectations))
     self.AddStory(DriverBugWorkaroundsUponGLRendererPage(self, expectations))
     self.AddStory(EqualBugWorkaroundsInBrowserAndGpuProcessPage(self,
                                                                 expectations))
+    self.AddStory(OnlyOneWorkaroundPage(self, expectations))
+
     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