[android] Remove unnecessary install of AndroidWebViewTest.apk on bots.

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 multiprocessing
 import os
@@ skipping 144 matching lines @@
 def InstallApk(options, test, print_step=False):
   """Install an apk to all phones.
 
   Args:
     options: options object
     test: An I_TEST namedtuple
     print_step: Print a buildbot step
   """
   if print_step:
     bb_annotations.PrintNamedStep('install_%s' % test.name.lower())
-  # TODO(gkanwar): Quick hack to make sure AndroidWebViewTest.apk is replaced
-  # before AndroidWebView.apk is. This can be removed once the bots cycle.
-  args = ['--apk', '%s.apk' % test.test_apk]
-  if options.target == 'Release':
-    args.append('--release')
-
-  RunCmd(['build/android/adb_install_apk.py'] + args, halt_on_failure=True)
 
   args = ['--apk', test.apk, '--apk_package', test.apk_package]
   if options.target == 'Release':
     args.append('--release')
 
   RunCmd(['build/android/adb_install_apk.py'] + args, halt_on_failure=True)
 
 
 def RunInstrumentationSuite(options, test, flunk_on_failure=True,
                             python_only=False, official_build=False):
@@ skipping 316 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))