Move installation of ContentShell.

build/android/buildbot/bb_device_steps.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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 collections
 import glob
 import hashlib
 import json
 import os
@@ skipping 438 matching lines @@
 
 def RunWebRTCChromiumTests(options):
   RunTestSuites(options, gtest_config.WEBRTC_CHROMIUM_TEST_SUITES)
 
 
 def RunWebRTCNativeTests(options):
   RunTestSuites(options, gtest_config.WEBRTC_NATIVE_TEST_SUITES)
 
 
 def RunGPUTests(options):
-  InstallApk(options, INSTRUMENTATION_TESTS['ContentShell'], False)
+  revision = _GetRevision(options)
+  builder_name = options.build_properties.get('buildername', 'noname')
 
-  bb_annotations.PrintNamedStep('gpu_tests')
-  revision = _GetRevision(options)
+  bb_annotations.PrintNamedStep('pixel_tests')
   RunCmd(['content/test/gpu/run_gpu_test.py',
           'pixel',
           '--browser',
           'android-content-shell',
           '--build-revision',
           str(revision),
           '--upload-refimg-to-cloud-storage',
           '--refimg-cloud-storage-bucket',
           'chromium-gpu-archive/reference-images',
           '--os-type',
           'android',
           '--test-machine-name',
-          EscapeBuilderName(
-              options.build_properties.get('buildername', 'noname'))])
+          EscapeBuilderName(builder_name)])
 
   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'])
 
 
 def GetTestStepCmds():
   return [
       ('chromedriver', RunChromeDriverTests),
@@ skipping 174 matching lines @@
   setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
   if options.coverage_bucket:
     setattr(options, 'coverage_dir',
             os.path.join(CHROME_OUT_DIR, options.target, 'coverage'))
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))