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

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

[cco3, 2017-03-16 21:45:48]

cco3@chromium.org changed reviewers:
+ dtrainor@chromium.org

[cco3, 2017-03-16 21:45:49]

Hi dtrainor@, I'm taking another stab at this change.  Original:
https://codereview.chromium.org/2723783003/

The two new changes I made are described in the commit message.

[David Trainor- moved to gerrit, 2017-03-17 07:12:44]

new changes lgtm.  the only question I had was around removing the test size
annotation.  I thought we were supposed to keep that as well in the short term?

[cco3, 2017-03-17 16:52:06]

On 2017/03/17 07:12:44, David Trainor-ping if over 24h wrote:
> new changes lgtm.  the only question I had was around removing the test size
> annotation.  I thought we were supposed to keep that as well in the short
term?

I had assumed that, but "grep SmallTest -r chrome/android/junit/" turns up
nothing, so I decided not to.

[cco3, 2017-03-17 16:52:17]

The CQ bit was checked by cco3@chromium.org

[commit-bot: I haz the power, 2017-03-17 16:52:39]

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 18:59:18]

CQ is committing da patch.

Bot data: {"patchset_id": 1, "attempt_start_ts": 1489769537843410, "parent_rev":
"f3b96a7b630ef08149c29ffab26a70df8d54f6d8", "commit_rev":
"68ae5cbc773fa97827cb8fe5cdd97de70c460d18"}

[commit-bot: I haz the power, 2017-03-17 19:24:13]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-17 19:24:16]

Prior attempt to commit was detected, but we were not able to check whether the
issue was successfully committed. Please check Git history manually and re-check
CQ or close this issue as needed.

[cco3, 2017-03-17 20:30:16]

The CQ bit was checked by cco3@chromium.org

[commit-bot: I haz the power, 2017-03-17 20:30:47]

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 20:36:07]

CQ is committing da patch.

Bot data: {"patchset_id": 1, "attempt_start_ts": 1489782616708310, "parent_rev":
"e59c7d48269c8900a94b9158680ca67a02c5e418", "commit_rev":
"ae09ef656ac3228c91a6fef38f3d386ee21f6faa"}

[commit-bot: I haz the power, 2017-03-17 20:36:56]

Description was changed from

==========
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
==========

to

==========
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...
==========

[commit-bot: I haz the power, 2017-03-17 20:36:58]

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

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

A revert of this CL (patchset #1 id:1) has been created in
https://codereview.chromium.org/2755263002/ by jbudorick@chromium.org.

The reason for reverting is: Failing at an elevated rate on
linux_android_rel_ng..