Revert of Fix a few gpu tests on Android

content/test/gpu/page_sets/gpu_process_tests.py

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 ddfdd71199b52a17a4e96f8b783441a223237611..87fa7e5136ec0845dcf02fe27de234f696822cd6 100644
--- a/content/test/gpu/page_sets/gpu_process_tests.py
+++ b/content/test/gpu/page_sets/gpu_process_tests.py
@@ -174,11 +174,7 @@
       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')
@@ -199,19 +195,15 @@
 
 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
-
+
+  def Validate(self, tab, results):
     has_gpu_process_js = 'chrome.gpuBenchmarking.hasGpuProcess()'
     has_gpu_process = tab.EvaluateJavaScript(has_gpu_process_js)
     if has_gpu_process:
@@ -223,13 +215,11 @@
     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):
@@ -296,10 +286,7 @@
     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')
@@ -322,13 +309,11 @@
 
 
 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'):
@@ -476,9 +461,8 @@
     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')
@@ -488,17 +472,16 @@
       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:
+
+  def Validate(self, tab, results):
+    if sys.platform.startswith('linux'):
       feature_status_js = 'browserBridge.gpuInfo.featureStatus.featureStatus'
       feature_status_list = tab.EvaluateJavaScript(feature_status_js)
       result = True
@@ -609,12 +592,15 @@
 
     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:
@@ -622,17 +608,6 @@
       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