Revert of Fix a few gpu tests 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 156 matching lines @@
     if len(system_info.gpu.aux_attributes['gl_renderer']) <= 0:
       raise page_test.Failure('Must have a non-empty gl_renderer string')
 
 
 class NoGpuProcessSharedPageState(GpuProcessSharedPageState):
   def __init__(self, test, finder_options, story_set):
     super(NoGpuProcessSharedPageState, self).__init__(
       test, finder_options, story_set)
     options = finder_options.browser_options
 
-    if options.browser_type.startswith('android'):
-      # Hit id 8 from kSoftwareRenderingListJson, which applies to any platform.
-      options.AppendExtraBrowserArgs('--gpu-testing-vendor-id=0x10de')
-      options.AppendExtraBrowserArgs('--gpu-testing-device-id=0x0324')
-    elif sys.platform in ('cygwin', 'win32'):
+    if sys.platform in ('cygwin', 'win32'):
       # Hit id 34 from kSoftwareRenderingListJson.
       options.AppendExtraBrowserArgs('--gpu-testing-vendor-id=0x5333')
       options.AppendExtraBrowserArgs('--gpu-testing-device-id=0x8811')
     elif sys.platform.startswith('linux'):
       # Hit id 50 from kSoftwareRenderingListJson.
       options.AppendExtraBrowserArgs('--gpu-no-complete-info-collection')
       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=softpipe')
       options.AppendExtraBrowserArgs('--gpu-testing-gl-version="2.1 Mesa 10.1"')
     elif sys.platform == 'darwin':
       # Hit id 81 from kSoftwareRenderingListJson.
       options.AppendExtraBrowserArgs('--gpu-testing-os-version=10.7')
       options.AppendExtraBrowserArgs('--gpu-testing-vendor-id=0x15ad')
       options.AppendExtraBrowserArgs('--gpu-testing-device-id=0x0393')
 
 
 class NoGpuProcessPage(gpu_test_base.PageBase):
 
-  def __init__(self, story_set, expectations, is_platform_android):
+  def __init__(self, story_set, expectations):
     super(NoGpuProcessPage, self).__init__(
       url='about:blank',
       name='GpuProcess.no_gpu_process',
       page_set=story_set,
       shared_page_state_class=NoGpuProcessSharedPageState,
       expectations=expectations)
-    self.is_platform_android = is_platform_android
 
   def Validate(self, tab, results):
-    if self.is_platform_android:
-      return
-
     has_gpu_process_js = 'chrome.gpuBenchmarking.hasGpuProcess()'
     has_gpu_process = tab.EvaluateJavaScript(has_gpu_process_js)
     if has_gpu_process:
       raise page_test.Failure('GPU process detected')
 
 
 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
-
-    # Hit exception from id 50 from kSoftwareRenderingListJson.
     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 46 matching lines @@
 
   def Validate(self, tab, results):
     super(DriverBugWorkaroundsInGpuProcessPage, self).Validate(tab, results)
 
 
 class DriverBugWorkaroundsUponGLRendererShared(GpuProcessSharedPageState):
   def __init__(self, test, finder_options, story_set):
     super(DriverBugWorkaroundsUponGLRendererShared, self).__init__(
       test, finder_options, story_set)
     options = finder_options.browser_options
-    if options.browser_type.startswith('android'):
-      # Hit id 108 from kGpuDriverBugListJson.
-      options.AppendExtraBrowserArgs('--gpu-testing-gl-vendor=Qualcomm')
-    elif sys.platform in ('cygwin', 'win32'):
+    if sys.platform in ('cygwin', 'win32'):
       # 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.
       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')
     elif sys.platform == 'darwin':
       # Currently on osx no workaround relies on gl-renderer.
       pass
 
 
 class DriverBugWorkaroundsUponGLRendererPage(DriverBugWorkaroundsTestsPage):
-  def __init__(self, story_set, expectations, is_platform_android):
+  def __init__(self, story_set, expectations):
     self.expected_workaround = None
     self.unexpected_workaround = None
 
-    if is_platform_android:
-      self.expected_workaround = "wake_up_gpu_before_drawing"
-    elif sys.platform in ('cygwin', 'win32'):
+    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"
     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,
@@ skipping 127 matching lines @@
 
   def Validate(self, tab, results):
     super(IdentifyActiveGpuPage4, self).Validate(tab, results)
 
 
 class ReadbackWebGLGpuProcessSharedPageState(GpuProcessSharedPageState):
   def __init__(self, test, finder_options, story_set):
     super(ReadbackWebGLGpuProcessSharedPageState, self).__init__(
       test, finder_options, story_set)
     options = finder_options.browser_options
-    is_platform_android = options.browser_type.startswith('android')
 
-    if sys.platform.startswith('linux') and not is_platform_android:
+    if sys.platform.startswith('linux'):
       # Hit id 110 from kSoftwareRenderingListJson.
       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=Gallium 0.4 ' \
         'on llvmpipe (LLVM 3.4, 256 bits)')
       options.AppendExtraBrowserArgs('--gpu-testing-gl-version="3.0 Mesa 11.2"')
 
 class ReadbackWebGLGpuProcessPage(gpu_test_base.PageBase):
-  def __init__(self, story_set, expectations, is_platform_android):
+  def __init__(self, story_set, expectations):
     super(ReadbackWebGLGpuProcessPage, self).__init__(
       url='chrome:gpu',
       name='GpuProcess.readback_webgl_gpu_process',
       page_set=story_set,
       shared_page_state_class=ReadbackWebGLGpuProcessSharedPageState,
       expectations=expectations)
-    self.is_platform_android = is_platform_android
 
   def Validate(self, tab, results):
-    if sys.platform.startswith('linux') and not self.is_platform_android:
+    if sys.platform.startswith('linux'):
       feature_status_js = 'browserBridge.gpuInfo.featureStatus.featureStatus'
       feature_status_list = tab.EvaluateJavaScript(feature_status_js)
       result = True
       for name, status in feature_status_list.items():
         if name == 'multiple_raster_threads':
           result = result and status == 'enabled_on'
         elif name == 'native_gpu_memory_buffers':
           result = result and status == 'disabled_software'
         elif name == 'webgl':
           result = result and status == 'enabled_readback'
@@ skipping 90 matching lines @@
        '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, is_platform_android))
+    self.AddStory(NoGpuProcessPage(self, expectations))
+    self.AddStory(SoftwareGpuProcessPage(self, expectations))
     self.AddStory(DriverBugWorkaroundsInGpuProcessPage(self, expectations))
-    self.AddStory(ReadbackWebGLGpuProcessPage(self, expectations,
-                                              is_platform_android))
-    self.AddStory(DriverBugWorkaroundsUponGLRendererPage(self, expectations,
-                                                         is_platform_android))
+    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))
     if not is_platform_android:
       self.AddStory(SkipGpuProcessPage(self, expectations))
       self.AddStory(HasTransparentVisualsGpuProcessPage(self, expectations))
       self.AddStory(NoTransparentVisualsGpuProcessPage(self, expectations))
 
-      # There is no Android multi-gpu configuration and the helper
-      # gpu_info_collector.cc::IdentifyActiveGPU is not even called.
-      self.AddStory(IdentifyActiveGpuPage1(self, expectations))
-      self.AddStory(IdentifyActiveGpuPage2(self, expectations))
-      self.AddStory(IdentifyActiveGpuPage3(self, expectations))
-      self.AddStory(IdentifyActiveGpuPage4(self, expectations))
-
-      # There is currently no entry in kSoftwareRenderingListJson that enables
-      # a software GL driver on Android.
-      self.AddStory(SoftwareGpuProcessPage(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