This has been on my to-do-in-the-distant-future list for a looooong time. It'd let us make a bunch of simplifications.

Will take a look - I need my CL back in repo!

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/df8e1f2a83f9a1a02e1182a25262b0b55b5420e9

commit df8e1f2a83f9a1a02e1182a25262b0b55b5420e9
Author: Andrew Grieve <agrieve@chromium.org>
Date: Wed Nov 07 19:11:40 2018

test_runner.py: Fix --wait-for-java-debugger when no under_test apk exists

Bug:  841628 
Change-Id: I8bc446018bb19d6218c07f397fe96650e0a4ea4a
Reviewed-on: https://chromium-review.googlesource.com/c/1322353
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: agrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606102}
[modify] https://crrev.com/df8e1f2a83f9a1a02e1182a25262b0b55b5420e9/build/android/pylib/local/device/local_device_instrumentation_test_run.py

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070

commit ecac5a9e2fd689a304c899f0ee6d3f2c230b8070
Author: Andrew Grieve <agrieve@chromium.org>
Date: Thu Nov 08 01:57:01 2018

Merge most chrome test apks

chrome_public_test_apk is now the union of:
* chrome_public_apk_for_test
* chrome_public_test_apk
* chrome_sync_shell_apk
* chrome_sync_shell_test_apk

Motivation is to simplify the targets, as well as to work around
multidex restrictions.

This change disabled two tests because fixing wasn't trivial:
* FirstRunIntegrationTest.java
* FirstRunTest.java
https://crbug.com/902774 will track un-@Disable'ing them.


NOTRY=true  # linux bot flakiness
TBR=agrieve  # Trivial rename in a couple files.

Bug:  833545 ,  841628 ,  901488 
Change-Id: I9ebe035e86f1b6e5a208e36040baf038efa6cc15
Reviewed-on: https://chromium-review.googlesource.com/c/1319335
Commit-Queue: agrieve <agrieve@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Eric Stevenson <estevenson@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606283}
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/BUILD.gn
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/WATCHLISTS
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/base/test/android/javatests/src/org/chromium/base/test/BaseChromiumAndroidJUnitRunner.java
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/build/android/gradle/generate_gradle.py
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/build/android/main_dex_classes.flags
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/chrome/android/BUILD.gn
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/chrome/android/chrome_public_apk_tmpl.gni
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/chrome/android/java/AndroidManifest.xml
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/chrome/android/java_sources.gni
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/chrome/android/javatests/AndroidManifest.xml
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/chrome/android/javatests/AndroidManifest_monochrome.xml
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/chrome/android/javatests/DEPS
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/chrome/android/javatests/src/org/chromium/chrome/browser/browserservices/OriginVerifierTest.java
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/chrome/android/javatests/src/org/chromium/chrome/browser/browserservices/TrustedWebActivityTest.java
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/chrome/android/javatests/src/org/chromium/chrome/browser/firstrun/FirstRunIntegrationTest.java
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtilsTest.java
[rename] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/chrome/android/javatests/src/org/chromium/chrome/browser/sync/AutofillTest.java
[rename] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/chrome/android/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java
[rename] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/chrome/android/javatests/src/org/chromium/chrome/browser/sync/FakeServerHelper.java
[rename] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/chrome/android/javatests/src/org/chromium/chrome/browser/sync/FirstRunTest.java
[rename] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/chrome/android/javatests/src/org/chromium/chrome/browser/sync/GmsCoreSyncListenerTest.java
[rename] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/chrome/android/javatests/src/org/chromium/chrome/browser/sync/OpenTabsTest.java
[rename] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java
[rename] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
[rename] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTestRule.java
[rename] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/chrome/android/javatests/src/org/chromium/chrome/browser/sync/TypedUrlsTest.java
[rename] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/chrome/android/javatests/src/org/chromium/chrome/browser/sync/UkmTest.java
[rename] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/chrome/android/javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragmentTest.java
[delete] https://crrev.com/939f1a0e0c1bf8f2453b8f705471463f1455cab0/chrome/android/sync_shell/DEPS
[delete] https://crrev.com/939f1a0e0c1bf8f2453b8f705471463f1455cab0/chrome/android/sync_shell/README
[delete] https://crrev.com/939f1a0e0c1bf8f2453b8f705471463f1455cab0/chrome/android/sync_shell/javatests/AndroidManifest.xml
[delete] https://crrev.com/939f1a0e0c1bf8f2453b8f705471463f1455cab0/chrome/android/sync_shell/javatests/DEPS
[delete] https://crrev.com/939f1a0e0c1bf8f2453b8f705471463f1455cab0/chrome/browser/android/chrome_sync_shell_entry_point.cc
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/chrome/browser/metrics/ukm_browsertest.cc
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/chrome/test/android/test_trusted_web_activity/src/org/chromium/chrome/browser/browserservices/TestTrustedWebActivityService.java
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/components/sync/BUILD.gn
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/content/shell/BUILD.gn
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/docs/android_test_instructions.md
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/testing/buildbot/chromium.android.fyi.json
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/testing/buildbot/chromium.android.json
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/testing/buildbot/chromium.clang.json
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/testing/buildbot/chromium.memory.json
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/testing/buildbot/gn_isolate_map.pyl
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/testing/buildbot/test_suite_exceptions.pyl
[modify] https://crrev.com/ecac5a9e2fd689a304c899f0ee6d3f2c230b8070/testing/buildbot/test_suites.pyl