Revert of Move UrlManagerTest to junit

Revert of Move UrlManagerTest to junit (patchset #4 id:60001 of https://codereview.chromium.org/2723783003/ )

Reason for revert:
The tests in this CL got flaky after the move:
https://build.chromium.org/p/chromium.linux/builders/Android%20Tests/builds/39287
https://luci-logdog.appspot.com/v/?s=chromium%2Fbb%2Fchromium.linux%2FAndroid_Tests%2F39287%2F%2B%2Frecipes%2Fsteps%2Fchrome_junit_tests%2F0%2Fsteps%2Fchrome_junit_tests%2F0%2Fstdout

failures:
org.chromium.chrome.browser.physicalweb.UrlManagerTest#testUpgradeFromNone
org.chromium.chrome.browser.physicalweb.UrlManagerTest#testSerializationWorksWithPoorlySerializedResult

java.lang.AssertionError
	at org.junit.Assert.fail(Assert.java:86)
	at org.junit.Assert.assertTrue(Assert.java:41)
	at org.junit.Assert.assertTrue(Assert.java:52)
	at org.chromium.chrome.browser.physicalweb.UrlManagerTest.testSerializationWorksWithPoorlySerializedResult(UrlManagerTest.java:291)

java.lang.AssertionError
	at org.junit.Assert.fail(Assert.java:86)
	at org.junit.Assert.assertTrue(Assert.java:41)
	at org.junit.Assert.assertTrue(Assert.java:52)
	at org.chromium.chrome.browser.physicalweb.UrlManagerTest.testUpgradeFromNone(UrlManagerTest.java:361)


Original issue's description:
> Move UrlManagerTest to junit
> 
> UrlManagerTest does not need to be an instrumentation test, so this
> change moves it from javatests/ to junit/.
> 
> BUG=696804
> 
> Review-Url: https://codereview.chromium.org/2723783003
> Cr-Commit-Position: refs/heads/master@{#456804}
> Committed: https://chromium.googlesource.com/chromium/src/+/cbb4ab906568a80aa3e7a314e6570cc3b8900777

TBR=mattreynolds@chromium.org,jbudorick@chromium.org,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/2755643002
Cr-Commit-Position: refs/heads/master@{#457030}
Committed: https://chromium.googlesource.com/chromium/src/+/fa45e7d972ca1e35ffbe033a96203e5fa99bdf2d

[tzik, 2017-03-15 07:52:01]

The CQ bit was checked by tzik@chromium.org

[tzik, 2017-03-15 07:52:01]

Created Revert of Move UrlManagerTest to junit

[commit-bot: I haz the power, 2017-03-15 07:52:22]

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-15 07:53:46]

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

[commit-bot: I haz the power, 2017-03-15 07:53:49]

Failed to apply patch for chrome/android/java_sources.gni:
While running git apply --index -p1;
  error: patch failed: chrome/android/java_sources.gni:1608
  error: chrome/android/java_sources.gni: patch does not apply

Patch:       chrome/android/java_sources.gni
Index: chrome/android/java_sources.gni
diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
index
5742339a30fd2bd752089eff0fb005c2bcad7281..0f5e903d949a4e8d582e88320368ed46591c9cf3
100644
--- a/chrome/android/java_sources.gni
+++ b/chrome/android/java_sources.gni
@@ -1391,6 +1391,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",
@@ -1608,11 +1610,9 @@
   "junit/src/org/chromium/chrome/browser/omaha/VersionNumberTest.java",
   "junit/src/org/chromium/chrome/browser/payments/AutofillContactTest.java",
  
"junit/src/org/chromium/chrome/browser/payments/AutofillContactUnitTest.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",

[tzik, 2017-03-15 08:11:18]

The CQ bit was checked by tzik@chromium.org

[commit-bot: I haz the power, 2017-03-15 08:11: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-15 08:12:35]

CQ is committing da patch.

Bot data: {"patchset_id": 140001, "attempt_start_ts": 1489565478607660,
"parent_rev": "05e8c5485ad41543721a89009285d8b7feb9a6f4", "commit_rev":
"fa45e7d972ca1e35ffbe033a96203e5fa99bdf2d"}

[commit-bot: I haz the power, 2017-03-15 08:13:20]

Description was changed from

==========
Revert of Move UrlManagerTest to junit (patchset #4 id:60001 of
https://codereview.chromium.org/2723783003/ )

Reason for revert:
The tests in this CL got flaky after the move:
https://build.chromium.org/p/chromium.linux/builders/Android%20Tests/builds/3...
https://luci-logdog.appspot.com/v/?s=chromium%2Fbb%2Fchromium.linux%2FAndroid...

failures:
org.chromium.chrome.browser.physicalweb.UrlManagerTest#testUpgradeFromNone
org.chromium.chrome.browser.physicalweb.UrlManagerTest#testSerializationWorksWithPoorlySerializedResult

java.lang.AssertionError
	at org.junit.Assert.fail(Assert.java:86)
	at org.junit.Assert.assertTrue(Assert.java:41)
	at org.junit.Assert.assertTrue(Assert.java:52)
	at
org.chromium.chrome.browser.physicalweb.UrlManagerTest.testSerializationWorksWithPoorlySerializedResult(UrlManagerTest.java:291)

java.lang.AssertionError
	at org.junit.Assert.fail(Assert.java:86)
	at org.junit.Assert.assertTrue(Assert.java:41)
	at org.junit.Assert.assertTrue(Assert.java:52)
	at
org.chromium.chrome.browser.physicalweb.UrlManagerTest.testUpgradeFromNone(UrlManagerTest.java:361)


Original issue's description:
> Move UrlManagerTest to junit
> 
> UrlManagerTest does not need to be an instrumentation test, so this
> change moves it from javatests/ to junit/.
> 
> BUG=696804
> 
> Review-Url: https://codereview.chromium.org/2723783003
> Cr-Commit-Position: refs/heads/master@{#456804}
> Committed:
https://chromium.googlesource.com/chromium/src/+/cbb4ab906568a80aa3e7a314e657...

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

to

==========
Revert of Move UrlManagerTest to junit (patchset #4 id:60001 of
https://codereview.chromium.org/2723783003/ )

Reason for revert:
The tests in this CL got flaky after the move:
https://build.chromium.org/p/chromium.linux/builders/Android%20Tests/builds/3...
https://luci-logdog.appspot.com/v/?s=chromium%2Fbb%2Fchromium.linux%2FAndroid...

failures:
org.chromium.chrome.browser.physicalweb.UrlManagerTest#testUpgradeFromNone
org.chromium.chrome.browser.physicalweb.UrlManagerTest#testSerializationWorksWithPoorlySerializedResult

java.lang.AssertionError
	at org.junit.Assert.fail(Assert.java:86)
	at org.junit.Assert.assertTrue(Assert.java:41)
	at org.junit.Assert.assertTrue(Assert.java:52)
	at
org.chromium.chrome.browser.physicalweb.UrlManagerTest.testSerializationWorksWithPoorlySerializedResult(UrlManagerTest.java:291)

java.lang.AssertionError
	at org.junit.Assert.fail(Assert.java:86)
	at org.junit.Assert.assertTrue(Assert.java:41)
	at org.junit.Assert.assertTrue(Assert.java:52)
	at
org.chromium.chrome.browser.physicalweb.UrlManagerTest.testUpgradeFromNone(UrlManagerTest.java:361)


Original issue's description:
> Move UrlManagerTest to junit
> 
> UrlManagerTest does not need to be an instrumentation test, so this
> change moves it from javatests/ to junit/.
> 
> BUG=696804
> 
> Review-Url: https://codereview.chromium.org/2723783003
> Cr-Commit-Position: refs/heads/master@{#456804}
> Committed:
https://chromium.googlesource.com/chromium/src/+/cbb4ab906568a80aa3e7a314e657...

TBR=mattreynolds@chromium.org,jbudorick@chromium.org,dtrainor@chromium.org,cc...
# 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/2755643002
Cr-Commit-Position: refs/heads/master@{#457030}
Committed:
https://chromium.googlesource.com/chromium/src/+/fa45e7d972ca1e35ffbe033a9620...
==========

[commit-bot: I haz the power, 2017-03-15 08:13:21]

Committed patchset #2 (id:140001) as
https://chromium.googlesource.com/chromium/src/+/fa45e7d972ca1e35ffbe033a9620...