Replace usages of DEPRECATED_java_in_dir with java_files

chrome/android/BUILD.gn

Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index c683640fcae6067b479eb752a0cae887916b0f44..e09a334b4c6a62f7332024c07781ca3bf12a591e 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -12,6 +12,7 @@ import("//testing/test.gni")
 import("//third_party/icu/config.gni")
 import("//third_party/protobuf/proto_library.gni")
 import("channel.gni")
+import("java_sources.gni")
 
 manifest_package = "org.chromium.chrome"
 
@@ -167,7 +168,8 @@ android_library("chrome_java") {
   # TODO(sievers): Split java code into components. Not everything
   # is really all that UI related here.
   if (android_java_ui) {
-    DEPRECATED_java_in_dir = "java/src"
+    # From java_sources.gni.
+    java_files = chrome_java_sources
 
     srcjar_deps += [
       ":custom_tabs_service_aidl",
@@ -342,7 +344,9 @@ android_aidl("custom_tabs_service_aidl") {
 # GYP: //chrome/android/chrome_apk.gyp:chrome_shared_test_java
 android_library("chrome_shared_test_java") {
   testonly = true
-  DEPRECATED_java_in_dir = "javatests/src"
+
+  # From java_sources.gni.
+  java_files = chrome_shared_test_java_sources
 
   deps = [
     "//base:base_java",
@@ -379,6 +383,8 @@ android_library("chrome_shared_test_java") {
     "//ui/android:ui_javatests",
     google_play_services_library,
   ]
+
+  # From java_sources.gni.

[pkotwicz, 2016/03/23 18:15:23]

Why is the comment here?

[agrieve, 2016/03/23 18:27:13]

Done.

 }
 
 # Overrides icon / name defined in chrome_java_resources.
@@ -555,7 +561,19 @@ instrumentation_test_apk("chrome_public_test_apk") {
 
 android_library("chrome_sync_shell_test_apk_java") {
   testonly = true
-  DEPRECATED_java_in_dir = "sync_shell/javatests/src"
+  java_files = [
+    "sync_shell/javatests/src/org/chromium/chrome/browser/sync/AutofillTest.java",
+    "sync_shell/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java",
+    "sync_shell/javatests/src/org/chromium/chrome/browser/sync/FakeServerHelper.java",
+    "sync_shell/javatests/src/org/chromium/chrome/browser/sync/FirstRunTest.java",
+    "sync_shell/javatests/src/org/chromium/chrome/browser/sync/GmsCoreSyncListenerTest.java",
+    "sync_shell/javatests/src/org/chromium/chrome/browser/sync/OpenTabsTest.java",
+    "sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java",
+    "sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java",
+    "sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java",
+    "sync_shell/javatests/src/org/chromium/chrome/browser/sync/TypedUrlsTest.java",
+    "sync_shell/javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragmentTest.java",
+  ]
 
   deps = [
     "//base:base_java",