Revert of Revert "Revert of Move UrlManagerTest to junit (patchset #4 id:60001...

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

TBR=dtrainor@chromium.org,cco3@chromium.org
# 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}
Committed: https://chromium.googlesource.com/chromium/src/+/bb80229542ef5f3a648a857c36c125ec9d235a68

[jbudorick, 2017-03-17 23:12:33]

The CQ bit was checked by jbudorick@chromium.org

[jbudorick, 2017-03-17 23:12:34]

Created Revert of Revert "Revert of Move UrlManagerTest to junit (patchset #4
id:60001 of https://codereview.chromium…

[cco3, 2017-03-17 23:13:30]

lgtm

[commit-bot: I haz the power, 2017-03-17 23:13:37]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-17 23:14:40]

CQ is committing da patch.

Bot data: {"patchset_id": 1, "attempt_start_ts": 1489792353063330, "parent_rev":
"c71d7d995db07053e60d96e0cded750d6af66023", "commit_rev":
"bb80229542ef5f3a648a857c36c125ec9d235a68"}

[commit-bot: I haz the power, 2017-03-17 23:15:26]

Description was changed from

==========
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/+/ae09ef656ac3228c91a6fef38f3d...

TBR=dtrainor@chromium.org,cco3@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=696804
==========

to

==========
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/+/ae09ef656ac3228c91a6fef38f3d...

TBR=dtrainor@chromium.org,cco3@chromium.org
# 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}
Committed:
https://chromium.googlesource.com/chromium/src/+/bb80229542ef5f3a648a857c36c1...
==========

[commit-bot: I haz the power, 2017-03-17 23:15:27]

Committed patchset #1 (id:1) as
https://chromium.googlesource.com/chromium/src/+/bb80229542ef5f3a648a857c36c1...