Move ContentShell and ChromiumTestShell instrumentation tests to main waterfall.

These are non-flaky and we have sufficient capacity.

NOTRY=true

Review URL: https://codereview.chromium.org/11412079

git-svn-id: http://src.chromium.org/svn/trunk/src/build@168652 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

android/buildbot/bb_fyi_tester.sh

@@ -17,4 +17,5 @@ bb_reboot_phones
 bb_run_unit_tests
 bb_run_instrumentation_tests
 bb_run_experimental_unit_tests
+bb_run_experimental_instrumentation_tests
 bb_print_logcat

android/buildbot/bb_main_tester.sh

@@ -19,4 +19,5 @@ bb_spawn_logcat_monitor_and_status
 bb_extract_build
 bb_reboot_phones
 bb_run_unit_tests
+bb_run_instrumentation_tests
 bb_print_logcat

android/buildbot/bb_try_tester.sh

@@ -18,4 +18,5 @@ bb_spawn_logcat_monitor_and_status
 bb_extract_build
 bb_reboot_phones
 bb_run_unit_tests
+bb_run_instrumentation_tests
 bb_print_logcat

android/buildbot/buildbot_functions.sh

@@ -319,6 +319,10 @@ function bb_run_instrumentation_tests {
       "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"
 }