Replace java_files with sources in //chrome/android

Replace usages of java_files with sources in all //chrome/android
BUILD.gn files, and automatically format.

Also include "sources" in the lists of forwarded variables alongside
"java_files" where necessary.

Bug: 1035074
Change-Id: I5b570a3a0115993b2ba517362b47a31f64edcc1e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1973243Reviewed-by: Eric Stevenson <estevenson@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726568}

build/config/android/rules.gni

@@ -2837,6 +2837,7 @@ if (enable_java_templates) {
                                "processor_args_javac",
                                "secondary_abi_loadable_modules",
                                "secondary_native_lib_placeholders",
+                               "sources",
                                "static_library_dependent_targets",
                              ])
       deps = _deps
@@ -3510,6 +3511,7 @@ if (enable_java_templates) {
                                "shared_resources_whitelist_locales",
                                "shared_resources_whitelist_target",
                                "short_resource_paths",
+                               "sources",
                                "srcjar_deps",
                                "static_library_dependent_targets",
                                "static_library_provider",

chrome/android/features/android_library_factory_tmpl.gni

@@ -92,7 +92,7 @@ template("android_library_factory") {
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
-    java_files = get_target_outputs(":$_process_factory_target_name")
+    sources = get_target_outputs(":$_process_factory_target_name")
     jar_excluded_patterns = [ "*" ]
   }
 }

chrome/android/features/dev_ui/BUILD.gn

@@ -18,5 +18,7 @@ android_library("java") {
     "//base:base_java",
     "//chrome/android/features/dev_ui/public:java",
   ]
-  java_files = [ "java/src/org/chromium/chrome/features/dev_ui/DevUiImpl.java" ]
+  sources = [
+    "java/src/org/chromium/chrome/features/dev_ui/DevUiImpl.java",
+  ]
 }

chrome/android/features/dev_ui/public/BUILD.gn

@@ -10,7 +10,9 @@ android_library("java") {
     "//components/module_installer/android:module_installer_java",
     "//components/module_installer/android:module_interface_java",
   ]
-  java_files = [ "java/src/org/chromium/chrome/features/dev_ui/DevUi.java" ]
+  sources = [
+    "java/src/org/chromium/chrome/features/dev_ui/DevUi.java",
+  ]
 
   # Need this to generate DevUiModule.java.
   annotation_processor_deps =

chrome/android/features/keyboard_accessory/BUILD.gn

@@ -30,24 +30,24 @@ generate_jni("jni_headers") {
 android_library("test_java") {
   testonly = true
 
-  java_files = [
+  sources = [
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/AutofillKeyboardAccessoryIntegrationTest.java",
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/FakeKeyboard.java",
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingIntegrationTest.java",
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingTestHelper.java",
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingUiCaptureTest.java",
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/PasswordGenerationIntegrationTest.java",
-    "javatests/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryViewTest.java",
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryModernViewTest.java",
+    "javatests/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryViewTest.java",
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_component/AccessorySheetViewTest.java",
-    "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AddressAccessorySheetViewTest.java",
+    "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AccessorySheetTabViewTest.java",
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AddressAccessoryIntegrationTest.java",
-    "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/CreditCardAccessorySheetViewTest.java",
+    "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AddressAccessorySheetViewTest.java",
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/CreditCardAccessoryIntegrationTest.java",
+    "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/CreditCardAccessorySheetViewTest.java",
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessoryIntegrationTest.java",
-    "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetViewTest.java",
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetModernViewTest.java",
-    "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AccessorySheetTabViewTest.java",
+    "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetViewTest.java",
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/tab_layout_component/KeyboardAccessoryTabLayoutViewTest.java",
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/tab_layout_component/KeyboardAccessoryTabTestHelper.java",
   ]
@@ -84,10 +84,10 @@ android_library("test_java") {
 junit_binary("keyboard_accessory_junit_tests") {
   testonly = true
 
-  java_files = [
-    "junit/src/org/chromium/chrome/browser/keyboard_accessory/sheet_component/AccessorySheetControllerTest.java",
+  sources = [
     "junit/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingControllerTest.java",
     "junit/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryControllerTest.java",
+    "junit/src/org/chromium/chrome/browser/keyboard_accessory/sheet_component/AccessorySheetControllerTest.java",
     "junit/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AddressAccessorySheetControllerTest.java",
     "junit/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/CreditCardAccessorySheetControllerTest.java",
     "junit/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetControllerTest.java",

chrome/android/features/keyboard_accessory/factory/BUILD.gn

@@ -18,5 +18,5 @@ android_library("internal_java") {
   deps = [
     "//chrome/android/features/keyboard_accessory/internal:internal_java",
   ]
-  java_files = _factory_sources
+  sources = _factory_sources
 }

chrome/android/features/keyboard_accessory/internal/BUILD.gn

@@ -29,7 +29,7 @@ android_library("internal_java") {
     "//ui/android:ui_java",
     "//ui/android:ui_utils_java",
   ]
-  java_files = [
+  sources = [
     "java/src/org/chromium/chrome/browser/keyboard_accessory/AutofillKeyboardAccessoryViewBridge.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/KeyboardExtensionViewResizer.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingComponentBridge.java",
@@ -40,10 +40,10 @@ android_library("internal_java") {
     "java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingState.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingStateCache.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryCoordinator.java",
+    "java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryIPHUtils.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryMediator.java",
-    "java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryModernView.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryMetricsRecorder.java",
-    "java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryIPHUtils.java",
+    "java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryModernView.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryModernViewBinder.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryProperties.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryRecyclerViewMcp.java",

chrome/android/features/keyboard_accessory/public/BUILD.gn

@@ -11,11 +11,11 @@ android_library("public_java") {
     "//components/autofill/android:autofill_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
-  java_files = [
+  sources = [
     "java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingComponent.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/data/KeyboardAccessoryData.java",
-    "java/src/org/chromium/chrome/browser/keyboard_accessory/data/Provider.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/data/PropertyProvider.java",
+    "java/src/org/chromium/chrome/browser/keyboard_accessory/data/Provider.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/data/UserInfoField.java",
   ]
   srcjar_deps = [ ":java_enums_srcjar" ]

chrome/android/features/media_router/BUILD.gn

@@ -24,7 +24,7 @@ android_library("java") {
     "//third_party/android_deps:com_android_support_support_compat_java",
     "//third_party/android_media:android_media_java",
   ]
-  java_files = [
+  sources = [
     "java/src/org/chromium/chrome/browser/media/router/BaseMediaRouteDialogManager.java",
     "java/src/org/chromium/chrome/browser/media/router/CastRequestIdGenerator.java",
     "java/src/org/chromium/chrome/browser/media/router/CastSessionUtil.java",
@@ -81,7 +81,7 @@ generate_jni("jni_headers") {
 android_library("test_java") {
   testonly = true
 
-  java_files = [
+  sources = [
     "javatests/src/org/chromium/chrome/browser/media/router/MediaRouterIntegrationTest.java",
     "javatests/src/org/chromium/chrome/browser/media/router/MockMediaRouteProvider.java",
   ]
@@ -102,7 +102,7 @@ android_library("test_java") {
 }
 
 junit_binary("media_router_junit_tests") {
-  java_files = [
+  sources = [
     "junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterRouteTest.java",
     "junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterSinkObservationTest.java",
     "junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterTestBase.java",

chrome/android/features/stack_unwinder/internal/BUILD.gn

@@ -11,7 +11,9 @@ android_library("java") {
     "//base:base_java",
     "//chrome/android/features/stack_unwinder/public:java",
   ]
-  java_files = [ "java/src/org/chromium/chrome/features/stack_unwinder/StackUnwinderImpl.java" ]
+  sources = [
+    "java/src/org/chromium/chrome/features/stack_unwinder/StackUnwinderImpl.java",
+  ]
 
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   deps += [ "//base:jni_java" ]

chrome/android/features/stack_unwinder/public/BUILD.gn

@@ -5,7 +5,7 @@
 import("//build/config/android/rules.gni")
 
 android_library("java") {
-  java_files = [
+  sources = [
     "java/src/org/chromium/chrome/features/stack_unwinder/StackUnwinder.java",
   ]
 }

chrome/android/features/start_surface/internal/BUILD.gn

@@ -28,17 +28,17 @@ android_resources("java_resources") {
 }
 
 android_library("java") {
-  java_files = [
+  sources = [
     "java/src/org/chromium/chrome/features/start_surface/BottomBarCoordinator.java",
     "java/src/org/chromium/chrome/features/start_surface/BottomBarView.java",
     "java/src/org/chromium/chrome/features/start_surface/BottomBarViewBinder.java",
     "java/src/org/chromium/chrome/features/start_surface/ReturnToStartSurfaceUtil.java",
+    "java/src/org/chromium/chrome/features/start_surface/SecondaryTasksSurfaceViewBinder.java",
     "java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java",
     "java/src/org/chromium/chrome/features/start_surface/StartSurfaceDelegate.java",
     "java/src/org/chromium/chrome/features/start_surface/StartSurfaceLayout.java",
     "java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java",
     "java/src/org/chromium/chrome/features/start_surface/StartSurfaceProperties.java",
-    "java/src/org/chromium/chrome/features/start_surface/SecondaryTasksSurfaceViewBinder.java",
     "java/src/org/chromium/chrome/features/start_surface/TasksSurfaceViewBinder.java",
   ]
 
@@ -54,7 +54,7 @@ android_library("java") {
   ]
 
   if (enable_feed_in_chrome) {
-    java_files += [
+    sources += [
       "java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceActionHandler.java",
       "java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceCoordinator.java",
       "java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceNavigationDelegate.java",
@@ -70,7 +70,7 @@ android_library("java") {
       "//ui/base/mojom:mojom_java",
     ]
   } else {
-    java_files += [ "dummy/java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceCoordinator.java" ]
+    sources += [ "dummy/java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceCoordinator.java" ]
   }
 
   if (!is_java_debug) {

chrome/android/features/tab_ui/BUILD.gn

@@ -28,17 +28,23 @@ android_resources("java_resources") {
 }
 
 android_library("java") {
-  java_files = [
+  sources = [
     "java/src/org/chromium/chrome/browser/tasks/MostVisitedListCoordinator.java",
     "java/src/org/chromium/chrome/browser/tasks/MostVisitedListViewBinder.java",
-    "java/src/org/chromium/chrome/browser/tasks/TasksSurfaceMediator.java",
     "java/src/org/chromium/chrome/browser/tasks/TasksSurfaceCoordinator.java",
+    "java/src/org/chromium/chrome/browser/tasks/TasksSurfaceMediator.java",
     "java/src/org/chromium/chrome/browser/tasks/TasksView.java",
     "java/src/org/chromium/chrome/browser/tasks/TasksViewBinder.java",
     "java/src/org/chromium/chrome/browser/tasks/pseudotab/PseudoTab.java",
     "java/src/org/chromium/chrome/browser/tasks/pseudotab/TabAttributeCache.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupUtils.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/ClosableTabGridView.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardProviderCoordinator.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardProviderMediator.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardView.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardViewBinder.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardViewProperties.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageService.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/MultiThumbnailCardProvider.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/SelectableTabGridView.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogCoordinator.java",
@@ -56,12 +62,6 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridPanelProperties.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridPanelToolbarCoordinator.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridPanelViewBinder.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardProviderCoordinator.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardProviderMediator.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardViewProperties.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardView.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardViewBinder.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageService.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupPopupUiCoordinator.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupPopupUiMediator.java",
@@ -99,15 +99,15 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiColorProvider.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/UndoGroupSnackbarController.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionProvider.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/StaleTabSuggestionProvider.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContextObserver.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsRanker.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionProvider.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionProviderConfiguration.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsClientFetcher.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsFetcher.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsOrchestrator.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsFetcherResults.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsClientFetcher.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsOrchestrator.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsRanker.java",
   ]
 
   deps = [

chrome/android/features/test_dummy/internal/BUILD.gn

@@ -21,8 +21,9 @@ android_library("java") {
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
-  java_files =
-      [ "java/src/org/chromium/chrome/features/test_dummy/TestDummyImpl.java" ]
+  sources = [
+    "java/src/org/chromium/chrome/features/test_dummy/TestDummyImpl.java",
+  ]
 
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   deps += [ "//base:jni_java" ]
@@ -54,7 +55,7 @@ android_library("base_module_java") {
     "//chrome/android/modules/test_dummy/public:java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
   ]
-  java_files = [
+  sources = [
     "java/src/org/chromium/chrome/features/test_dummy/TestDummyActivity.java",
   ]
 }

chrome/android/features/test_dummy/public/BUILD.gn

@@ -5,6 +5,7 @@
 import("//build/config/android/rules.gni")
 
 android_library("java") {
-  java_files =
-      [ "java/src/org/chromium/chrome/features/test_dummy/TestDummy.java" ]
+  sources = [
+    "java/src/org/chromium/chrome/features/test_dummy/TestDummy.java",
+  ]
 }

chrome/android/features/vr/BUILD.gn

@@ -29,14 +29,10 @@ android_resources("java_resources") {
 }
 
 android_library("java") {
-  java_files = [
+  sources = [
     "java/src/org/chromium/chrome/browser/vr/AndroidUiGestureTarget.java",
     "java/src/org/chromium/chrome/browser/vr/AndroidVSyncHelper.java",
     "java/src/org/chromium/chrome/browser/vr/EmptySniffingVrViewContainer.java",
-    "java/src/org/chromium/chrome/browser/vr/keyboard/BuildConstants.java",
-    "java/src/org/chromium/chrome/browser/vr/keyboard/GvrKeyboardLoaderClient.java",
-    "java/src/org/chromium/chrome/browser/vr/keyboard/TextEditAction.java",
-    "java/src/org/chromium/chrome/browser/vr/keyboard/VrInputMethodManagerWrapper.java",
     "java/src/org/chromium/chrome/browser/vr/NoopCanvas.java",
     "java/src/org/chromium/chrome/browser/vr/OnDispatchTouchEventCallback.java",
     "java/src/org/chromium/chrome/browser/vr/VrAlertDialog.java",
@@ -46,13 +42,13 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/vr/VrCoreVersionChecker.java",
     "java/src/org/chromium/chrome/browser/vr/VrDaydreamApi.java",
     "java/src/org/chromium/chrome/browser/vr/VrDelegateImpl.java",
-    "java/src/org/chromium/chrome/browser/vr/VrIntentDelegateImpl.java",
     "java/src/org/chromium/chrome/browser/vr/VrDelegateProviderImpl.java",
     "java/src/org/chromium/chrome/browser/vr/VrDialog.java",
     "java/src/org/chromium/chrome/browser/vr/VrDialogManager.java",
     "java/src/org/chromium/chrome/browser/vr/VrFeedbackStatus.java",
     "java/src/org/chromium/chrome/browser/vr/VrFirstRunActivity.java",
     "java/src/org/chromium/chrome/browser/vr/VrInputConnection.java",
+    "java/src/org/chromium/chrome/browser/vr/VrIntentDelegateImpl.java",
     "java/src/org/chromium/chrome/browser/vr/VrModalPresenter.java",
     "java/src/org/chromium/chrome/browser/vr/VrPopupWindow.java",
     "java/src/org/chromium/chrome/browser/vr/VrShell.java",
@@ -62,6 +58,10 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/vr/VrUiWidgetFactory.java",
     "java/src/org/chromium/chrome/browser/vr/VrViewContainer.java",
     "java/src/org/chromium/chrome/browser/vr/VrWindowAndroid.java",
+    "java/src/org/chromium/chrome/browser/vr/keyboard/BuildConstants.java",
+    "java/src/org/chromium/chrome/browser/vr/keyboard/GvrKeyboardLoaderClient.java",
+    "java/src/org/chromium/chrome/browser/vr/keyboard/TextEditAction.java",
+    "java/src/org/chromium/chrome/browser/vr/keyboard/VrInputMethodManagerWrapper.java",
   ]
 
   deps = [

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/BUILD.gn

@@ -455,7 +455,7 @@ android_resources("sharedstream_contextmenumanager_resources") {
 
 android_library("feed_lib_java") {
   chromium_code = false
-  java_files = feed_lib_java_sources
+  sources = feed_lib_java_sources
 
   deps = [
     ":basicstream_internal_drivers_resources",
@@ -485,7 +485,7 @@ android_library("feed_lib_java") {
 
 android_library("feed_conformance_test_lib_android_java") {
   chromium_code = false
-  java_files = feed_conformance_test_lib_sources
+  sources = feed_conformance_test_lib_sources
   testonly = true
   deps = [
     ":feed_lib_java",

chrome/android/modules/chime/internal/BUILD.gn

@@ -7,8 +7,9 @@ import("//build/config/android/rules.gni")
 # Upstream chime DFM implementation which does nothing, the actual
 # implementation lives in downstream repo.
 android_library("java") {
-  java_files =
-      [ "java/src/org/chromium/chrome/modules/chime/ChimeModuleEntryImpl.java" ]
+  sources = [
+    "java/src/org/chromium/chrome/modules/chime/ChimeModuleEntryImpl.java",
+  ]
 
   deps = [
     "//base:base_java",

chrome/android/modules/chime/public/BUILD.gn

@@ -5,8 +5,9 @@
 import("//build/config/android/rules.gni")
 
 android_library("java") {
-  java_files =
-      [ "java/src/org/chromium/chrome/modules/chime/ChimeModuleEntry.java" ]
+  sources = [
+    "java/src/org/chromium/chrome/modules/chime/ChimeModuleEntry.java",
+  ]
 
   deps = [
     "//base:base_java",

chrome/android/modules/dev_ui/provider/BUILD.gn

@@ -12,7 +12,7 @@ android_library("java") {
     "//components/module_installer/android:module_installer_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
-  java_files = [
+  sources = [
     "java/src/org/chromium/chrome/features/dev_ui/DevUiInstallListener.java",
     "java/src/org/chromium/chrome/features/dev_ui/DevUiModuleProvider.java",
   ]

chrome/android/modules/extra_icu/internal/BUILD.gn

@@ -5,8 +5,9 @@
 import("//build/config/android/rules.gni")
 
 android_library("java") {
-  java_files =
-      [ "java/src/org/chromium/chrome/modules/extra_icu/ExtraIcuImpl.java" ]
+  sources = [
+    "java/src/org/chromium/chrome/modules/extra_icu/ExtraIcuImpl.java",
+  ]
   deps = [
     "//base:base_java",
     "//chrome/android/modules/extra_icu/public:java",

chrome/android/modules/extra_icu/provider/BUILD.gn

@@ -9,7 +9,9 @@ android_library("java") {
     "//base:base_java",
     "//chrome/android/modules/extra_icu/public:java",
   ]
-  java_files = [ "java/src/org/chromium/chrome/modules/extra_icu/ExtraIcuModuleProvider.java" ]
+  sources = [
+    "java/src/org/chromium/chrome/modules/extra_icu/ExtraIcuModuleProvider.java",
+  ]
 }
 
 generate_jni("jni_headers") {

chrome/android/modules/extra_icu/public/BUILD.gn

@@ -5,8 +5,9 @@
 import("//build/config/android/rules.gni")
 
 android_library("java") {
-  java_files =
-      [ "java/src/org/chromium/chrome/modules/extra_icu/ExtraIcu.java" ]
+  sources = [
+    "java/src/org/chromium/chrome/modules/extra_icu/ExtraIcu.java",
+  ]
   deps = [
     "//components/module_installer/android:module_installer_java",
     "//components/module_installer/android:module_interface_java",

chrome/android/modules/image_editor/internal/BUILD.gn

@@ -7,7 +7,9 @@ import("//build/config/android/rules.gni")
 # Upstream ImageEditor DFM implementation which does nothing. Actual
 # implementation lives downstream.
 android_library("java") {
-  java_files = [ "java/src/org/chromium/chrome/modules/image_editor/ImageEditorProviderImpl.java" ]
+  sources = [
+    "java/src/org/chromium/chrome/modules/image_editor/ImageEditorProviderImpl.java",
+  ]
 
   deps = [
     "//chrome/android/modules/image_editor/public:java",

chrome/android/modules/image_editor/provider/BUILD.gn

@@ -5,7 +5,9 @@
 import("//build/config/android/rules.gni")
 
 android_library("java") {
-  java_files = [ "java/src/org/chromium/chrome/modules/image_editor/ImageEditorModuleProvider.java" ]
+  sources = [
+    "java/src/org/chromium/chrome/modules/image_editor/ImageEditorModuleProvider.java",
+  ]
 
   deps = [
     "//chrome/android/modules/image_editor/public:java",

chrome/android/modules/image_editor/public/BUILD.gn

@@ -5,7 +5,9 @@
 import("//build/config/android/rules.gni")
 
 android_library("java") {
-  java_files = [ "java/src/org/chromium/chrome/modules/image_editor/ImageEditorProvider.java" ]
+  sources = [
+    "java/src/org/chromium/chrome/modules/image_editor/ImageEditorProvider.java",
+  ]
 
   deps = [
     "//chrome/browser/image_editor/public:java",

chrome/android/modules/stack_unwinder/internal/BUILD.gn

@@ -6,7 +6,9 @@ import("//build/config/android/rules.gni")
 import("//chrome/android/modules/buildflags.gni")
 
 android_library("java") {
-  java_files = [ "java/src/org/chromium/chrome/modules/stack_unwinder/StackUnwinderProviderImpl.java" ]
+  sources = [
+    "java/src/org/chromium/chrome/modules/stack_unwinder/StackUnwinderProviderImpl.java",
+  ]
   deps = [
     "//base:base_java",
     "//chrome/android/features/stack_unwinder/internal:java",

chrome/android/modules/stack_unwinder/provider/BUILD.gn

@@ -11,5 +11,7 @@ android_library("java") {
     "//chrome/android/features/stack_unwinder/public:java",
     "//chrome/android/modules/stack_unwinder/public:java",
   ]
-  java_files = [ "java/src/org/chromium/chrome/modules/stack_unwinder/StackUnwinderModuleProvider.java" ]
+  sources = [
+    "java/src/org/chromium/chrome/modules/stack_unwinder/StackUnwinderModuleProvider.java",
+  ]
 }

chrome/android/modules/stack_unwinder/public/BUILD.gn

@@ -5,7 +5,9 @@
 import("//build/config/android/rules.gni")
 
 android_library("java") {
-  java_files = [ "java/src/org/chromium/chrome/modules/stack_unwinder/StackUnwinderProvider.java" ]
+  sources = [
+    "java/src/org/chromium/chrome/modules/stack_unwinder/StackUnwinderProvider.java",
+  ]
   deps = [
     "//base:base_java",
     "//chrome/android/features/stack_unwinder/public:java",

chrome/android/modules/test_dummy/internal/BUILD.gn

@@ -6,7 +6,9 @@ import("//build/config/android/rules.gni")
 import("//chrome/android/modules/buildflags.gni")
 
 android_library("java") {
-  java_files = [ "java/src/org/chromium/chrome/modules/test_dummy/TestDummyProviderImpl.java" ]
+  sources = [
+    "java/src/org/chromium/chrome/modules/test_dummy/TestDummyProviderImpl.java",
+  ]
   deps = [
     "//base:base_java",
     "//chrome/android/features/test_dummy/internal:java",

chrome/android/modules/test_dummy/provider/BUILD.gn

@@ -11,5 +11,7 @@ android_library("java") {
     "//chrome/android/features/test_dummy/public:java",
     "//chrome/android/modules/test_dummy/public:java",
   ]
-  java_files = [ "java/src/org/chromium/chrome/modules/test_dummy/TestDummyModuleProvider.java" ]
+  sources = [
+    "java/src/org/chromium/chrome/modules/test_dummy/TestDummyModuleProvider.java",
+  ]
 }

chrome/android/modules/test_dummy/public/BUILD.gn

@@ -5,7 +5,7 @@
 import("//build/config/android/rules.gni")
 
 android_library("java") {
-  java_files = [
+  sources = [
     "java/src/org/chromium/chrome/modules/test_dummy/TestDummyProvider.java",
   ]
   deps = [

chrome/android/public/crypto/BUILD.gn

@@ -9,7 +9,7 @@ android_library("java") {
     "//base:base_java",
     "//content/public/android:content_java",
   ]
-  java_files = [
+  sources = [
     "java/src/org/chromium/chrome/browser/crypto/ByteArrayGenerator.java",
     "java/src/org/chromium/chrome/browser/crypto/CipherFactory.java",
   ]

chrome/android/public/profiles/BUILD.gn

@@ -14,7 +14,7 @@ android_library("java") {
     "//content/public/android:content_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
-  java_files = [
+  sources = [
     "java/src/org/chromium/chrome/browser/cookies/CanonicalCookie.java",
     "java/src/org/chromium/chrome/browser/cookies/CookiesFetcher.java",
     "java/src/org/chromium/chrome/browser/profiles/Profile.java",

chrome/android/third_party/compositor_animator/BUILD.gn

@@ -6,5 +6,7 @@
 import("//build/config/android/rules.gni")
 
 android_library("compositor_animator_java") {
-  java_files = [ "java/src/org/chromium/chrome/browser/compositor/animation/FloatProperty.java" ]
+  sources = [
+    "java/src/org/chromium/chrome/browser/compositor/animation/FloatProperty.java",
+  ]
 }

chrome/android/webapk/libs/client/BUILD.gn

@@ -7,10 +7,10 @@ import("//chrome/android/webapk/libs/runtime_library_version.gni")
 import("//chrome/android/webapk/shell_apk/request_update_for_version.gni")
 
 android_library("client_java") {
-  java_files = [
+  sources = [
     "src/org/chromium/webapk/lib/client/DexOptimizer.java",
-    "src/org/chromium/webapk/lib/client/WebApkNavigationClient.java",
     "src/org/chromium/webapk/lib/client/WebApkIdentityServiceClient.java",
+    "src/org/chromium/webapk/lib/client/WebApkNavigationClient.java",
     "src/org/chromium/webapk/lib/client/WebApkServiceConnectionManager.java",
     "src/org/chromium/webapk/lib/client/WebApkValidator.java",
     "src/org/chromium/webapk/lib/client/WebApkVerifySignature.java",
@@ -36,7 +36,7 @@ java_cpp_template("runtime_library_version_java") {
 }
 
 junit_binary("webapk_client_junit_tests") {
-  java_files = [
+  sources = [
     "junit/src/org/chromium/webapk/lib/client/WebApkIdentityServiceClientTest.java",
     "junit/src/org/chromium/webapk/lib/client/WebApkServiceConnectionManagerTest.java",
     "junit/src/org/chromium/webapk/lib/client/WebApkValidatorTest.java",

chrome/android/webapk/libs/common/BUILD.gn

@@ -5,7 +5,7 @@
 import("//build/config/android/rules.gni")
 
 android_library("common_java") {
-  java_files = [
+  sources = [
     "src/org/chromium/webapk/lib/common/WebApkCommonUtils.java",
     "src/org/chromium/webapk/lib/common/WebApkConstants.java",
     "src/org/chromium/webapk/lib/common/WebApkMetaDataKeys.java",
@@ -15,7 +15,9 @@ android_library("common_java") {
 }
 
 android_library("splash_java") {
-  java_files = [ "src/org/chromium/webapk/lib/common/splash/SplashLayout.java" ]
+  sources = [
+    "src/org/chromium/webapk/lib/common/splash/SplashLayout.java",
+  ]
   deps = [
     ":splash_resources",
     "//third_party/android_deps:androidx_annotation_annotation_java",

chrome/android/webapk/libs/runtime_library/BUILD.gn

@@ -31,8 +31,9 @@ android_library("webapk_service_aidl_java") {
 # library because the dx tool expects files ending in .dex.jar
 android_library("runtime_library_for_assets_java") {
   jacoco_never_instrument = true
-  java_files =
-      [ "src/org/chromium/webapk/lib/runtime_library/WebApkServiceImpl.java" ]
+  sources = [
+    "src/org/chromium/webapk/lib/runtime_library/WebApkServiceImpl.java",
+  ]
   srcjar_deps = [ ":webapk_service_aidl" ]
   deps = [
     "//third_party/android_deps:com_android_support_support_compat_java",
@@ -41,8 +42,9 @@ android_library("runtime_library_for_assets_java") {
 
 # The subset of runtime_library_from_assets_java needed for tests.
 android_library("runtime_library_for_tests_java") {
-  java_files =
-      [ "src/org/chromium/webapk/lib/runtime_library/WebApkServiceImpl.java" ]
+  sources = [
+    "src/org/chromium/webapk/lib/runtime_library/WebApkServiceImpl.java",
+  ]
   deps = [
     ":webapk_service_aidl_java",
     "//third_party/android_deps:com_android_support_support_compat_java",
@@ -76,7 +78,9 @@ android_assets("runtime_library_assets") {
 
 android_library("runtime_library_javatests") {
   testonly = true
-  java_files = [ "javatests/src/org/chromium/webapk/lib/runtime_library/WebApkServiceImplTest.java" ]
+  sources = [
+    "javatests/src/org/chromium/webapk/lib/runtime_library/WebApkServiceImplTest.java",
+  ]
   deps = [
     ":runtime_library_for_tests_java",
     ":webapk_service_aidl_java",

chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_service/BUILD.gn

@@ -15,7 +15,9 @@ android_apk("apk_with_webapk_service") {
 
   android_manifest = "AndroidManifest.xml"
   apk_name = "ApkWithWebApkService"
-  java_files = [ "src/org/chromium/webapk/lib/runtime_library/test/TestWebApkServiceImplWrapper.java" ]
+  sources = [
+    "src/org/chromium/webapk/lib/runtime_library/test/TestWebApkServiceImplWrapper.java",
+  ]
   deps = [
     "//chrome/android/webapk/libs/runtime_library:runtime_library_for_tests_java",
     "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java",

chrome/android/webapk/shell_apk/BUILD.gn

@@ -18,7 +18,9 @@ h2o_junit_manifest_target_name = "h2o_j_unit_manifest_target"
 # old copy of the runtime library.
 android_library("compiled_in_runtime_library_java") {
   chromium_code = false
-  java_files = [ "src/org/chromium/webapk/lib/runtime_library/IWebApkApi.java" ]
+  sources = [
+    "src/org/chromium/webapk/lib/runtime_library/IWebApkApi.java",
+  ]
 }
 
 mustache_pass("generate_old_style_manifest_for_upload") {
@@ -50,12 +52,12 @@ template("webapk_java") {
                              "deps",
                            ])
 
-    java_files = [
+    sources = [
+      "src/org/chromium/webapk/shell_apk/ChooseHostBrowserDialog.java",
+      "src/org/chromium/webapk/shell_apk/DexLoader.java",
       "src/org/chromium/webapk/shell_apk/HostBrowserClassLoader.java",
       "src/org/chromium/webapk/shell_apk/HostBrowserLauncher.java",
       "src/org/chromium/webapk/shell_apk/HostBrowserLauncherParams.java",
-      "src/org/chromium/webapk/shell_apk/ChooseHostBrowserDialog.java",
-      "src/org/chromium/webapk/shell_apk/DexLoader.java",
       "src/org/chromium/webapk/shell_apk/HostBrowserUtils.java",
       "src/org/chromium/webapk/shell_apk/IdentityService.java",
       "src/org/chromium/webapk/shell_apk/InstallHostBrowserDialog.java",
@@ -88,7 +90,7 @@ template("webapk_with_service_java") {
                              "deps",
                            ])
 
-    java_files = [
+    sources = [
       "src/org/chromium/webapk/shell_apk/WebApkServiceFactory.java",
       "src/org/chromium/webapk/shell_apk/WebApkServiceImplWrapper.java",
     ]
@@ -260,7 +262,7 @@ webapk_tmpl("h2o_j_unit_webapk") {
 
 android_library("shell_apk_javatests") {
   testonly = true
-  java_files = [
+  sources = [
     "javatests/src/org/chromium/webapk/shell_apk/DexLoaderTest.java",
     "javatests/src/org/chromium/webapk/shell_apk/h2o/SplashUtilsTest.java",
   ]
@@ -277,7 +279,7 @@ android_library("shell_apk_javatests") {
 }
 
 junit_binary("webapk_shell_apk_junit_tests") {
-  java_files = [
+  sources = [
     "junit/src/org/chromium/webapk/shell_apk/HostBrowserClassLoaderTest.java",
     "junit/src/org/chromium/webapk/shell_apk/HostBrowserLauncherParamsTest.java",
     "junit/src/org/chromium/webapk/shell_apk/HostBrowserUtilsTest.java",
@@ -295,7 +297,7 @@ junit_binary("webapk_shell_apk_junit_tests") {
 }
 
 junit_binary("webapk_shell_apk_h2o_junit_tests") {
-  java_files = [
+  sources = [
     "junit/src/org/chromium/webapk/shell_apk/CustomAndroidOsShadowAsyncTask.java",
     "junit/src/org/chromium/webapk/shell_apk/TestBrowserInstaller.java",
     "junit/src/org/chromium/webapk/shell_apk/h2o/LaunchTest.java",

chrome/android/webapk/shell_apk/javatests/canary_lib/BUILD.gn

@@ -6,12 +6,16 @@ import("//build/config/android/rules.gni")
 
 android_library("canary_lib_java") {
   dex_path = "$target_out_dir/canary.dex"
-  java_files = [ "src/org/chromium/webapk/shell_apk/test/canary/Canary.java" ]
+  sources = [
+    "src/org/chromium/webapk/shell_apk/test/canary/Canary.java",
+  ]
 }
 
 android_library("canary_lib2_java") {
   dex_path = "$target_out_dir/canary2.dex"
-  java_files = [ "src/org/chromium/webapk/shell_apk/test/canary/Canary2.java" ]
+  sources = [
+    "src/org/chromium/webapk/shell_apk/test/canary/Canary2.java",
+  ]
 }
 
 # dex assets added to dex_optimizer_apk in order to test creating ClassLoader

chrome/android/webapk/shell_apk/javatests/dex_optimizer/BUILD.gn

@@ -24,7 +24,9 @@ android_apk("dex_optimizer_apk") {
   min_sdk_version = 16
   apk_name = "DexOptimizer"
   chromium_code = false
-  java_files = [ "src/org/chromium/webapk/shell_apk/test/dex_optimizer/DexOptimizerServiceImpl.java" ]
+  sources = [
+    "src/org/chromium/webapk/shell_apk/test/dex_optimizer/DexOptimizerServiceImpl.java",
+  ]
   deps = [
     "//base:base_java",
     "//chrome/android/webapk/libs/client:client_java",

chrome/android/webapk/test/BUILD.gn

@@ -8,7 +8,9 @@ java_library("junit_test_support") {
   # Skip platform checks since Robolectric depends on requires_android targets.
   bypass_platform_checks = true
   testonly = true
-  java_files = [ "src/org/chromium/webapk/test/WebApkTestHelper.java" ]
+  sources = [
+    "src/org/chromium/webapk/test/WebApkTestHelper.java",
+  ]
   deps = [
     "//chrome/android/webapk/libs/common:common_java",
     "//third_party/mockito:mockito_java",