commit 6dc4eb654702aaa73dc66bf42d01947e0effae4c
author yolandyan <yolandyan@chromium.org> Tue May 16 02:44:19 2017
committer Commit bot <commit-bot@chromium.org> Tue May 16 02:44:19 2017
tree 7336510a4adca4171279476a263ef5e7612af50d
parent 6a55a101eb8e05a04285cfd416b6506d711a7d19

Convert CustomTabActivityTestBase and its children to JUnit4

This CL convert CustomTabActivityTestBase to CustomTabActivityTestRule
and convert all tests to JUnit4.For more on JUnit4 migration, please check
src/testing/android/docs/junit4.md

BUG=640116

Review-Url: https://codereview.chromium.org/2881963002
Cr-Commit-Position: refs/heads/master@{#471991}

chrome/android/java_sources.gni

diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
index 86de6433..1c9eaa6b 100644
--- a/chrome/android/java_sources.gni
+++ b/chrome/android/java_sources.gni
@@ -1368,7 +1368,7 @@
   "javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java",
   "javatests/src/org/chromium/chrome/browser/customtabs/ClientManagerTest.java",
   "javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java",
-  "javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTestBase.java",
+  "javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTestRule.java",
   "javatests/src/org/chromium/chrome/browser/customtabs/CustomTabExternalNavigationTest.java",
   "javatests/src/org/chromium/chrome/browser/customtabs/CustomTabFromChromeExternalNavigationTest.java",
   "javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.java",