Revert of Re-enable key silk case benchmarks on Android (https://codereview.chromium.org/279853002/)

Reason for revert:
Still failing on N5. e.g. 

http://build.chromium.org/p/chromium.perf/builders/Android%20Nexus5%20Perf/builds/393/steps/smoothness.fast_path.key_silk_cases/logs/stdio

BUG=355952

Original issue's description:
> Re-enable key silk case benchmarks on Android
> 
> All the known issues with these telemetry benchmarks have been fixed.
> 
> BUG=355952
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=270830

TBR=ernstm@chromium.org,skyostil@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=355952

Review URL: https://codereview.chromium.org/292453005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270973 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 9 insertions, 5 deletions

diff --git a/tools/perf/benchmarks/rasterize_and_record_micro.py b/tools/perf/benchmarks/rasterize_and_record_micro.py
index a5e88a3..fcf108c 100644
--- a/tools/perf/benchmarks/rasterize_and_record_micro.py
+++ b/tools/perf/benchmarks/rasterize_and_record_micro.py
@@ -9,7 +9,7 @@ from telemetry import test
 
 # RasterizeAndRecord disabled on mac because of crbug.com/350684.
 # RasterizeAndRecord disabled on windows because of crbug.com/338057.
-@test.Disabled('mac', 'win')
+@test.Disabled('android', 'mac', 'win')  # android tracked by crbug.com/371148
 class RasterizeAndRecordMicroTop25(test.Test):
   """Measures rasterize and record performance on the top 25 web pages.
 
@@ -18,7 +18,7 @@ class RasterizeAndRecordMicroTop25(test.Test):
   page_set = 'page_sets/top_25.py'
 
 
-@test.Disabled('mac', 'win')
+@test.Disabled('android', 'mac', 'win')  # android tracked by crbug.com/371148
 class RasterizeAndRecordMicroKeyMobileSites(test.Test):
   """Measures rasterize and record performance on the key mobile sites.
 
@@ -27,7 +27,7 @@ class RasterizeAndRecordMicroKeyMobileSites(test.Test):
   page_set = 'page_sets/key_mobile_sites.py'
 
 
-@test.Disabled('mac', 'win')
+@test.Disabled('android', 'mac', 'win')
 class RasterizeAndRecordMicroKeySilkCases(test.Test):
   """Measures rasterize and record performance on the silk sites.
 
@@ -36,7 +36,7 @@ class RasterizeAndRecordMicroKeySilkCases(test.Test):
   page_set = 'page_sets/key_silk_cases.py'
 
 
-@test.Disabled('mac', 'win')
+@test.Disabled('android', 'mac', 'win')
 class RasterizeAndRecordMicroFastPathKeySilkCases(test.Test):
   """Measures rasterize and record performance on the silk sites.
 
@@ -50,7 +50,7 @@ class RasterizeAndRecordMicroFastPathKeySilkCases(test.Test):
     silk_flags.CustomizeBrowserOptionsForFastPath(options)
 
 
-@test.Disabled('mac', 'win')
+@test.Disabled('android', 'mac', 'win')
 class RasterizeAndRecordMicroFastPathGpuRasterizationKeySilkCases(test.Test):
   """Measures rasterize and record performance on the silk sites.
 
diff --git a/tools/perf/benchmarks/smoothness.py b/tools/perf/benchmarks/smoothness.py
index 341efa4..292ed60 100644
--- a/tools/perf/benchmarks/smoothness.py
+++ b/tools/perf/benchmarks/smoothness.py
@@ -46,6 +46,7 @@ class SmoothnessToughAnimationCases(test.Test):
   page_set = 'page_sets/tough_animation_cases.py'
 
 
+@test.Disabled('android')  # crbug.com/355952
 class SmoothnessKeySilkCases(test.Test):
   """Measures rendering statistics for the key silk cases without GPU
   rasterization
@@ -54,6 +55,7 @@ class SmoothnessKeySilkCases(test.Test):
   page_set = 'page_sets/key_silk_cases.py'
 
 
+@test.Disabled('android')  # crbug.com/355952
 class SmoothnessFastPathKeySilkCases(test.Test):
   """Measures rendering statistics for the key silk cases without GPU
   rasterization using bleeding edge rendering fast paths.
@@ -88,6 +90,7 @@ class SmoothnessGpuRasterizationKeyMobileSites(test.Test):
     silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
 
 
+@test.Disabled('android')  # crbug.com/355952
 class SmoothnessGpuRasterizationKeySilkCases(test.Test):
   """Measures rendering statistics for the key silk cases with GPU rasterization
   """
@@ -98,6 +101,7 @@ class SmoothnessGpuRasterizationKeySilkCases(test.Test):
     silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
 
 
+@test.Disabled('android')  # crbug.com/355952
 class SmoothnessFastPathGpuRasterizationKeySilkCases(
     SmoothnessGpuRasterizationKeySilkCases):
   """Measures rendering statistics for the key silk cases with GPU rasterization