commit 3cab5ea4a21787927909463aa527e4ea4ebe0dbd
author Andrew Grieve <agrieve@chromium.org> Fri May 05 19:40:45 2023
committer Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri May 05 19:40:45 2023
tree b33a55256614b526740f2eb4103a41907a5c032a
parent c618def6c45d8e3ba82fe9da764852d1b47d6864

Revert "Android CCV/CRS: Turn on ChromeRootStoreUsed in fieldtial_testing_config.json"

This reverts commit c55272f6365bb00ba1c260064c66dc6777f094c2.

Reason for revert: Broke internal bots
https://bugs.chromium.org/p/chromium/issues/detail?id=1442472

Original change's description:
> Android CCV/CRS: Turn on ChromeRootStoreUsed in fieldtial_testing_config.json
>
> This required modifying tests to ensure that the test root is loaded in X509Utils.java via a ClassHook in ContentJUnit4ClassRunner before the user-added roots are pulled in net/cert/internal/trust_store_android.cc, so that the chrome cert verifier would correctly verify trust for connections to the EmbeddedTestServer. Previous attempts to do this did this at other points in the test loading process, but were unsuccessful for a variety of different reasons, usually in loading the root too late.
>
> We also rely on the fact that the root cert for EmbeddedTestServer is a statically checked in file (at net/data/ssl/certificates/root_ca_cert.pem) as the current solution (starting up the EmbeddedTestServer in a separate APK + calling to get the root cert) requires calling into native code which can't be done easily before the chrome cert verifier loads the user-added roots.
>
> This would be easier if the EmbeddedTestServer was run in process instead of in its own APK; I don't know if it would be feasible or how much work it would be to change this.
>
> Change-Id: Ie035190666dfe32ec7b13d66792ff6cbd7b3c1e7
> Cq-Do-Not-Cancel-Tryjobs: true
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4490464
> Commit-Queue: Hubert Chao <hchao@chromium.org>
> Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Reviewed-by: Tommy Nyquist <nyquist@chromium.org>
> Reviewed-by: David Benjamin <davidben@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1138721}

Bug: 1442472
Change-Id: I4dafbcbc606ec6e05161721aaa96c0654bc42a13
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4508199
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Tommy Nyquist <nyquist@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Owners-Override: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1140285}