[Android][Modularization] Move incognito interstitial test to its module

This CL moves the incognito interstial instrumentation test to its own
module.

Bug: 1149867
Change-Id: If4b8bc80580c925d015e7ca896ce7eb070e74fc4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2544683
Commit-Queue: Alice Wang <aliceywang@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828654}

chrome/android/BUILD.gn

@@ -1030,6 +1030,7 @@ android_library("chrome_test_java") {
     "//chrome/browser/image_descriptions:javatests",
     "//chrome/browser/image_fetcher:java",
     "//chrome/browser/incognito/interstitial/android:java",
+    "//chrome/browser/incognito/interstitial/android:javatests",
     "//chrome/browser/offline_pages/android:java",
     "//chrome/browser/omaha/android:java",
     "//chrome/browser/optimization_guide/android:javatests",

chrome/android/chrome_test_java_sources.gni

@@ -235,7 +235,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/incognito/IncognitoProfileDestroyerIntegrationTest.java",
   "javatests/src/org/chromium/chrome/browser/incognito/IncognitoStorageLeakageTest.java",
   "javatests/src/org/chromium/chrome/browser/incognito/IncognitoTabLauncherTest.java",
-  "javatests/src/org/chromium/chrome/browser/incognito/interstitial/IncognitoInterstitialTest.java",
   "javatests/src/org/chromium/chrome/browser/infobar/InfoBarAppearanceTest.java",
   "javatests/src/org/chromium/chrome/browser/infobar/InfoBarContainerTest.java",
   "javatests/src/org/chromium/chrome/browser/infobar/InfoBarTest.java",

chrome/browser/incognito/interstitial/android/BUILD.gn

@@ -44,3 +44,21 @@ android_library("junit") {
     "//third_party/mockito:mockito_java",
   ]
 }
+
+android_library("javatests") {
+  testonly = true
+  sources = [ "java/src/org/chromium/chrome/browser/incognito/interstitial/IncognitoInterstitialTest.java" ]
+  deps = [
+    ":java",
+    "//base:base_java_test_support",
+    "//chrome/browser/flags:java",
+    "//chrome/test/android:chrome_java_test_support",
+    "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:androidx_test_runner_java",
+    "//third_party/android_deps:espresso_java",
+    "//third_party/android_support_test_runner:rules_java",
+    "//third_party/junit",
+    "//third_party/mockito:mockito_java",
+    "//ui/android:ui_java_test_support",
+  ]
+}

chrome/android/javatests/src/org/chromium/chrome/browser/incognito/interstitial/IncognitoInterstitialTest.java → chrome/browser/incognito/interstitial/android/java/src/org/chromium/chrome/browser/incognito/interstitial/IncognitoInterstitialTest.java

@@ -93,4 +93,4 @@ public class IncognitoInterstitialTest {
         verify(mOnIncognitoTabOpenedMock).run();
         verify(mIncognitoInterstitialDelegateMock).openCurrentUrlInIncognitoTab();
     }
-}
\ No newline at end of file
+}