commit: ecac5a9e2fd689a304c899f0ee6d3f2c230b8070
[log]
author: Andrew Grieve <agrieve@chromium.org>
Thu Nov 08 01:57:01 2018
committer: Commit Bot <commit-bot@chromium.org>
Thu Nov 08 01:57:01 2018
tree: 9c122f9926da4375b123d17346ef667096eb7c53
parent: 939f1a0e0c1bf8f2453b8f705471463f1455cab0 [diff]

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}

BUILD.gn[diff]
WATCHLISTS[diff]
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumAndroidJUnitRunner.java[diff]
build/android/gradle/generate_gradle.py[diff]
build/android/main_dex_classes.flags[diff]
chrome/android/BUILD.gn[diff]
chrome/android/chrome_public_apk_tmpl.gni[diff]
chrome/android/java/AndroidManifest.xml[diff]
chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java[diff]
chrome/android/java_sources.gni[diff]
chrome/android/javatests/AndroidManifest.xml[diff]
chrome/android/javatests/AndroidManifest_monochrome.xml[diff]
chrome/android/javatests/DEPS[diff]
chrome/android/javatests/src/org/chromium/chrome/browser/browserservices/OriginVerifierTest.java[diff]
chrome/android/javatests/src/org/chromium/chrome/browser/browserservices/TrustedWebActivityTest.java[diff]
chrome/android/javatests/src/org/chromium/chrome/browser/firstrun/FirstRunIntegrationTest.java[diff]
chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtilsTest.java[diff]
chrome/android/javatests/src/org/chromium/chrome/browser/sync/AutofillTest.java[Renamed from chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/AutofillTest.java - diff]
chrome/android/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java[Renamed from chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java - diff]
chrome/android/javatests/src/org/chromium/chrome/browser/sync/FakeServerHelper.java[Renamed from chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/FakeServerHelper.java - diff]
chrome/android/javatests/src/org/chromium/chrome/browser/sync/FirstRunTest.java[Renamed from chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/FirstRunTest.java - diff]
chrome/android/javatests/src/org/chromium/chrome/browser/sync/GmsCoreSyncListenerTest.java[Renamed from chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/GmsCoreSyncListenerTest.java - diff]
chrome/android/javatests/src/org/chromium/chrome/browser/sync/OpenTabsTest.java[Renamed from chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/OpenTabsTest.java - diff]
chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java[Renamed from chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java - diff]
chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java[Renamed from chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java - diff]
chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTestRule.java[Renamed from chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestRule.java - diff]
chrome/android/javatests/src/org/chromium/chrome/browser/sync/TypedUrlsTest.java[Renamed from chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/TypedUrlsTest.java - diff]
chrome/android/javatests/src/org/chromium/chrome/browser/sync/UkmTest.java[Renamed from chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/UkmTest.java - diff]
chrome/android/javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragmentTest.java[Renamed from chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragmentTest.java - diff]
chrome/android/sync_shell/DEPS[Deleted - diff]
chrome/android/sync_shell/README[Deleted - diff]
chrome/android/sync_shell/javatests/AndroidManifest.xml[Deleted - diff]
chrome/android/sync_shell/javatests/DEPS[Deleted - diff]
chrome/browser/android/chrome_sync_shell_entry_point.cc[Deleted - diff]
chrome/browser/metrics/ukm_browsertest.cc[diff]
chrome/test/android/test_trusted_web_activity/src/org/chromium/chrome/browser/browserservices/TestTrustedWebActivityService.java[diff]
components/sync/BUILD.gn[diff]
content/shell/BUILD.gn[diff]
docs/android_test_instructions.md[diff]
testing/buildbot/chromium.android.fyi.json[diff]
testing/buildbot/chromium.android.json[diff]
testing/buildbot/chromium.clang.json[diff]
testing/buildbot/chromium.memory.json[diff]
testing/buildbot/gn_isolate_map.pyl[diff]
testing/buildbot/test_suite_exceptions.pyl[diff]
testing/buildbot/test_suites.pyl[diff]

46 files changed

tree: 9c122f9926da4375b123d17346ef667096eb7c53

README.md

Chromium

Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.

The project's web site is https://www.chromium.org.

Documentation in the source is rooted in docs/README.md.

Learn how to Get Around the Chromium Source Code Directory Structure .