Revert of Revert "Revert of Move UrlManagerTest to junit (patchset #4 id:60001 of https://codereview.chromium… (patchset #1 id:1 of https://codereview.chromium.org/2750003006/ )
Reason for revert:
Failing at an elevated rate on linux_android_rel_ng.
Original issue's description:
> Revert "Revert of Move UrlManagerTest to junit (patchset #4 id:60001 of https://codereview.chromium.org/2723783003/ )"
>
> This reverts commit fa45e7d972ca1e35ffbe033a96203e5fa99bdf2d.
>
> Apparently the junit tests don't support @DisabledTest, so we use @Ignore
> instead. Also, it restores our timeout on waiting for an upgrade to 5
> seconds, which apparently really did need to be that high.
>
> BUG=696804
>
> Review-Url: https://codereview.chromium.org/2750003006
> Cr-Commit-Position: refs/heads/master@{#457875}
> Committed: https://chromium.googlesource.com/chromium/src/+/ae09ef656ac3228c91a6fef38f3d386ee21f6faa
[email protected],[email protected]
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=696804
Review-Url: https://codereview.chromium.org/2755263002
Cr-Commit-Position: refs/heads/master@{#457900}
diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
index 61715444..032b3d0 100644
--- a/chrome/android/java_sources.gni
+++ b/chrome/android/java_sources.gni
@@ -1399,6 +1399,8 @@
"javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerDisableIncognitoModeUnitTest.java",
"javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerHomepageIntegrationTest.java",
"javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerHomepageUnitTest.java",
+ "javatests/src/org/chromium/chrome/browser/physicalweb/MockPwsClient.java",
+ "javatests/src/org/chromium/chrome/browser/physicalweb/UrlManagerTest.java",
"javatests/src/org/chromium/chrome/browser/policy/CombinedPolicyProviderTest.java",
"javatests/src/org/chromium/chrome/browser/payments/CurrencyFormatterTest.java",
"javatests/src/org/chromium/chrome/browser/payments/PaymentRequestAbortTest.java",
@@ -1618,11 +1620,9 @@
"junit/src/org/chromium/chrome/browser/payments/AutofillContactTest.java",
"junit/src/org/chromium/chrome/browser/payments/AutofillContactUnitTest.java",
"junit/src/org/chromium/chrome/browser/payments/PaymentManifestVerifierTest.java",
- "junit/src/org/chromium/chrome/browser/physicalweb/MockPwsClient.java",
"junit/src/org/chromium/chrome/browser/physicalweb/PwsClientImplTest.java",
"junit/src/org/chromium/chrome/browser/physicalweb/PwsResultTest.java",
"junit/src/org/chromium/chrome/browser/physicalweb/UrlInfoTest.java",
- "junit/src/org/chromium/chrome/browser/physicalweb/UrlManagerTest.java",
"junit/src/org/chromium/chrome/browser/snackbar/SnackbarCollectionUnitTest.java",
"junit/src/org/chromium/chrome/browser/suggestions/TileGroupTest.java",
"junit/src/org/chromium/chrome/browser/suggestions/TileTest.java",
