
This reverts commit6af8c6bfa9
. Reason for reland: Put one back Bug: 389166093 Original change's description: > Revert "Delete all @MockedInTests except for 2" > > This reverts commit3623d157d1
. > > Reason for revert: Broke AndroidPaymentAppFinderUnitTest (see luci bisection comment) > > Bug: 389166093 > Original change's description: > > Delete all @MockedInTests except for 2 > > > > It's no longer needed as of b/389166093... Except for interfaces that > > are extended by other interfaces, where it's needed due to a > > hard-to-fix quirk in R8 involving synthetic bridges and improper > > handling of them by Mockito. > > > > Bug: 389166093 > > Change-Id: I9100f386f0238e185efbce77f2ebbe3c3c05621d > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6378168 > > Owners-Override: Andrew Grieve <agrieve@chromium.org> > > Auto-Submit: Andrew Grieve <agrieve@chromium.org> > > Reviewed-by: Sam Maier <smaier@chromium.org> > > Commit-Queue: Sam Maier <smaier@chromium.org> > > Cr-Commit-Position: refs/heads/main@{#1451832} > > No-Try: true > Bug: 389166093 > Change-Id: Ifba4902a428b5b98263f29ac499f1fb4fb83167b > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6495487 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Auto-Submit: Andrew Grieve <agrieve@chromium.org> > Owners-Override: Andrew Grieve <agrieve@chromium.org> > Cr-Commit-Position: refs/heads/main@{#1452590} Bug: 389166093 Change-Id: I46f1da4e2a5652787542f5a36372387a3e93fac1 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6495121 Owners-Override: Andrew Grieve <agrieve@chromium.org> Auto-Submit: Andrew Grieve <agrieve@chromium.org> Reviewed-by: Sam Maier <smaier@chromium.org> Commit-Queue: Sam Maier <smaier@chromium.org> Cr-Commit-Position: refs/heads/main@{#1452747}