Prevent skip_gpu_process from running on Android

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 484 matching lines @@
         else:
           result = result and status == 'unavailable_software'
       if not result:
         raise page_test.Failure('WebGL readback setup failed: %s' \
           % feature_status_list)
 
 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']))
 
     urls_and_names_list = [
       ('file://../../data/gpu/functional_canvas_demo.html',
        'GpuProcess.canvas2d'),
       ('file://../../data/gpu/functional_3d_css.html',
        'GpuProcess.css3d'),
       ('file://../../data/gpu/functional_webgl.html',
        'GpuProcess.webgl')
     ]
 
     for url, name in urls_and_names_list:
       self.AddStory(GpuProcessTestsPage(url, name, self, expectations))
 
     self.AddStory(FunctionalVideoPage(self, expectations))
     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))
     self.AddStory(IdentifyActiveGpuPage3(self, expectations))
     self.AddStory(IdentifyActiveGpuPage4(self, expectations))
     self.AddStory(ReadbackWebGLGpuProcessPage(self, expectations))
     self.AddStory(DriverBugWorkaroundsUponGLRendererPage(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