Reland Switch Android gtests to use generated wrapper scripts

scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Builder__dbg_.json

Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Builder__dbg_.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Builder__dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Builder__dbg_.json
index 5b5e73603061d4eb04911614c1e4e433a3a6070e..dbcbf3de6e49a962c8138619e807e5696289d127 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Builder__dbg_.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Builder__dbg_.json
@@ -259,35 +259,55 @@
       "[SLAVE_BUILD]/src/build/goma/client",
       "--",
       "android_webview_test_apk",
+      "android_webview_unittests",

[kjellander_chromium, 2016/04/13 05:49:32]

So, I verified that for the GN build, the run_ scripts are only generated when
building the non-suffixed targets.

Even if base_unittests_apk depends on base_unittests (see
https://code.google.com/p/chromium/codesearch#chromium/src/base/base.gyp&l=1642)
it doesn't generate the run_ scripts when building only that target.

I think the ideal solution would be to fix that problem instead, and then reland
PS#1 of this CL, since these additions adds noise and a bit of confusion for the
future.

[agrieve, 2016/04/13 13:56:02]

I debated going this route, but I think we eventually want to move the recipes
over to not use the "_apk" target at all. since that's what developers build,
and that's what non-android platforms use.

I've added a TODO in this patchset pointing out that the _apk version should be
removed once we transition (although we'll likely need to add an exception for
webrtc if you're not looking at migrating soon?)

[kjellander_chromium, 2016/04/13 15:21:36]

That sounds even better! Many times I have built the non-suffixed target and
been confused why my test won't run. I imagine many others have experienced the
same.
Sounds good! Having this in a transition period is certainly unavoidable.
Did you forget to upload the new patch set?
We'll be happy to migrate over from the suffixed _apk targets as soon as we get
the chance, so I have no intention of slowing you down on that.

       "android_webview_unittests_apk",
+      "base_unittests",
       "base_unittests_apk",
       "breakpad_unittests_deps",
+      "cc_unittests",
       "cc_unittests_apk",
       "chrome_junit_tests",
       "chrome_public_test_apk",
       "chrome_sync_shell_test_apk",
       "chromedriver_webview_shell_apk",
+      "components_unittests",
       "components_unittests_apk",
+      "content_browsertests",
       "content_browsertests_apk",
       "content_junit_tests",
       "content_shell_test_apk",
+      "content_unittests",
       "content_unittests_apk",
+      "events_unittests",
       "events_unittests_apk",
+      "gfx_unittests",
       "gfx_unittests_apk",
+      "gl_tests",
       "gl_tests_apk",
+      "gpu_unittests",
       "gpu_unittests_apk",
+      "ipc_tests",
       "ipc_tests_apk",
       "junit_unit_tests",
+      "media_unittests",
       "media_unittests_apk",
+      "net_unittests",
       "net_unittests_apk",
       "remoting_test_apk",
+      "remoting_unittests",
       "remoting_unittests_apk",
       "sandbox_linux_unittests_deps",
+      "sql_unittests",
       "sql_unittests_apk",
+      "sync_unit_tests",
       "sync_unit_tests_apk",
+      "ui_android_unittests",
       "ui_android_unittests_apk",
+      "ui_base_unittests",
       "ui_base_unittests_apk",
+      "ui_touch_selection_unittests",
       "ui_touch_selection_unittests_apk",
+      "unit_tests",
       "unit_tests_apk"
     ],
     "cwd": "[SLAVE_BUILD]",