Revert 273386 "Add gpu-rasterization test to Android gpu testbot."

trunk/src/build/android/buildbot/bb_device_steps.py

Index: trunk/src/build/android/buildbot/bb_device_steps.py
===================================================================
--- trunk/src/build/android/buildbot/bb_device_steps.py	(revision 273425)
+++ trunk/src/build/android/buildbot/bb_device_steps.py	(working copy)
@@ -456,10 +456,10 @@
 
 
 def RunGPUTests(options):
-  revision = _GetRevision(options)
-  builder_name = options.build_properties.get('buildername', 'noname')
+  InstallApk(options, INSTRUMENTATION_TESTS['ContentShell'], False)
 
-  bb_annotations.PrintNamedStep('pixel_tests')
+  bb_annotations.PrintNamedStep('gpu_tests')
+  revision = _GetRevision(options)
   RunCmd(['content/test/gpu/run_gpu_test.py',
           'pixel',
           '--browser',
@@ -472,24 +472,15 @@
           '--os-type',
           'android',
           '--test-machine-name',
-          EscapeBuilderName(builder_name)])
+          EscapeBuilderName(
+              options.build_properties.get('buildername', 'noname'))])
 
   bb_annotations.PrintNamedStep('webgl_conformance_tests')
   RunCmd(['content/test/gpu/run_gpu_test.py',
           '--browser=android-content-shell', 'webgl_conformance',
           '--webgl-conformance-version=1.0.1'])
 
-  bb_annotations.PrintNamedStep('gpu_rasterization_tests')
-  RunCmd(['content/test/gpu/run_gpu_test.py',
-          'gpu_rasterization',
-          '--browser',
-          'android-content-shell',
-          '--build-revision',
-          str(revision),
-          '--test-machine-name',
-          EscapeBuilderName(builder_name)])
 
-
 def GetTestStepCmds():
   return [
       ('chromedriver', RunChromeDriverTests),