[WebView] Remove DEPRECATED_java_in_dir from android_webview test.

android_webview/test/BUILD.gn

Index: android_webview/test/BUILD.gn
diff --git a/android_webview/test/BUILD.gn b/android_webview/test/BUILD.gn
index 68b71d4c3a3deef709bd9e5730e5b32f77cd77ff..82346679e6f95acf6b0953f6209d1c69450b2d28 100644
--- a/android_webview/test/BUILD.gn
+++ b/android_webview/test/BUILD.gn
@@ -32,7 +32,19 @@ android_apk("android_webview_apk") {
 
   apk_name = "AndroidWebView"
   android_manifest = "shell/AndroidManifest.xml"
-  DEPRECATED_java_in_dir = "shell/src"
+  java_files = [
+    "shell/src/org/chromium/android_webview/shell/AwShellActivity.java",
+    "shell/src/org/chromium/android_webview/shell/AwShellApplication.java",
+    "shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java",
+    "shell/src/org/chromium/android_webview/shell/AwShellSwitches.java",
+    "shell/src/org/chromium/android_webview/shell/DrawGL.java",
+    "shell/src/org/chromium/android_webview/test/AwInstrumentationTestRunner.java",
+    "shell/src/org/chromium/android_webview/test/AwTestContainerView.java",
+    "shell/src/org/chromium/android_webview/test/AwTestRunnerActivity.java",
+    "shell/src/org/chromium/android_webview/test/NullContentsClient.java",
+    "shell/src/org/chromium/android_webview/test/SecondBrowserProcess.java",
+    "shell/src/org/chromium/android_webview/test/TestContentProvider.java",
+  ]
   native_libs = [
     "libdrawgl.so",
     "libstandalonelibwebviewchromium.so",
@@ -105,7 +117,90 @@ instrumentation_test_apk("android_webview_test_apk") {
     "//third_party/android_tools:legacy_http_javalib",
     "//ui/android:ui_java",
   ]
-  DEPRECATED_java_in_dir = "../javatests/src"
+  java_files = [
+    "../javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java",
+    "../javatests/src/org/chromium/android_webview/test/ArchiveTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwContentsClientAutoLoginTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwContentsClientCallbackHelperTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwContentsClientFaviconTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwContentsClientGetDefaultVideoPosterTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwContentsClientOnFormResubmissionTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwContentsClientVisitedHistoryTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwContentsGarbageCollectionTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwContentsLifecycleNotifierTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwContentsRenderTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwContentsStaticsTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwContentsTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwDebugTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwImeTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwJavaBridgeTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwLayoutSizerTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwPermissionManagerTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwQuotaManagerBridgeTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwScrollOffsetManagerTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwSecondBrowserProcessTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwServiceWorkerClientTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwSettingsTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwTestBase.java",
+    "../javatests/src/org/chromium/android_webview/test/AwWebContentsObserverTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwZoomTest.java",
+    "../javatests/src/org/chromium/android_webview/test/ClearHistoryTest.java",
+    "../javatests/src/org/chromium/android_webview/test/ClientAddMessageToConsoleTest.java",
+    "../javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java",
+    "../javatests/src/org/chromium/android_webview/test/ClientOnPageStartedTest.java",
+    "../javatests/src/org/chromium/android_webview/test/ClientOnReceivedError2Test.java",
+    "../javatests/src/org/chromium/android_webview/test/ClientOnReceivedErrorTest.java",
+    "../javatests/src/org/chromium/android_webview/test/ClientOnReceivedHttpErrorTest.java",
+    "../javatests/src/org/chromium/android_webview/test/ConsoleMessagesForBlockedLoadsTest.java",
+    "../javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java",
+    "../javatests/src/org/chromium/android_webview/test/CookieManagerStartupTest.java",
+    "../javatests/src/org/chromium/android_webview/test/CookieManagerTest.java",
+    "../javatests/src/org/chromium/android_webview/test/DisableHardwareAccelerationForTest.java",
+    "../javatests/src/org/chromium/android_webview/test/ExternalVideoSurfaceContainerTest.java",
+    "../javatests/src/org/chromium/android_webview/test/FullScreenVideoTestAwContentsClient.java",
+    "../javatests/src/org/chromium/android_webview/test/GeolocationTest.java",
+    "../javatests/src/org/chromium/android_webview/test/GetTitleTest.java",
+    "../javatests/src/org/chromium/android_webview/test/HttpAuthDatabaseTest.java",
+    "../javatests/src/org/chromium/android_webview/test/HttpCacheTest.java",
+    "../javatests/src/org/chromium/android_webview/test/KeySystemTest.java",
+    "../javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java",
+    "../javatests/src/org/chromium/android_webview/test/LoadUrlTest.java",
+    "../javatests/src/org/chromium/android_webview/test/MediaAccessPermissionRequestTest.java",
+    "../javatests/src/org/chromium/android_webview/test/MultipleVideosTest.java",
+    "../javatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java",
+    "../javatests/src/org/chromium/android_webview/test/PolicyUrlFilteringTest.java",
+    "../javatests/src/org/chromium/android_webview/test/PopupWindowTest.java",
+    "../javatests/src/org/chromium/android_webview/test/PostMessageTest.java",
+    "../javatests/src/org/chromium/android_webview/test/SaveRestoreStateTest.java",
+    "../javatests/src/org/chromium/android_webview/test/StandaloneAwQuotaManagerBridgeTest.java",
+    "../javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java",
+    "../javatests/src/org/chromium/android_webview/test/TestAwServiceWorkerClient.java",
+    "../javatests/src/org/chromium/android_webview/test/UserAgentTest.java",
+    "../javatests/src/org/chromium/android_webview/test/VisualStateTest.java",
+    "../javatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java",
+    "../javatests/src/org/chromium/android_webview/test/WebViewAsynchronousFindApisTest.java",
+    "../javatests/src/org/chromium/android_webview/test/WebViewFindApisTestBase.java",
+    "../javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java",
+    "../javatests/src/org/chromium/android_webview/test/util/AwQuotaManagerBridgeTestUtil.java",
+    "../javatests/src/org/chromium/android_webview/test/util/AwTestTouchUtils.java",
+    "../javatests/src/org/chromium/android_webview/test/util/CommonResources.java",
+    "../javatests/src/org/chromium/android_webview/test/util/CookieUtils.java",
+    "../javatests/src/org/chromium/android_webview/test/util/GraphicsTestUtils.java",
+    "../javatests/src/org/chromium/android_webview/test/util/ImagePageGenerator.java",
+    "../javatests/src/org/chromium/android_webview/test/util/JSUtils.java",
+    "../javatests/src/org/chromium/android_webview/test/util/JavascriptEventObserver.java",
+    "../javatests/src/org/chromium/android_webview/test/util/VideoSurfaceViewUtils.java",
+    "../javatests/src/org/chromium/android_webview/test/util/VideoTestUtil.java",
+    "../javatests/src/org/chromium/android_webview/test/util/VideoTestWebServer.java",
+  ]
   isolate_file = "../android_webview_test_apk.isolate"
 }
 
@@ -159,7 +254,10 @@ android_library("android_webview_unittests_java") {
     "//base:base_java_test_support",
     "//content/public/test/android:content_java_test_support",
   ]
-  DEPRECATED_java_in_dir = "../unittestjava/src"
+  java_files = [
+    "../unittestjava/src/org/chromium/android_webview/unittest/InputStreamUnittest.java",
+    "../unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java",
+  ]
 }
 
 # GYP: //android_webview/android_webview_tests.gypi:android_webview_unittests_jni