Move ContentShell and ChromiumTestShell instrumentation tests to main waterfall.

build/android/buildbot/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 301 matching lines @@
   bb_run_step python build/android/run_instrumentation_tests.py \
       -vvv --test-apk ${TEST_APK} -I
 }
 
 # Run instrumentation tests for all relevant APKs on device.
 function bb_run_instrumentation_tests {
   bb_run_all_instrumentation_tests_for_apk "ContentShell.apk" \
       "org.chromium.content_shell" "ContentShellTest"
   bb_run_all_instrumentation_tests_for_apk "ChromiumTestShell.apk" \
       "org.chromium.chrome.testshell" "ChromiumTestShellTest"
+}
+
+# Run instrumentation tests for experimental APKs on device.
+function bb_run_experimental_instrumentation_tests {
   bb_run_all_instrumentation_tests_for_apk "AndroidWebView.apk" \
       "org.chromium.android_webview" "AndroidWebViewTest"
 }
 
 # 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,gen,android_webview,jingle_unittests" \
@@ skipping 58 matching lines @@
   )
 }
 
 # Retrieve a packed json property using python
 function bb_get_json_prop {
   local JSON="$1"
   local PROP="$2"
 
   python -c "import json; print json.loads('$JSON').get('$PROP', '')"
 }