| Index: content/test/gpu/page_sets/gpu_process_tests.py
|
| diff --git a/content/test/gpu/page_sets/gpu_process_tests.py b/content/test/gpu/page_sets/gpu_process_tests.py
|
| index b227fbe42f6c4519aea091ee8396f18094507ac6..441558277498b7c51e5201e9c0e9c1402422950c 100644
|
| --- a/content/test/gpu/page_sets/gpu_process_tests.py
|
| +++ b/content/test/gpu/page_sets/gpu_process_tests.py
|
| @@ -502,7 +502,7 @@ class GpuProcessTestsStorySet(story_set_module.StorySet):
|
|
|
| """ Tests that accelerated content triggers the creation of a GPU process """
|
|
|
| - def __init__(self, expectations):
|
| + def __init__(self, expectations, is_platform_android):
|
| super(GpuProcessTestsStorySet, self).__init__(
|
| serving_dirs=set(['../../../../content/test/data']))
|
|
|
| @@ -522,8 +522,8 @@ class GpuProcessTestsStorySet(story_set_module.StorySet):
|
| self.AddStory(GpuInfoCompletePage(self, expectations))
|
| self.AddStory(NoGpuProcessPage(self, expectations))
|
| self.AddStory(SoftwareGpuProcessPage(self, expectations))
|
| - #TODO(cblume): no good way to skip this test. crbug.com/611629
|
| - #self.AddStory(SkipGpuProcessPage(self, expectations))
|
| + if not is_platform_android:
|
| + self.AddStory(SkipGpuProcessPage(self, expectations))
|
| self.AddStory(DriverBugWorkaroundsInGpuProcessPage(self, expectations))
|
| self.AddStory(IdentifyActiveGpuPage1(self, expectations))
|
| self.AddStory(IdentifyActiveGpuPage2(self, expectations))
|
|
|