Android: replace temporary test runner with the instrumentation runner.

build/android/buildbot_functions.sh

 #!/bin/bash
 # Copyright (c) 2012 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.
 #
 # Bash functions used by buildbot annotator scripts for the android
 # build of chromium.  Executing this script should not perform actions
 # other than setting variables and defining of functions.
 
 # Number of jobs on the compile line; e.g.  make -j"${JOBS}"
@@ skipping 236 matching lines @@
   build/android/run_tests.py -e --xvfb --verbose
 }
 
 # Run tests on an actual device.  (Better have one plugged in!)
 function bb_run_tests {
   python build/android/device_status_check.py
   echo "@@@BUILD_STEP Run Tests on actual hardware@@@"
   build/android/run_tests.py --xvfb --verbose
 }
 
-# Run simple content shell test on device.
-function bb_run_content_shell_test {
-  echo "@@@BUILD_STEP Run simple content shell test on actual hardware@@@"
-  content/shell/android/simple_content_shell_test.sh \
-    "${SRC_ROOT}"/out/Release/content_shell/ContentShell-debug.apk
-}
-
 # Run instrumentation test.
 # Args:
 #   $1: TEST_APK.
 #   $2: EXTRA_FLAGS to be passed to run_instrumentation_tests.py.
 function bb_run_instrumentation_test {
   local TEST_APK=${1}
   local EXTRA_FLAGS=${2}
   local APK_NAME=$(basename ${TEST_APK})
   echo "@@@BUILD_STEP Android Instrumentation ${APK_NAME} ${EXTRA_FLAGS} "\
        "on actual hardware@@@"
   local INSTRUMENTATION_FLAGS="-vvv"
   INSTRUMENTATION_FLAGS+=" --test-apk ${TEST_APK}"
   INSTRUMENTATION_FLAGS+=" ${EXTRA_FLAGS}"
   build/android/run_instrumentation_tests.py ${INSTRUMENTATION_FLAGS}
 }
 
 # Run content shell instrumentation test on device.
 function bb_run_content_shell_instrumentation_test {
   build/android/adb_install_content_shell
   local TEST_APK="content_shell_test/ContentShellTest-debug"
   # Use -I to install the test apk only on the first run.
+  # TODO(bulach): remove the second once we have a Smoke test.
   bb_run_instrumentation_test ${TEST_APK} "-I -A Smoke"
-  bb_run_instrumentation_test ${TEST_APK} "-A SmallTest"
+  bb_run_instrumentation_test ${TEST_APK} "-I -A SmallTest"
   bb_run_instrumentation_test ${TEST_APK} "-A MediumTest"
   bb_run_instrumentation_test ${TEST_APK} "-A LargeTest"
 }
 
 # Zip and archive a build.
 function bb_zip_build {
   echo "@@@BUILD_STEP Zip build@@@"
   python ../../../../scripts/slave/zip_build.py \
     --src-dir "$SRC_ROOT" \
     --exclude-files "lib.target" \
@@ skipping 22 matching lines @@
     --factory-properties "$FACTORY_PROPERTIES" \
     --build-properties "$BUILD_PROPERTIES"
   extract_exitcode=$?
   if (( $extract_exitcode > 1 )); then
     echo "@@@STEP_WARNINGS@@@"
     return
   fi
   return $extract_exitcode
   )
 }