Replace usages of DEPRECATED_java_in_dir with java_files

content/public/android/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 
 content_jni_gypi_values = exec_script("//build/gypi_to_gn.py",
                                       [ rebase_path("../../content_jni.gypi") ],
                                       "scope",
@@ skipping 44 matching lines @@
   ]
 
   srcjar_deps = [
     ":common_aidl",
     ":content_public_android_java_enums_srcjar",
     "//content/browser/accessibility:content_browser_accessibility_java_enums_srcjar",
     "//ui/touch_selection:ui_touch_selection_enums_srcjar",
     "//ui/touch_selection:ui_touch_handle_orientation_srcjar",
   ]
 
-  DEPRECATED_java_in_dir = "java/src"
+  java_files = [
+    "java/src/org/chromium/content/app/ChildProcessService.java",
+    "java/src/org/chromium/content/app/ChromiumLinkerParams.java",
+    "java/src/org/chromium/content/app/ContentApplication.java",
+    "java/src/org/chromium/content/app/ContentMain.java",
+    "java/src/org/chromium/content/app/DownloadProcessService.java",
+    "java/src/org/chromium/content/app/PrivilegedProcessService.java",
+    "java/src/org/chromium/content/app/PrivilegedProcessService0.java",
+    "java/src/org/chromium/content/app/PrivilegedProcessService1.java",
+    "java/src/org/chromium/content/app/PrivilegedProcessService2.java",
+    "java/src/org/chromium/content/app/SandboxedProcessService.java",
+    "java/src/org/chromium/content/app/SandboxedProcessService0.java",
+    "java/src/org/chromium/content/app/SandboxedProcessService1.java",
+    "java/src/org/chromium/content/app/SandboxedProcessService10.java",
+    "java/src/org/chromium/content/app/SandboxedProcessService11.java",
+    "java/src/org/chromium/content/app/SandboxedProcessService12.java",
+    "java/src/org/chromium/content/app/SandboxedProcessService13.java",
+    "java/src/org/chromium/content/app/SandboxedProcessService14.java",
+    "java/src/org/chromium/content/app/SandboxedProcessService15.java",
+    "java/src/org/chromium/content/app/SandboxedProcessService16.java",
+    "java/src/org/chromium/content/app/SandboxedProcessService17.java",
+    "java/src/org/chromium/content/app/SandboxedProcessService18.java",
+    "java/src/org/chromium/content/app/SandboxedProcessService19.java",
+    "java/src/org/chromium/content/app/SandboxedProcessService2.java",
+    "java/src/org/chromium/content/app/SandboxedProcessService3.java",
+    "java/src/org/chromium/content/app/SandboxedProcessService4.java",
+    "java/src/org/chromium/content/app/SandboxedProcessService5.java",
+    "java/src/org/chromium/content/app/SandboxedProcessService6.java",
+    "java/src/org/chromium/content/app/SandboxedProcessService7.java",
+    "java/src/org/chromium/content/app/SandboxedProcessService8.java",
+    "java/src/org/chromium/content/app/SandboxedProcessService9.java",
+    "java/src/org/chromium/content/browser/ActivityContentVideoViewEmbedder.java",
+    "java/src/org/chromium/content/browser/BackgroundSyncNetworkObserver.java",
+    "java/src/org/chromium/content/browser/BindingManager.java",
+    "java/src/org/chromium/content/browser/BindingManagerImpl.java",
+    "java/src/org/chromium/content/browser/BrowserStartupController.java",
+    "java/src/org/chromium/content/browser/ChildProcessConnection.java",
+    "java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java",
+    "java/src/org/chromium/content/browser/ChildProcessConstants.java",
+    "java/src/org/chromium/content/browser/ChildProcessLauncher.java",
+    "java/src/org/chromium/content/browser/ContainerViewObserver.java",
+    "java/src/org/chromium/content/browser/ContentVideoView.java",
+    "java/src/org/chromium/content/browser/ContentVideoViewEmbedder.java",
+    "java/src/org/chromium/content/browser/ContentView.java",
+    "java/src/org/chromium/content/browser/ContentViewClient.java",
+    "java/src/org/chromium/content/browser/ContentViewCore.java",
+    "java/src/org/chromium/content/browser/ContentViewDownloadDelegate.java",
+    "java/src/org/chromium/content/browser/ContentViewRenderView.java",
+    "java/src/org/chromium/content/browser/ContentViewStatics.java",
+    "java/src/org/chromium/content/browser/ContextualSearchClient.java",
+    "java/src/org/chromium/content/browser/DeviceSensors.java",
+    "java/src/org/chromium/content/browser/DeviceUtils.java",
+    "java/src/org/chromium/content/browser/DownloadController.java",
+    "java/src/org/chromium/content/browser/DownloadInfo.java",
+    "java/src/org/chromium/content/browser/FileDescriptorInfo.java",
+    "java/src/org/chromium/content/browser/FloatingWebActionModeCallback.java",
+    "java/src/org/chromium/content/browser/InterstitialPageDelegateAndroid.java",
+    "java/src/org/chromium/content/browser/JavascriptInterface.java",
+    "java/src/org/chromium/content/browser/LocationProviderAdapter.java",
+    "java/src/org/chromium/content/browser/LocationProviderFactory.java",
+    "java/src/org/chromium/content/browser/MediaResourceGetter.java",
+    "java/src/org/chromium/content/browser/MediaSessionDelegate.java",
+    "java/src/org/chromium/content/browser/MediaThrottler.java",
+    "java/src/org/chromium/content/browser/MotionEventSynthesizer.java",
+    "java/src/org/chromium/content/browser/OverscrollRefreshHandler.java",
+    "java/src/org/chromium/content/browser/PepperPluginManager.java",
+    "java/src/org/chromium/content/browser/PopupZoomer.java",
+    "java/src/org/chromium/content/browser/PositionObserver.java",
+    "java/src/org/chromium/content/browser/PowerSaveBlocker.java",
+    "java/src/org/chromium/content/browser/RenderCoordinates.java",
+    "java/src/org/chromium/content/browser/SPenSupport.java",
+    "java/src/org/chromium/content/browser/ScreenOrientationListener.java",
+    "java/src/org/chromium/content/browser/ScreenOrientationProvider.java",
+    "java/src/org/chromium/content/browser/ServiceRegistrar.java",
+    "java/src/org/chromium/content/browser/ServiceRegistry.java",
+    "java/src/org/chromium/content/browser/SmartClipProvider.java",
+    "java/src/org/chromium/content/browser/SpeechRecognition.java",
+    "java/src/org/chromium/content/browser/TimeZoneMonitor.java",
+    "java/src/org/chromium/content/browser/TracingControllerAndroid.java",
+    "java/src/org/chromium/content/browser/ViewPositionObserver.java",
+    "java/src/org/chromium/content/browser/WebActionMode.java",
+    "java/src/org/chromium/content/browser/WebActionModeCallback.java",
+    "java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java",
+    "java/src/org/chromium/content/browser/accessibility/KitKatBrowserAccessibilityManager.java",
+    "java/src/org/chromium/content/browser/accessibility/LollipopBrowserAccessibilityManager.java",
+    "java/src/org/chromium/content/browser/accessibility/captioning/CaptioningBridgeFactory.java",
+    "java/src/org/chromium/content/browser/accessibility/captioning/CaptioningChangeDelegate.java",
+    "java/src/org/chromium/content/browser/accessibility/captioning/CaptioningStyle.java",
+    "java/src/org/chromium/content/browser/accessibility/captioning/EmptyCaptioningBridge.java",
+    "java/src/org/chromium/content/browser/accessibility/captioning/KitKatCaptioningBridge.java",
+    "java/src/org/chromium/content/browser/accessibility/captioning/SystemCaptioningBridge.java",
+    "java/src/org/chromium/content/browser/accessibility/captioning/TextTrackSettings.java",
+    "java/src/org/chromium/content/browser/crypto/ByteArrayGenerator.java",
+    "java/src/org/chromium/content/browser/crypto/CipherFactory.java",
+    "java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java",
+    "java/src/org/chromium/content/browser/input/AnimationIntervalProvider.java",
+    "java/src/org/chromium/content/browser/input/CardboardVRDevice.java",
+    "java/src/org/chromium/content/browser/input/ChromiumBaseInputConnection.java",
+    "java/src/org/chromium/content/browser/input/CursorAnchorInfoController.java",
+    "java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java",
+    "java/src/org/chromium/content/browser/input/FloatingPastePopupMenu.java",
+    "java/src/org/chromium/content/browser/input/GamepadDevice.java",
+    "java/src/org/chromium/content/browser/input/GamepadList.java",
+    "java/src/org/chromium/content/browser/input/GamepadMappings.java",
+    "java/src/org/chromium/content/browser/input/HandleViewResources.java",
+    "java/src/org/chromium/content/browser/input/ImeAdapter.java",
+    "java/src/org/chromium/content/browser/input/ImeUtils.java",
+    "java/src/org/chromium/content/browser/input/InputMethodManagerWrapper.java",
+    "java/src/org/chromium/content/browser/input/InputMethodUma.java",
+    "java/src/org/chromium/content/browser/input/JoystickScrollProvider.java",
+    "java/src/org/chromium/content/browser/input/JoystickZoomProvider.java",
+    "java/src/org/chromium/content/browser/input/LegacyPastePopupMenu.java",
+    "java/src/org/chromium/content/browser/input/PastePopupMenu.java",
+    "java/src/org/chromium/content/browser/input/PopupTouchHandleDrawable.java",
+    "java/src/org/chromium/content/browser/input/Range.java",
+    "java/src/org/chromium/content/browser/input/ReplicaInputConnection.java",
+    "java/src/org/chromium/content/browser/input/SelectPopup.java",
+    "java/src/org/chromium/content/browser/input/SelectPopupAdapter.java",
+    "java/src/org/chromium/content/browser/input/SelectPopupDialog.java",
+    "java/src/org/chromium/content/browser/input/SelectPopupDropdown.java",
+    "java/src/org/chromium/content/browser/input/SelectPopupItem.java",
+    "java/src/org/chromium/content/browser/input/TextInputState.java",
+    "java/src/org/chromium/content/browser/input/ThreadedInputConnection.java",
+    "java/src/org/chromium/content/browser/input/ThreadedInputConnectionFactory.java",
+    "java/src/org/chromium/content/browser/input/ThreadedInputConnectionProxyView.java",
+    "java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java",
+    "java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java",
+    "java/src/org/chromium/content/common/CleanupReference.java",
+    "java/src/org/chromium/content/common/ContentSwitches.java",
+    "java/src/org/chromium/content/common/SurfaceWrapper.java",
+    "java/src/org/chromium/content_public/browser/AccessibilitySnapshotCallback.java",
+    "java/src/org/chromium/content_public/browser/AccessibilitySnapshotNode.java",
+    "java/src/org/chromium/content_public/browser/ContentBitmapCallback.java",
+    "java/src/org/chromium/content_public/browser/GestureStateListener.java",
+    "java/src/org/chromium/content_public/browser/JavaScriptCallback.java",
+    "java/src/org/chromium/content_public/browser/LoadUrlParams.java",
+    "java/src/org/chromium/content_public/browser/NavigationController.java",
+    "java/src/org/chromium/content_public/browser/NavigationEntry.java",
+    "java/src/org/chromium/content_public/browser/NavigationHistory.java",
+    "java/src/org/chromium/content_public/browser/WebContents.java",
+    "java/src/org/chromium/content_public/browser/WebContentsObserver.java",
+    "java/src/org/chromium/content_public/common/MediaMetadata.java",
+    "java/src/org/chromium/content_public/common/Referrer.java",
+    "java/src/org/chromium/content_public/common/ScreenOrientationConstants.java",
+  ]
 
   if (enable_webvr) {
     deps += [ "//third_party/cardboard-java:cardboard-java" ]
   }
 }
 
 java_strings_grd("content_strings_grd") {
   grd_file = "java/strings/android_content_strings.grd"
   outputs = [
     "values-am/android_content_strings.xml",
@@ skipping 107 matching lines @@
     "//mojo/public/interfaces/bindings/tests:test_interfaces_java",
     "//mojo/public/java:bindings",
     "//mojo/public/java:system",
     "//net/android:net_java",
     "//net/android:net_java_test_support",
     "//third_party/android_tools:android_support_v13_java",
     "//third_party/android_tools:legacy_http_javalib",
     "//ui/android:ui_java",
   ]
 
-  DEPRECATED_java_in_dir = "javatests/src"
+  java_files = [
+    "javatests/src/org/chromium/content/browser/AddressDetectionTest.java",
+    "javatests/src/org/chromium/content/browser/BrowserStartupControllerTest.java",
+    "javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java",
+    "javatests/src/org/chromium/content/browser/ClickListenerTest.java",
+    "javatests/src/org/chromium/content/browser/ClipboardTest.java",
+    "javatests/src/org/chromium/content/browser/ContentCommandLineTest.java",
+    "javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java",
+    "javatests/src/org/chromium/content/browser/ContentViewCoreFocusTest.java",
+    "javatests/src/org/chromium/content/browser/ContentViewCoreSelectionTest.java",
+    "javatests/src/org/chromium/content/browser/ContentViewCoreViewAndroidDelegateTest.java",
+    "javatests/src/org/chromium/content/browser/ContentViewLocationTest.java",
+    "javatests/src/org/chromium/content/browser/ContentViewPopupZoomerTest.java",
+    "javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java",
+    "javatests/src/org/chromium/content/browser/ContentViewZoomingTest.java",
+    "javatests/src/org/chromium/content/browser/DeviceSensorsTest.java",
+    "javatests/src/org/chromium/content/browser/DownloadInfoTest.java",
+    "javatests/src/org/chromium/content/browser/EmailAddressDetectionTest.java",
+    "javatests/src/org/chromium/content/browser/EncodeHtmlDataUriTest.java",
+    "javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java",
+    "javatests/src/org/chromium/content/browser/ImportantFileWriterAndroidTest.java",
+    "javatests/src/org/chromium/content/browser/InterstitialPageTest.java",
+    "javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java",
+    "javatests/src/org/chromium/content/browser/JavaBridgeArrayTest.java",
+    "javatests/src/org/chromium/content/browser/JavaBridgeBareboneTest.java",
+    "javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java",
+    "javatests/src/org/chromium/content/browser/JavaBridgeChildFrameTest.java",
+    "javatests/src/org/chromium/content/browser/JavaBridgeCoercionTest.java",
+    "javatests/src/org/chromium/content/browser/JavaBridgeFieldsTest.java",
+    "javatests/src/org/chromium/content/browser/JavaBridgeReturnValuesTest.java",
+    "javatests/src/org/chromium/content/browser/JavaBridgeTestBase.java",
+    "javatests/src/org/chromium/content/browser/LocationProviderTest.java",
+    "javatests/src/org/chromium/content/browser/MediaResourceGetterTest.java",
+    "javatests/src/org/chromium/content/browser/MediaSessionTest.java",
+    "javatests/src/org/chromium/content/browser/NavigationTest.java",
+    "javatests/src/org/chromium/content/browser/PhoneNumberDetectionTest.java",
+    "javatests/src/org/chromium/content/browser/PopupZoomerTest.java",
+    "javatests/src/org/chromium/content/browser/ScreenOrientationListenerTest.java",
+    "javatests/src/org/chromium/content/browser/ScreenOrientationProviderTest.java",
+    "javatests/src/org/chromium/content/browser/ServiceRegistryTest.java",
+    "javatests/src/org/chromium/content/browser/TestsJavaScriptEvalTest.java",
+    "javatests/src/org/chromium/content/browser/TracingControllerAndroidTest.java",
+    "javatests/src/org/chromium/content/browser/VSyncMonitorTest.java",
+    "javatests/src/org/chromium/content/browser/VibrationManagerImplTest.java",
+    "javatests/src/org/chromium/content/browser/ViewportTest.java",
+    "javatests/src/org/chromium/content/browser/WebContentsObserverAndroidTest.java",
+    "javatests/src/org/chromium/content/browser/accessibility/captioning/CaptioningChangeDelegateTest.java",
+    "javatests/src/org/chromium/content/browser/crypto/CipherFactoryTest.java",
+    "javatests/src/org/chromium/content/browser/input/CursorAnchorInfoControllerTest.java",
+    "javatests/src/org/chromium/content/browser/input/ImeLollipopTest.java",
+    "javatests/src/org/chromium/content/browser/input/ImeTest.java",
+    "javatests/src/org/chromium/content/browser/input/ImeTestUtils.java",
+    "javatests/src/org/chromium/content/browser/input/InputDialogContainerTest.java",
+    "javatests/src/org/chromium/content/browser/input/ReplicaInputConnectionTest.java",
+    "javatests/src/org/chromium/content/browser/input/SelectPopupTest.java",
+    "javatests/src/org/chromium/content/browser/input/TestImeAdapterDelegate.java",
+    "javatests/src/org/chromium/content/browser/webcontents/WebContentsTest.java",
+    "javatests/src/org/chromium/content/common/CleanupReferenceTest.java",
+  ]
 }
 
 # GYP: //content/content_tests.gypi:content_junit_tests
 junit_binary("content_junit_tests") {
   java_files = [
     "junit/src/org/chromium/content/browser/input/GamepadMappingsTest.java",
     "junit/src/org/chromium/content/browser/BindingManagerImplTest.java",
   ]
   deps = [
     ":content_java",
     "//base:base_java",
     "//base:base_java_test_support",
   ]
 }