Convert the rest of chrome_public_test_apk InstrumentationTestCases to JUnit4

Convert the rest of chrome_public_test_apk InstrumentationTestCases to JUnit4

These tests are direct children of InstrumentationTestCase. Some test cases
needed to run on UiThread.  For more on JUnit4 migration, check
src/testing/android/docs/junit4.md

BUG=640116
Review-Url: https://codereview.chromium.org/2766373004
Cr-Commit-Position: refs/heads/master@{#460315}
Committed: https://chromium.googlesource.com/chromium/src/+/6df9dbce1fc7b4b91054df57a21fe0a4b60acc2c

[the real yoland, 2017-03-23 17:50:34]

The CQ bit was checked by yolandyan@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-03-23 17:51:06]

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

[the real yoland, 2017-03-23 17:51:59]

Description was changed from

==========
Convert the rest of InstrumentationTestCases in chrome/ to JUnit4

These tests are direct children of InstrumentationTestCase. Some test cases
needed to run on UiThread.  For more on JUnit4 migration, check
src/testing/android/docs/junit4.md

BUG=640116
==========

to

==========
Convert the rest of chrome_public_test_apk InstrumentationTestCases to JUnit4

These tests are direct children of InstrumentationTestCase. Some test cases
needed to run on UiThread.  For more on JUnit4 migration, check
src/testing/android/docs/junit4.md

BUG=640116
==========

[the real yoland, 2017-03-23 18:55:44]

yolandyan@chromium.org changed reviewers:
+ jbudorick@chromium.org, mikecase@chromium.org, tedchoc@chromium.org

[the real yoland, 2017-03-23 18:55:45]

Most of the tests are auto converted.

For easier review, the tests I manually changed are listed below

Add UiThreadTestRule for the following test that uses @UiThreadTest:
ActivityAssignerTest, AsyncTabCreationParamsManagerTest,
InfoBarControlLayoutTest, PrivacyPreferencesManagerTest, RequestThrottlerTest,
TabWindowManagerTest, TabIdManagerTest

CustomTabTabPersistencePolicyTest: changed to use hamcrest matcher, added
UiThreadTestRule

ReaderModeManagerTest: added @UiThreadTest to all tests because handler related
action is done in setup
DelayedInvalidationsControllerTest: same as above, activity created in setUp

PrecacheControllerTest: same as above, MockPrecacheLauncher created in setUp

RestoreMigrateTest: same as above, initApplicationContextForTests called in
setUp

DualControlLayoutTest: change MoreAsserts, add UiThreadTestRule

[the real yoland, 2017-03-23 18:57:02]

The CQ bit was checked by yolandyan@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-03-23 18:57:32]

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

[the real yoland, 2017-03-23 19:02:35]

On 2017/03/23 at 18:55:45, the real yoland wrote:
> Most of the tests are auto converted.
> 
> For easier review, the tests I manually changed are listed below
> 
> Add UiThreadTestRule for the following test that uses @UiThreadTest:
> ActivityAssignerTest, AsyncTabCreationParamsManagerTest,
InfoBarControlLayoutTest, PrivacyPreferencesManagerTest, RequestThrottlerTest,
TabWindowManagerTest, TabIdManagerTest
> 
> CustomTabTabPersistencePolicyTest: changed to use hamcrest matcher, added
UiThreadTestRule
> 
> ReaderModeManagerTest: added @UiThreadTest to all tests because handler
related action is done in setup
> DelayedInvalidationsControllerTest: same as above, activity created in setUp
> 
> PrecacheControllerTest: same as above, MockPrecacheLauncher created in setUp
> 
> RestoreMigrateTest: same as above, initApplicationContextForTests called in
setUp
> 
> DualControlLayoutTest: change MoreAsserts, add UiThreadTestRule

Also, PrivacyPreferencesManagerTest should really use Parameterized test ;)

[commit-bot: I haz the power, 2017-03-23 20:10:20]

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

[commit-bot: I haz the power, 2017-03-23 20:10:21]

Dry run: This issue passed the CQ dry run.

[mikecase (-- gone --), 2017-03-28 18:46:40]

non-owner lgtm. All the tests seem to have run and passed in the tryjob :D

[Ted C, 2017-03-29 00:06:41]

lgtm

https://codereview.chromium.org/2766373004/diff/20001/chrome/android/javatest...
File
chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicyTest.java
(right):

https://codereview.chromium.org/2766373004/diff/20001/chrome/android/javatest...
chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicyTest.java:181:
mRule.runOnUiThread(new Runnable() {
We should figure out a way to have our own annotation that allows just the test
body to be run on the UI thread w/o the Before and After as this super indenting
is pretty gross.

https://codereview.chromium.org/2766373004/diff/20001/chrome/android/javatest...
chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicyTest.java:226:
* @throws Throwable
remove

[the real yoland, 2017-03-29 01:01:51]

The CQ bit was checked by yolandyan@chromium.org to run a CQ dry run

[the real yoland, 2017-03-29 01:02:18]

The CQ bit was unchecked by yolandyan@chromium.org

[the real yoland, 2017-03-29 01:02:47]

The CQ bit was checked by yolandyan@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-03-29 01:03:15]

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

[the real yoland, 2017-03-29 01:13:24]

https://codereview.chromium.org/2766373004/diff/20001/chrome/android/javatest...
File
chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicyTest.java
(right):

https://codereview.chromium.org/2766373004/diff/20001/chrome/android/javatest...
chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicyTest.java:181:
mRule.runOnUiThread(new Runnable() {
On 2017/03/29 at 00:06:41, Ted C wrote:
> We should figure out a way to have our own annotation that allows just the
test body to be run on the UI thread w/o the Before and After as this super
indenting is pretty gross.

Aha, one thing we can do is move things that needed to be run on Instrumentation
thread to a separate TestRule and create a RuleChain (run a group of TestRule in
order) that runs the Instrumentation thread rule first and then UiThread
actions.

Example:
https://codereview.chromium.org/2778103002/diff/20001/chrome/android/javatest...

We don't want diverge from the android testing library's default behavior. And
supporting another annotation is pretty easy but would be even more confusing.

Create crbug.com/706225 to investigate once migration is done

https://codereview.chromium.org/2766373004/diff/20001/chrome/android/javatest...
chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicyTest.java:226:
* @throws Throwable
On 2017/03/29 at 00:06:41, Ted C wrote:
> remove

Done

[commit-bot: I haz the power, 2017-03-29 02:59:01]

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

[commit-bot: I haz the power, 2017-03-29 02:59:02]

Dry run: Try jobs failed on following builders:
  win_chromium_rel_ng on master.tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_...)

[the real yoland, 2017-03-29 04:59:52]

The CQ bit was checked by yolandyan@chromium.org

[the real yoland, 2017-03-29 04:59:53]

The patchset sent to the CQ was uploaded after l-g-t-m from
tedchoc@chromium.org, mikecase@chromium.org
Link to the patchset: https://codereview.chromium.org/2766373004/#ps40001
(title: "nits and rebase")

[commit-bot: I haz the power, 2017-03-29 05:00:25]

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-29 07:21:31]

CQ is committing da patch.

Bot data: {"patchset_id": 40001, "attempt_start_ts": 1490763592553750,
"parent_rev": "92bf3c29fccac551acceff254e53d7ea73367158", "commit_rev":
"6df9dbce1fc7b4b91054df57a21fe0a4b60acc2c"}

[commit-bot: I haz the power, 2017-03-29 07:22:12]

Description was changed from

==========
Convert the rest of chrome_public_test_apk InstrumentationTestCases to JUnit4

These tests are direct children of InstrumentationTestCase. Some test cases
needed to run on UiThread.  For more on JUnit4 migration, check
src/testing/android/docs/junit4.md

BUG=640116
==========

to

==========
Convert the rest of chrome_public_test_apk InstrumentationTestCases to JUnit4

These tests are direct children of InstrumentationTestCase. Some test cases
needed to run on UiThread.  For more on JUnit4 migration, check
src/testing/android/docs/junit4.md

BUG=640116

Review-Url: https://codereview.chromium.org/2766373004
Cr-Commit-Position: refs/heads/master@{#460315}
Committed:
https://chromium.googlesource.com/chromium/src/+/6df9dbce1fc7b4b91054df57a21f...
==========

[commit-bot: I haz the power, 2017-03-29 07:22:13]

Committed patchset #3 (id:40001) as
https://chromium.googlesource.com/chromium/src/+/6df9dbce1fc7b4b91054df57a21f...