BASELINE: Update Chromium to 80.0.3987.136

Change-Id: I98e1649aafae85ba3a83e67af00bb27ef301db7b
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

1 files changed, 293 insertions, 240 deletions

diff --git a/chromium/chrome/android/chrome_java_sources.gni b/chromium/chrome/android/chrome_java_sources.gni
index 84e610e90e2..e34b3f8c7fc 100644
--- a/chromium/chrome/android/chrome_java_sources.gni
+++ b/chromium/chrome/android/chrome_java_sources.gni
@@ -52,11 +52,11 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/SearchGeolocationDisclosureTabHelper.java",
   "java/src/org/chromium/chrome/browser/ServiceTabLauncher.java",
   "java/src/org/chromium/chrome/browser/ShortcutHelper.java",
-  "java/src/org/chromium/chrome/browser/SingleTabActivity.java",
   "java/src/org/chromium/chrome/browser/SnackbarActivity.java",
   "java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java",
   "java/src/org/chromium/chrome/browser/SynchronousInitializationActivity.java",
   "java/src/org/chromium/chrome/browser/TabThemeColorProvider.java",
+  "java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java",
   "java/src/org/chromium/chrome/browser/ThemeColorProvider.java",
   "java/src/org/chromium/chrome/browser/WarmupManager.java",
   "java/src/org/chromium/chrome/browser/WebContentsFactory.java",
@@ -68,25 +68,10 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/accessibility_tab_switcher/AccessibilityTabModelListView.java",
   "java/src/org/chromium/chrome/browser/accessibility_tab_switcher/AccessibilityTabModelWrapper.java",
   "java/src/org/chromium/chrome/browser/accessibility_tab_switcher/OverviewListLayout.java",
-  "java/src/org/chromium/chrome/browser/appmenu/AppMenu.java",
-  "java/src/org/chromium/chrome/browser/appmenu/AppMenuAdapter.java",
-  "java/src/org/chromium/chrome/browser/appmenu/AppMenuBlocker.java",
-  "java/src/org/chromium/chrome/browser/appmenu/AppMenuButtonHelper.java",
-  "java/src/org/chromium/chrome/browser/appmenu/AppMenuButtonHelperImpl.java",
-  "java/src/org/chromium/chrome/browser/appmenu/AppMenuCoordinator.java",
-  "java/src/org/chromium/chrome/browser/appmenu/AppMenuCoordinatorFactory.java",
-  "java/src/org/chromium/chrome/browser/appmenu/AppMenuCoordinatorImpl.java",
-  "java/src/org/chromium/chrome/browser/appmenu/AppMenuDelegate.java",
-  "java/src/org/chromium/chrome/browser/appmenu/AppMenuDragHelper.java",
-  "java/src/org/chromium/chrome/browser/appmenu/AppMenuHandler.java",
-  "java/src/org/chromium/chrome/browser/appmenu/AppMenuHandlerImpl.java",
+  "java/src/org/chromium/chrome/browser/announcement/AnnouncementNotificationManager.java",
   "java/src/org/chromium/chrome/browser/appmenu/AppMenuIconRowFooter.java",
-  "java/src/org/chromium/chrome/browser/appmenu/AppMenuItemIcon.java",
-  "java/src/org/chromium/chrome/browser/appmenu/AppMenuObserver.java",
-  "java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java",
   "java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegateImpl.java",
-  "java/src/org/chromium/chrome/browser/appmenu/MenuButtonDelegate.java",
-  "java/src/org/chromium/chrome/browser/appmenu/AppMenuTestSupport.java",
+  "java/src/org/chromium/chrome/browser/appmenu/UpdateMenuItemViewBinder.java",
   "java/src/org/chromium/chrome/browser/autofill/AutofillExpirationDateFixFlowBridge.java",
   "java/src/org/chromium/chrome/browser/autofill/AutofillExpirationDateFixFlowPrompt.java",
   "java/src/org/chromium/chrome/browser/autofill/AutofillLogger.java",
@@ -100,15 +85,14 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/autofill/CreditCardScannerBridge.java",
   "java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java",
   "java/src/org/chromium/chrome/browser/autofill/PhoneNumberUtil.java",
-  "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTaskScheduler.java",
   "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTask.java",
-  "java/src/org/chromium/chrome/browser/background_sync/GooglePlayServicesChecker.java",
+  "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTaskScheduler.java",
   "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncPwaDetector.java",
+  "java/src/org/chromium/chrome/browser/background_sync/GooglePlayServicesChecker.java",
   "java/src/org/chromium/chrome/browser/background_sync/PeriodicBackgroundSyncChromeWakeUpTask.java",
-  "java/src/org/chromium/chrome/browser/background_task_scheduler/NativeBackgroundTask.java",
   "java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java",
+  "java/src/org/chromium/chrome/browser/background_task_scheduler/NativeBackgroundTask.java",
   "java/src/org/chromium/chrome/browser/banners/AppBannerManager.java",
-  "java/src/org/chromium/chrome/browser/banners/AppBannerUiDelegateAndroid.java",
   "java/src/org/chromium/chrome/browser/banners/AppData.java",
   "java/src/org/chromium/chrome/browser/banners/AppDetailsDelegate.java",
   "java/src/org/chromium/chrome/browser/banners/SwipableOverlayView.java",
@@ -138,6 +122,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/bookmarkswidget/BookmarkWidgetProvider.java",
   "java/src/org/chromium/chrome/browser/bookmarkswidget/BookmarkWidgetProxy.java",
   "java/src/org/chromium/chrome/browser/bookmarkswidget/BookmarkWidgetService.java",
+  "java/src/org/chromium/chrome/browser/browserservices/BrowserServicesActivityTabController.java",
   "java/src/org/chromium/chrome/browser/browserservices/BrowserServicesIntentDataProvider.java",
   "java/src/org/chromium/chrome/browser/browserservices/BrowserServicesMetrics.java",
   "java/src/org/chromium/chrome/browser/browserservices/ClearDataDialogActivity.java",
@@ -154,7 +139,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/browserservices/TrustedWebActivityClient.java",
   "java/src/org/chromium/chrome/browser/browserservices/TrustedWebActivitySettingsLauncher.java",
   "java/src/org/chromium/chrome/browser/browserservices/TrustedWebActivityUmaRecorder.java",
-  "java/src/org/chromium/chrome/browser/browserservices/UkmRecorder.java",
   "java/src/org/chromium/chrome/browser/browserservices/VerificationResultStore.java",
   "java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/InstalledWebappBridge.java",
   "java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/NotificationChannelPreserver.java",
@@ -166,9 +150,14 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/TwaFinishHandler.java",
   "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/TwaIntentHandlingStrategy.java",
   "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/ClientAppDataRecorder.java",
+  "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/ClientPackageNameProvider.java",
+  "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/CurrentPageVerifier.java",
+  "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TrustedWebActivityBrowserControlsVisibilityManager.java",
   "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TrustedWebActivityDisclosureController.java",
   "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TrustedWebActivityOpenTimeRecorder.java",
-  "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TrustedWebActivityVerifier.java",
+  "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TwaRegistrar.java",
+  "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TwaVerifier.java",
+  "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/Verifier.java",
   "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/sharing/TwaSharingController.java",
   "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/splashscreen/SplashImageHolder.java",
   "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/splashscreen/TwaSplashController.java",
@@ -217,8 +206,8 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchTermControl.java",
   "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabBarControl.java",
   "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabCaptionControl.java",
-  "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabPanel.java",
   "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabCoordinator.java",
+  "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabPanel.java",
   "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java",
   "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabTitleControl.java",
   "java/src/org/chromium/chrome/browser/compositor/layouts/EmptyOverviewModeObserver.java",
@@ -233,6 +222,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/compositor/layouts/LayoutUpdateHost.java",
   "java/src/org/chromium/chrome/browser/compositor/layouts/OverviewModeBehavior.java",
   "java/src/org/chromium/chrome/browser/compositor/layouts/OverviewModeController.java",
+  "java/src/org/chromium/chrome/browser/compositor/layouts/OverviewModeState.java",
   "java/src/org/chromium/chrome/browser/compositor/layouts/SceneChangeObserver.java",
   "java/src/org/chromium/chrome/browser/compositor/layouts/StaticLayout.java",
   "java/src/org/chromium/chrome/browser/compositor/layouts/ToolbarSwipeLayout.java",
@@ -284,6 +274,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java",
   "java/src/org/chromium/chrome/browser/compositor/scene_layer/ToolbarSceneLayer.java",
   "java/src/org/chromium/chrome/browser/consent_auditor/ConsentAuditorBridge.java",
+  "java/src/org/chromium/chrome/browser/contacts_picker/CompressContactIconsWorkerTask.java",
   "java/src/org/chromium/chrome/browser/contacts_picker/ContactDetails.java",
   "java/src/org/chromium/chrome/browser/contacts_picker/ContactView.java",
   "java/src/org/chromium/chrome/browser/contacts_picker/ContactViewHolder.java",
@@ -374,8 +365,11 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/crash/MinidumpUploadService.java",
   "java/src/org/chromium/chrome/browser/crash/PureJavaExceptionHandler.java",
   "java/src/org/chromium/chrome/browser/crash/PureJavaExceptionReporter.java",
+  "java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java",
+  "java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java",
   "java/src/org/chromium/chrome/browser/customtabs/ClientManager.java",
   "java/src/org/chromium/chrome/browser/customtabs/CloseButtonNavigator.java",
+  "java/src/org/chromium/chrome/browser/customtabs/CloseButtonVisibilityManager.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomButtonParams.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityClientConnectionKeeper.java",
@@ -384,24 +378,28 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabBottomBarDelegate.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabCompositorContentInitializer.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java",
+  "java/src/org/chromium/chrome/browser/customtabs/CustomTabIncognitoManager.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java",
-  "java/src/org/chromium/chrome/browser/customtabs/CustomTabStatusBarColorProvider.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabNavigationEventObserver.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabNightModeStateController.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabObserver.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabSessionHandler.java",
+  "java/src/org/chromium/chrome/browser/customtabs/CustomTabStatusBarColorProvider.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicy.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabTaskDescriptionHelper.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabTaskDescriptionIconGenerator.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabTopBarDelegate.java",
+  "java/src/org/chromium/chrome/browser/customtabs/CustomTabUmaRecorder.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabsClientFileProcessor.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionService.java",
+  "java/src/org/chromium/chrome/browser/customtabs/ExternalIntentsPolicyProvider.java",
   "java/src/org/chromium/chrome/browser/customtabs/FirstMeaningfulPaintObserver.java",
   "java/src/org/chromium/chrome/browser/customtabs/HiddenTabHolder.java",
   "java/src/org/chromium/chrome/browser/customtabs/NavigationInfoCaptureTrigger.java",
   "java/src/org/chromium/chrome/browser/customtabs/PageLoadMetricsObserver.java",
   "java/src/org/chromium/chrome/browser/customtabs/PaymentHandlerActivity.java",
+  "java/src/org/chromium/chrome/browser/customtabs/ReparentingTaskProvider.java",
   "java/src/org/chromium/chrome/browser/customtabs/RequestThrottler.java",
   "java/src/org/chromium/chrome/browser/customtabs/SeparateTaskCustomTabActivity.java",
   "java/src/org/chromium/chrome/browser/customtabs/SeparateTaskCustomTabActivity0.java",
@@ -424,6 +422,8 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/customtabs/content/CustomTabIntentHandlingStrategy.java",
   "java/src/org/chromium/chrome/browser/customtabs/content/DefaultCustomTabIntentHandlingStrategy.java",
   "java/src/org/chromium/chrome/browser/customtabs/content/TabCreationMode.java",
+  "java/src/org/chromium/chrome/browser/customtabs/content/TabObserverRegistrar.java",
+  "java/src/org/chromium/chrome/browser/customtabs/dependency_injection/BaseCustomTabActivityComponent.java",
   "java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java",
   "java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityModule.java",
   "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ActivityDelegate.java",
@@ -442,6 +442,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/customtabs/features/CustomTabNavigationBarController.java",
   "java/src/org/chromium/chrome/browser/customtabs/features/ImmersiveModeController.java",
   "java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabBrowserControlsVisibilityDelegate.java",
+  "java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbarColorController.java",
   "java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbarCoordinator.java",
   "java/src/org/chromium/chrome/browser/database/SQLiteCursor.java",
   "java/src/org/chromium/chrome/browser/datareduction/DataReductionMainMenuItem.java",
@@ -464,16 +465,18 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/device_dialog/ItemChooserDialog.java",
   "java/src/org/chromium/chrome/browser/device_dialog/UsbChooserDialog.java",
   "java/src/org/chromium/chrome/browser/directactions/ChromeDirectActionIds.java",
-  "java/src/org/chromium/chrome/browser/directactions/MenuDirectActionHandler.java",
+  "java/src/org/chromium/chrome/browser/directactions/CloseTabDirectActionHandler.java",
   "java/src/org/chromium/chrome/browser/directactions/DirectActionCoordinator.java",
   "java/src/org/chromium/chrome/browser/directactions/DirectActionHandler.java",
   "java/src/org/chromium/chrome/browser/directactions/DirectActionInitializer.java",
   "java/src/org/chromium/chrome/browser/directactions/DirectActionReporter.java",
   "java/src/org/chromium/chrome/browser/directactions/DirectActionUsageHistogram.java",
+  "java/src/org/chromium/chrome/browser/directactions/FindInPageDirectActionHandler.java",
   "java/src/org/chromium/chrome/browser/directactions/GoBackDirectActionHandler.java",
-  "java/src/org/chromium/chrome/browser/directactions/CloseTabDirectActionHandler.java",
+  "java/src/org/chromium/chrome/browser/directactions/MenuDirectActionHandler.java",
   "java/src/org/chromium/chrome/browser/directactions/SimpleDirectActionHandler.java",
   "java/src/org/chromium/chrome/browser/display_cutout/DisplayCutoutController.java",
+  "java/src/org/chromium/chrome/browser/document/ChromeIntentUtil.java",
   "java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java",
   "java/src/org/chromium/chrome/browser/document/DocumentWebContentsDelegate.java",
   "java/src/org/chromium/chrome/browser/dom_distiller/DistilledPagePrefsView.java",
@@ -484,20 +487,16 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/dom_distiller/ReaderModeTabInfo.java",
   "java/src/org/chromium/chrome/browser/dom_distiller/TabDistillabilityProvider.java",
   "java/src/org/chromium/chrome/browser/download/ChromeDownloadDelegate.java",
-  "java/src/org/chromium/chrome/browser/download/DirectoryOption.java",
   "java/src/org/chromium/chrome/browser/download/DownloadActivity.java",
   "java/src/org/chromium/chrome/browser/download/DownloadBroadcastManager.java",
   "java/src/org/chromium/chrome/browser/download/DownloadController.java",
-  "java/src/org/chromium/chrome/browser/download/DownloadDirectoryProvider.java",
   "java/src/org/chromium/chrome/browser/download/DownloadForegroundService.java",
   "java/src/org/chromium/chrome/browser/download/DownloadForegroundServiceManager.java",
   "java/src/org/chromium/chrome/browser/download/DownloadForegroundServiceObservers.java",
-  "java/src/org/chromium/chrome/browser/download/DownloadInfo.java",
   "java/src/org/chromium/chrome/browser/download/DownloadInfoBarController.java",
   "java/src/org/chromium/chrome/browser/download/DownloadItem.java",
   "java/src/org/chromium/chrome/browser/download/DownloadLocationCustomView.java",
   "java/src/org/chromium/chrome/browser/download/DownloadLocationDialogBridge.java",
-  "java/src/org/chromium/chrome/browser/download/DownloadManagerBridge.java",
   "java/src/org/chromium/chrome/browser/download/DownloadManagerService.java",
   "java/src/org/chromium/chrome/browser/download/DownloadMediaData.java",
   "java/src/org/chromium/chrome/browser/download/DownloadMediaParserBridge.java",
@@ -510,22 +509,22 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/download/DownloadPage.java",
   "java/src/org/chromium/chrome/browser/download/DownloadResumptionBackgroundTask.java",
   "java/src/org/chromium/chrome/browser/download/DownloadResumptionScheduler.java",
-  "java/src/org/chromium/chrome/browser/download/DownloadFileProvider.java",
   "java/src/org/chromium/chrome/browser/download/DownloadServiceDelegate.java",
   "java/src/org/chromium/chrome/browser/download/DownloadSharedPreferenceEntry.java",
   "java/src/org/chromium/chrome/browser/download/DownloadSharedPreferenceHelper.java",
   "java/src/org/chromium/chrome/browser/download/DownloadSnackbarController.java",
   "java/src/org/chromium/chrome/browser/download/DownloadUmaStatsEntry.java",
   "java/src/org/chromium/chrome/browser/download/DownloadUpdate.java",
-  "java/src/org/chromium/chrome/browser/download/DownloadStartupUtils.java",
   "java/src/org/chromium/chrome/browser/download/DownloadUtils.java",
-  "java/src/org/chromium/chrome/browser/download/MediaStoreHelper.java",
+  "java/src/org/chromium/chrome/browser/download/ExploreOfflineStatusProvider.java",
   "java/src/org/chromium/chrome/browser/download/OMADownloadHandler.java",
   "java/src/org/chromium/chrome/browser/download/SystemDownloadNotifier.java",
   "java/src/org/chromium/chrome/browser/download/home/DownloadManagerCoordinator.java",
   "java/src/org/chromium/chrome/browser/download/home/DownloadManagerCoordinatorFactory.java",
   "java/src/org/chromium/chrome/browser/download/home/DownloadManagerCoordinatorImpl.java",
   "java/src/org/chromium/chrome/browser/download/home/DownloadManagerUiConfig.java",
+  "java/src/org/chromium/chrome/browser/download/home/FaviconProvider.java",
+  "java/src/org/chromium/chrome/browser/download/home/FaviconProviderImpl.java",
   "java/src/org/chromium/chrome/browser/download/home/JustNowProvider.java",
   "java/src/org/chromium/chrome/browser/download/home/OfflineItemSource.java",
   "java/src/org/chromium/chrome/browser/download/home/StableIds.java",
@@ -560,7 +559,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/download/home/list/CalendarUtils.java",
   "java/src/org/chromium/chrome/browser/download/home/list/DateOrderedListCoordinator.java",
   "java/src/org/chromium/chrome/browser/download/home/list/DateOrderedListMediator.java",
-  "java/src/org/chromium/chrome/browser/download/home/list/DateOrderedListMutator.java",
   "java/src/org/chromium/chrome/browser/download/home/list/DateOrderedListView.java",
   "java/src/org/chromium/chrome/browser/download/home/list/DateOrderedListViewAdapter.java",
   "java/src/org/chromium/chrome/browser/download/home/list/DecoratedListItemModel.java",
@@ -572,6 +570,12 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/download/home/list/ListUtils.java",
   "java/src/org/chromium/chrome/browser/download/home/list/ShareUtils.java",
   "java/src/org/chromium/chrome/browser/download/home/list/UiUtils.java",
+  "java/src/org/chromium/chrome/browser/download/home/list/holder/AudioViewHolder.java",
+  "java/src/org/chromium/chrome/browser/download/home/list/holder/CardDividerBottomViewHolder.java",
+  "java/src/org/chromium/chrome/browser/download/home/list/holder/CardDividerMiddleViewHolder.java",
+  "java/src/org/chromium/chrome/browser/download/home/list/holder/CardDividerTopViewHolder.java",
+  "java/src/org/chromium/chrome/browser/download/home/list/holder/CardFooterViewHolder.java",
+  "java/src/org/chromium/chrome/browser/download/home/list/holder/CardHeaderViewHolder.java",
   "java/src/org/chromium/chrome/browser/download/home/list/holder/CustomViewHolder.java",
   "java/src/org/chromium/chrome/browser/download/home/list/holder/GenericViewHolder.java",
   "java/src/org/chromium/chrome/browser/download/home/list/holder/ImageViewHolder.java",
@@ -581,9 +585,24 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/download/home/list/holder/InProgressViewHolder.java",
   "java/src/org/chromium/chrome/browser/download/home/list/holder/ListItemViewHolder.java",
   "java/src/org/chromium/chrome/browser/download/home/list/holder/OfflineItemViewHolder.java",
-  "java/src/org/chromium/chrome/browser/download/home/list/holder/PrefetchViewHolder.java",
+  "java/src/org/chromium/chrome/browser/download/home/list/holder/PaginationViewHolder.java",
+  "java/src/org/chromium/chrome/browser/download/home/list/holder/PrefetchArticleViewHolder.java",
+  "java/src/org/chromium/chrome/browser/download/home/list/holder/PrefetchGroupedItemViewHolder.java",
   "java/src/org/chromium/chrome/browser/download/home/list/holder/SectionTitleViewHolder.java",
   "java/src/org/chromium/chrome/browser/download/home/list/holder/VideoViewHolder.java",
+  "java/src/org/chromium/chrome/browser/download/home/list/mutator/CardPaginator.java",
+  "java/src/org/chromium/chrome/browser/download/home/list/mutator/DateLabelAdder.java",
+  "java/src/org/chromium/chrome/browser/download/home/list/mutator/DateListPaginator.java",
+  "java/src/org/chromium/chrome/browser/download/home/list/mutator/DateOrderedListMutator.java",
+  "java/src/org/chromium/chrome/browser/download/home/list/mutator/DateSorter.java",
+  "java/src/org/chromium/chrome/browser/download/home/list/mutator/DateSorterForCards.java",
+  "java/src/org/chromium/chrome/browser/download/home/list/mutator/GroupCardLabelAdder.java",
+  "java/src/org/chromium/chrome/browser/download/home/list/mutator/ListConsumer.java",
+  "java/src/org/chromium/chrome/browser/download/home/list/mutator/ListItemPropertySetter.java",
+  "java/src/org/chromium/chrome/browser/download/home/list/mutator/ListMutationController.java",
+  "java/src/org/chromium/chrome/browser/download/home/list/mutator/NoopLabelAdder.java",
+  "java/src/org/chromium/chrome/browser/download/home/list/mutator/PrefetchListPaginator.java",
+  "java/src/org/chromium/chrome/browser/download/home/list/mutator/ScoreComparator.java",
   "java/src/org/chromium/chrome/browser/download/home/list/view/AspectRatioFrameLayout.java",
   "java/src/org/chromium/chrome/browser/download/home/list/view/AsyncImageView.java",
   "java/src/org/chromium/chrome/browser/download/home/list/view/AutoAnimatorDrawable.java",
@@ -614,13 +633,11 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/download/items/OfflineContentAggregatorNotificationBridgeUiFactory.java",
   "java/src/org/chromium/chrome/browser/download/service/DownloadBackgroundTask.java",
   "java/src/org/chromium/chrome/browser/download/service/DownloadTaskScheduler.java",
-  "java/src/org/chromium/chrome/browser/download/ui/BackendProvider.java",
-  "java/src/org/chromium/chrome/browser/download/ui/DownloadFilter.java",
   "java/src/org/chromium/chrome/browser/engagement/SiteEngagementService.java",
   "java/src/org/chromium/chrome/browser/explore_sites/CategoryCardAdapter.java",
   "java/src/org/chromium/chrome/browser/explore_sites/CategoryCardViewHolderFactory.java",
-  "java/src/org/chromium/chrome/browser/explore_sites/CategoryCardViewHolderFactoryDenseTitleRight.java",
   "java/src/org/chromium/chrome/browser/explore_sites/CategoryCardViewHolderFactoryDenseTitleBottom.java",
+  "java/src/org/chromium/chrome/browser/explore_sites/CategoryCardViewHolderFactoryDenseTitleRight.java",
   "java/src/org/chromium/chrome/browser/explore_sites/ExperimentalExploreSitesCategoryTileView.java",
   "java/src/org/chromium/chrome/browser/explore_sites/ExperimentalExploreSitesSection.java",
   "java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesBackgroundTask.java",
@@ -706,6 +723,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/firstrun/TabbedModeFirstRunActivity.java",
   "java/src/org/chromium/chrome/browser/firstrun/ToSAckedReceiver.java",
   "java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java",
+  "java/src/org/chromium/chrome/browser/flags/FeatureUtilities.java",
   "java/src/org/chromium/chrome/browser/fullscreen/BrowserStateBrowserControlsVisibilityDelegate.java",
   "java/src/org/chromium/chrome/browser/fullscreen/ChromeFullscreenManager.java",
   "java/src/org/chromium/chrome/browser/fullscreen/ComposedBrowserControlsVisibilityDelegate.java",
@@ -760,6 +778,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/historyreport/HistoryReportJniBridge.java",
   "java/src/org/chromium/chrome/browser/historyreport/SearchJniBridge.java",
   "java/src/org/chromium/chrome/browser/historyreport/UsageReport.java",
+  "java/src/org/chromium/chrome/browser/homepage/HomepagePolicyManager.java",
   "java/src/org/chromium/chrome/browser/identity/SettingsSecureBasedIdentificationGenerator.java",
   "java/src/org/chromium/chrome/browser/identity/UniqueIdentificationGenerator.java",
   "java/src/org/chromium/chrome/browser/identity/UniqueIdentificationGeneratorFactory.java",
@@ -798,6 +817,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/infobar/InstallableAmbientBadgeInfoBar.java",
   "java/src/org/chromium/chrome/browser/infobar/InstantAppsInfoBar.java",
   "java/src/org/chromium/chrome/browser/infobar/InstantAppsInfoBarDelegate.java",
+  "java/src/org/chromium/chrome/browser/infobar/KnownInterceptionDisclosureInfoBar.java",
   "java/src/org/chromium/chrome/browser/infobar/NearOomInfoBar.java",
   "java/src/org/chromium/chrome/browser/infobar/NearOomReductionInfoBar.java",
   "java/src/org/chromium/chrome/browser/infobar/PermissionInfoBar.java",
@@ -878,6 +898,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/media/ui/MediaSessionTabHelper.java",
   "java/src/org/chromium/chrome/browser/metrics/ActivityStopMetrics.java",
   "java/src/org/chromium/chrome/browser/metrics/ActivityTabStartupMetricsTracker.java",
+  "java/src/org/chromium/chrome/browser/metrics/BackgroundTaskMemoryMetricsEmitter.java",
   "java/src/org/chromium/chrome/browser/metrics/ImpressionTracker.java",
   "java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java",
   "java/src/org/chromium/chrome/browser/metrics/MainIntentBehaviorMetrics.java",
@@ -887,7 +908,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/metrics/OneShotImpressionListener.java",
   "java/src/org/chromium/chrome/browser/metrics/PackageMetrics.java",
   "java/src/org/chromium/chrome/browser/metrics/PageLoadMetrics.java",
-  "java/src/org/chromium/chrome/browser/metrics/BackgroundTaskMemoryMetricsEmitter.java",
+  "java/src/org/chromium/chrome/browser/metrics/UkmRecorder.java",
   "java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.java",
   "java/src/org/chromium/chrome/browser/metrics/UmaUtils.java",
   "java/src/org/chromium/chrome/browser/metrics/VariationsSession.java",
@@ -960,14 +981,15 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/notifications/scheduler/DisplayAgent.java",
   "java/src/org/chromium/chrome/browser/notifications/scheduler/NotificationSchedulerTask.java",
   "java/src/org/chromium/chrome/browser/ntp/FakeRecentlyClosedTabManager.java",
+  "java/src/org/chromium/chrome/browser/ntp/FakeboxDelegate.java",
   "java/src/org/chromium/chrome/browser/ntp/ForeignSessionHelper.java",
+  "java/src/org/chromium/chrome/browser/ntp/IncognitoDescriptionView.java",
   "java/src/org/chromium/chrome/browser/ntp/IncognitoNewTabPage.java",
   "java/src/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java",
   "java/src/org/chromium/chrome/browser/ntp/LogoBridge.java",
   "java/src/org/chromium/chrome/browser/ntp/LogoDelegateImpl.java",
   "java/src/org/chromium/chrome/browser/ntp/LogoView.java",
   "java/src/org/chromium/chrome/browser/ntp/NativePageRootFrameLayout.java",
-  "java/src/org/chromium/chrome/browser/ntp/FakeboxDelegate.java",
   "java/src/org/chromium/chrome/browser/ntp/NewTabPage.java",
   "java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java",
   "java/src/org/chromium/chrome/browser/ntp/NewTabPageScrollView.java",
@@ -1020,6 +1042,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsBridge.java",
   "java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsLauncher.java",
   "java/src/org/chromium/chrome/browser/ntp/snippets/SuggestionsSource.java",
+  "java/src/org/chromium/chrome/browser/offlinepages/AutoFetchNotifier.java",
   "java/src/org/chromium/chrome/browser/offlinepages/BackgroundScheduler.java",
   "java/src/org/chromium/chrome/browser/offlinepages/BackgroundSchedulerBridge.java",
   "java/src/org/chromium/chrome/browser/offlinepages/BackgroundSchedulerProcessor.java",
@@ -1042,7 +1065,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/offlinepages/TaskExtrasPacker.java",
   "java/src/org/chromium/chrome/browser/offlinepages/TriggerConditions.java",
   "java/src/org/chromium/chrome/browser/offlinepages/downloads/OfflinePageDownloadBridge.java",
-  "java/src/org/chromium/chrome/browser/offlinepages/AutoFetchNotifier.java",
   "java/src/org/chromium/chrome/browser/offlinepages/indicator/ConnectivityDetector.java",
   "java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorController.java",
   "java/src/org/chromium/chrome/browser/offlinepages/indicator/TopSnackbarManager.java",
@@ -1053,14 +1075,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchConfiguration.java",
   "java/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchPrefs.java",
   "java/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchedPagesNotifier.java",
-  "java/src/org/chromium/chrome/browser/omaha/inline/FakeAppUpdateManagerWrapper.java",
-  "java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateController.java",
-  "java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java",
-  "java/src/org/chromium/chrome/browser/omaha/inline/NoopInlineUpdateController.java",
-  "java/src/org/chromium/chrome/browser/omaha/inline/PlayInlineUpdateController.java",
-  "java/src/org/chromium/chrome/browser/omaha/metrics/HistogramUtils.java",
-  "java/src/org/chromium/chrome/browser/omaha/metrics/TrackingProvider.java",
-  "java/src/org/chromium/chrome/browser/omaha/metrics/UpdateSuccessMetrics.java",
   "java/src/org/chromium/chrome/browser/omaha/ExponentialBackoffScheduler.java",
   "java/src/org/chromium/chrome/browser/omaha/MarketURLGetter.java",
   "java/src/org/chromium/chrome/browser/omaha/OmahaBase.java",
@@ -1076,11 +1090,22 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java",
   "java/src/org/chromium/chrome/browser/omaha/UpdateInfoBarController.java",
   "java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java",
-  "java/src/org/chromium/chrome/browser/omaha/UpdateNotificationController.java",
   "java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java",
   "java/src/org/chromium/chrome/browser/omaha/VersionNumber.java",
   "java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java",
   "java/src/org/chromium/chrome/browser/omaha/XMLParser.java",
+  "java/src/org/chromium/chrome/browser/omaha/inline/FakeAppUpdateManagerWrapper.java",
+  "java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateController.java",
+  "java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java",
+  "java/src/org/chromium/chrome/browser/omaha/inline/NoopInlineUpdateController.java",
+  "java/src/org/chromium/chrome/browser/omaha/inline/PlayInlineUpdateController.java",
+  "java/src/org/chromium/chrome/browser/omaha/metrics/HistogramUtils.java",
+  "java/src/org/chromium/chrome/browser/omaha/metrics/TrackingProvider.java",
+  "java/src/org/chromium/chrome/browser/omaha/metrics/UpdateSuccessMetrics.java",
+  "java/src/org/chromium/chrome/browser/omaha/notification/UpdateNotificationController.java",
+  "java/src/org/chromium/chrome/browser/omaha/notification/UpdateNotificationControllerFactory.java",
+  "java/src/org/chromium/chrome/browser/omaha/notification/UpdateNotificationControllerImpl.java",
+  "java/src/org/chromium/chrome/browser/omaha/notification/UpdateNotificationScheduleCoordinator.java",
   "java/src/org/chromium/chrome/browser/omnibox/AutocompleteEditText.java",
   "java/src/org/chromium/chrome/browser/omnibox/AutocompleteEditTextModel.java",
   "java/src/org/chromium/chrome/browser/omnibox/AutocompleteEditTextModelBase.java",
@@ -1105,20 +1130,21 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/omnibox/UrlBarProperties.java",
   "java/src/org/chromium/chrome/browser/omnibox/UrlBarViewBinder.java",
   "java/src/org/chromium/chrome/browser/omnibox/UrlFocusChangeListener.java",
+  "java/src/org/chromium/chrome/browser/omnibox/geo/CellInfoDelegate.java",
   "java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeader.java",
   "java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationTracker.java",
   "java/src/org/chromium/chrome/browser/omnibox/geo/PlatformNetworksManager.java",
   "java/src/org/chromium/chrome/browser/omnibox/geo/VisibleNetworks.java",
   "java/src/org/chromium/chrome/browser/omnibox/geo/VisibleNetworksTracker.java",
   "java/src/org/chromium/chrome/browser/omnibox/status/StatusMediator.java",
+  "java/src/org/chromium/chrome/browser/omnibox/status/StatusProperties.java",
   "java/src/org/chromium/chrome/browser/omnibox/status/StatusView.java",
   "java/src/org/chromium/chrome/browser/omnibox/status/StatusViewBinder.java",
-  "java/src/org/chromium/chrome/browser/omnibox/status/StatusProperties.java",
   "java/src/org/chromium/chrome/browser/omnibox/status/StatusViewCoordinator.java",
-  "java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinatorImpl.java",
-  "java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinatorFactory.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteController.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinatorFactory.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinatorImpl.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteDelegate.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestion.java",
@@ -1139,9 +1165,9 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/base/BaseSuggestionViewBinder.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/base/BaseSuggestionViewProcessor.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/base/BaseSuggestionViewProperties.java",
-  "java/src/org/chromium/chrome/browser/omnibox/suggestions/base/SuggestionDrawableState.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/base/DecoratedSuggestionView.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/base/SimpleHorizontalLayoutView.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/base/SuggestionDrawableState.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/basic/BasicSuggestionProcessor.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/basic/SuggestionHost.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/basic/SuggestionView.java",
@@ -1152,7 +1178,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/editurl/EditUrlSuggestionProperties.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/editurl/EditUrlSuggestionViewBinder.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/entity/EntitySuggestionProcessor.java",
-  "java/src/org/chromium/chrome/browser/omnibox/suggestions/entity/EntitySuggestionView.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/entity/EntitySuggestionViewBinder.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/entity/EntitySuggestionViewProperties.java",
   "java/src/org/chromium/chrome/browser/page_info/CertificateChainHelper.java",
@@ -1186,11 +1211,13 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/password_manager/PasswordGenerationDialogViewBinder.java",
   "java/src/org/chromium/chrome/browser/password_manager/PasswordGenerationPopupAdapter.java",
   "java/src/org/chromium/chrome/browser/password_manager/PasswordGenerationPopupBridge.java",
+  "java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogContents.java",
   "java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogCoordinator.java",
   "java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogMediator.java",
   "java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogProperties.java",
   "java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogView.java",
   "java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogViewBinder.java",
+  "java/src/org/chromium/chrome/browser/password_manager/PasswordManagerLauncher.java",
   "java/src/org/chromium/chrome/browser/payments/AddressEditor.java",
   "java/src/org/chromium/chrome/browser/payments/AndroidPaymentApp.java",
   "java/src/org/chromium/chrome/browser/payments/AndroidPaymentAppFactory.java",
@@ -1203,13 +1230,9 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/payments/CanMakePaymentQuery.java",
   "java/src/org/chromium/chrome/browser/payments/CardEditor.java",
   "java/src/org/chromium/chrome/browser/payments/ContactEditor.java",
-  "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerCoordinator.java",
-  "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerMediator.java",
-  "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerProperties.java",
-  "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerViewBinder.java",
-  "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerView.java",
   "java/src/org/chromium/chrome/browser/payments/JourneyLogger.java",
   "java/src/org/chromium/chrome/browser/payments/PackageManagerDelegate.java",
+  "java/src/org/chromium/chrome/browser/payments/PayerData.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentApp.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentAppFactory.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentInstrument.java",
@@ -1218,20 +1241,31 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/payments/PaymentPreferencesUtil.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentRequestFactory.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java",
-  "java/src/org/chromium/chrome/browser/payments/SkipToGPayHelper.java",
-  "java/src/org/chromium/chrome/browser/payments/micro/MicrotransactionCoordinator.java",
-  "java/src/org/chromium/chrome/browser/payments/micro/MicrotransactionMediator.java",
-  "java/src/org/chromium/chrome/browser/payments/micro/MicrotransactionProperties.java",
-  "java/src/org/chromium/chrome/browser/payments/micro/MicrotransactionViewBinder.java",
-  "java/src/org/chromium/chrome/browser/payments/micro/MicrotransactionView.java",
-  "java/src/org/chromium/chrome/browser/payments/PaymentsExperimentalFeatures.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentResponseHelper.java",
+  "java/src/org/chromium/chrome/browser/payments/PaymentsExperimentalFeatures.java",
   "java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentApp.java",
   "java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentAppBridge.java",
   "java/src/org/chromium/chrome/browser/payments/SettingsAutofillAndPaymentsObserver.java",
   "java/src/org/chromium/chrome/browser/payments/ShippingStrings.java",
+  "java/src/org/chromium/chrome/browser/payments/SkipToGPayHelper.java",
   "java/src/org/chromium/chrome/browser/payments/SslValidityChecker.java",
+  "java/src/org/chromium/chrome/browser/payments/SupportedDelegations.java",
   "java/src/org/chromium/chrome/browser/payments/UriUtils.java",
+  "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerCoordinator.java",
+  "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerMediator.java",
+  "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerProperties.java",
+  "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerView.java",
+  "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerViewBinder.java",
+  "java/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarCoordinator.java",
+  "java/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarMediator.java",
+  "java/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarProperties.java",
+  "java/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarView.java",
+  "java/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarViewBinder.java",
+  "java/src/org/chromium/chrome/browser/payments/micro/MicrotransactionCoordinator.java",
+  "java/src/org/chromium/chrome/browser/payments/micro/MicrotransactionMediator.java",
+  "java/src/org/chromium/chrome/browser/payments/micro/MicrotransactionProperties.java",
+  "java/src/org/chromium/chrome/browser/payments/micro/MicrotransactionView.java",
+  "java/src/org/chromium/chrome/browser/payments/micro/MicrotransactionViewBinder.java",
   "java/src/org/chromium/chrome/browser/payments/ui/ContactDetailsSection.java",
   "java/src/org/chromium/chrome/browser/payments/ui/DimmingDialog.java",
   "java/src/org/chromium/chrome/browser/payments/ui/LineItem.java",
@@ -1245,16 +1279,17 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/payments/ui/SectionUiUtils.java",
   "java/src/org/chromium/chrome/browser/payments/ui/ShoppingCart.java",
   "java/src/org/chromium/chrome/browser/permissions/AndroidPermissionRequester.java",
-  "java/src/org/chromium/chrome/browser/permissions/PermissionDialogModel.java",
   "java/src/org/chromium/chrome/browser/permissions/PermissionDialogController.java",
   "java/src/org/chromium/chrome/browser/permissions/PermissionDialogDelegate.java",
+  "java/src/org/chromium/chrome/browser/permissions/PermissionDialogModel.java",
   "java/src/org/chromium/chrome/browser/permissions/PermissionFieldTrial.java",
+  "java/src/org/chromium/chrome/browser/permissions/PermissionSettingsBridge.java",
   "java/src/org/chromium/chrome/browser/permissions/PermissionUmaUtil.java",
   "java/src/org/chromium/chrome/browser/photo_picker/BitmapScalerTask.java",
   "java/src/org/chromium/chrome/browser/photo_picker/BitmapUtils.java",
+  "java/src/org/chromium/chrome/browser/photo_picker/DecodeVideoTask.java",
   "java/src/org/chromium/chrome/browser/photo_picker/DecoderService.java",
   "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceHost.java",
-  "java/src/org/chromium/chrome/browser/photo_picker/DecodeVideoTask.java",
   "java/src/org/chromium/chrome/browser/photo_picker/FileEnumWorkerTask.java",
   "java/src/org/chromium/chrome/browser/photo_picker/PhotoPickerDialog.java",
   "java/src/org/chromium/chrome/browser/photo_picker/PhotoPickerToolbar.java",
@@ -1264,141 +1299,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/photo_picker/PickerBitmapViewHolder.java",
   "java/src/org/chromium/chrome/browser/photo_picker/PickerCategoryView.java",
   "java/src/org/chromium/chrome/browser/policy/PolicyAuditor.java",
-  "java/src/org/chromium/chrome/browser/preferences/AboutChromePreferenceOSVersion.java",
-  "java/src/org/chromium/chrome/browser/preferences/AboutChromePreferences.java",
-  "java/src/org/chromium/chrome/browser/preferences/AccessibilityPreferences.java",
-  "java/src/org/chromium/chrome/browser/preferences/ButtonPreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/ChromeBaseCheckBoxPreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/ChromeBasePreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/ChromeImageViewPreference.java",
   "java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java",
-  "java/src/org/chromium/chrome/browser/preferences/ChromeSwitchPreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/ClearBrowsingDataCheckBoxPreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/ExpandablePreferenceGroup.java",
-  "java/src/org/chromium/chrome/browser/preferences/HomepageEditor.java",
-  "java/src/org/chromium/chrome/browser/preferences/HomepagePreferences.java",
-  "java/src/org/chromium/chrome/browser/preferences/HyperlinkPreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/LearnMorePreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/LegalInformationPreferences.java",
-  "java/src/org/chromium/chrome/browser/preferences/LocationSettings.java",
-  "java/src/org/chromium/chrome/browser/preferences/MainPreferences.java",
-  "java/src/org/chromium/chrome/browser/preferences/ManagedPreferenceDelegate.java",
-  "java/src/org/chromium/chrome/browser/preferences/ManagedPreferencesUtils.java",
-  "java/src/org/chromium/chrome/browser/preferences/NotificationsPreferences.java",
-  "java/src/org/chromium/chrome/browser/preferences/PrefChangeRegistrar.java",
-  "java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java",
-  "java/src/org/chromium/chrome/browser/preferences/PreferenceUtils.java",
-  "java/src/org/chromium/chrome/browser/preferences/Preferences.java",
-  "java/src/org/chromium/chrome/browser/preferences/PreferencesLauncher.java",
-  "java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java",
-  "java/src/org/chromium/chrome/browser/preferences/SearchEnginePreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/SearchUtils.java",
-  "java/src/org/chromium/chrome/browser/preferences/SeekBarPreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/SpinnerPreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/sync/AccountManagementFragment.java",
-  "java/src/org/chromium/chrome/browser/preferences/sync/ManageSyncPreferences.java",
-  "java/src/org/chromium/chrome/browser/preferences/sync/SignInPreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/sync/SyncAndServicesPreferences.java",
-  "java/src/org/chromium/chrome/browser/preferences/sync/SyncPreferenceUtils.java",
-  "java/src/org/chromium/chrome/browser/preferences/TextAndButtonPreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/TextMessagePreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/TextScalePreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/autofill/AndroidPaymentAppPreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/autofill/AndroidPaymentAppsFragment.java",
-  "java/src/org/chromium/chrome/browser/preferences/autofill/AutofillCreditCardEditor.java",
-  "java/src/org/chromium/chrome/browser/preferences/autofill/AutofillEditorBase.java",
-  "java/src/org/chromium/chrome/browser/preferences/autofill/AutofillLocalCardEditor.java",
-  "java/src/org/chromium/chrome/browser/preferences/autofill/AutofillPaymentMethodsFragment.java",
-  "java/src/org/chromium/chrome/browser/preferences/autofill/AutofillProfileBridge.java",
-  "java/src/org/chromium/chrome/browser/preferences/autofill/AutofillProfileEditorPreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/autofill/AutofillProfilesFragment.java",
-  "java/src/org/chromium/chrome/browser/preferences/autofill/AutofillServerCardEditor.java",
-  "java/src/org/chromium/chrome/browser/preferences/autofill/AutofillServerProfilePreferences.java",
-  "java/src/org/chromium/chrome/browser/preferences/autofill/CreditCardNumberFormattingTextWatcher.java",
-  "java/src/org/chromium/chrome/browser/preferences/autofill_assistant/AutofillAssistantPreferences.java",
-  "java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionDataUseItem.java",
-  "java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPreferenceFragment.java",
-  "java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionSiteBreakdownView.java",
-  "java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionStatsPreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/developer/DeveloperPreferences.java",
-  "java/src/org/chromium/chrome/browser/preferences/developer/TracingCategoriesPreferences.java",
-  "java/src/org/chromium/chrome/browser/preferences/developer/TracingPreferences.java",
-  "java/src/org/chromium/chrome/browser/preferences/download/DownloadDirectoryAdapter.java",
-  "java/src/org/chromium/chrome/browser/preferences/download/DownloadLocationPreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/download/DownloadLocationPreferenceAdapter.java",
-  "java/src/org/chromium/chrome/browser/preferences/download/DownloadLocationPreferenceDialog.java",
-  "java/src/org/chromium/chrome/browser/preferences/download/DownloadPreferences.java",
-  "java/src/org/chromium/chrome/browser/preferences/languages/AddLanguageFragment.java",
-  "java/src/org/chromium/chrome/browser/preferences/languages/LanguageItem.java",
-  "java/src/org/chromium/chrome/browser/preferences/languages/LanguageListBaseAdapter.java",
-  "java/src/org/chromium/chrome/browser/preferences/languages/LanguageListPreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/languages/LanguagesManager.java",
-  "java/src/org/chromium/chrome/browser/preferences/languages/LanguagesPreferences.java",
-  "java/src/org/chromium/chrome/browser/preferences/password/CallbackDelayer.java",
-  "java/src/org/chromium/chrome/browser/preferences/password/DialogManager.java",
-  "java/src/org/chromium/chrome/browser/preferences/password/ExportErrorDialogFragment.java",
-  "java/src/org/chromium/chrome/browser/preferences/password/ExportFlow.java",
-  "java/src/org/chromium/chrome/browser/preferences/password/ExportWarningDialogFragment.java",
-  "java/src/org/chromium/chrome/browser/preferences/password/ManualCallbackDelayer.java",
-  "java/src/org/chromium/chrome/browser/preferences/password/PasswordEntryEditor.java",
-  "java/src/org/chromium/chrome/browser/preferences/password/PasswordEntryViewer.java",
-  "java/src/org/chromium/chrome/browser/preferences/password/PasswordManagerHandler.java",
-  "java/src/org/chromium/chrome/browser/preferences/password/PasswordManagerHandlerProvider.java",
-  "java/src/org/chromium/chrome/browser/preferences/password/PasswordReauthenticationFragment.java",
-  "java/src/org/chromium/chrome/browser/preferences/password/PasswordEditingBridge.java",
-  "java/src/org/chromium/chrome/browser/preferences/password/PasswordEditingDelegate.java",
-  "java/src/org/chromium/chrome/browser/preferences/password/PasswordEditingDelegateProvider.java",
-  "java/src/org/chromium/chrome/browser/preferences/password/PasswordUIView.java",
-  "java/src/org/chromium/chrome/browser/preferences/password/ProgressBarDialogFragment.java",
-  "java/src/org/chromium/chrome/browser/preferences/password/ReauthenticationManager.java",
-  "java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java",
-  "java/src/org/chromium/chrome/browser/preferences/password/SavedPasswordEntry.java",
-  "java/src/org/chromium/chrome/browser/preferences/password/SingleThreadBarrierClosure.java",
-  "java/src/org/chromium/chrome/browser/preferences/password/TimedCallbackDelayer.java",
-  "java/src/org/chromium/chrome/browser/preferences/privacy/BandwidthType.java",
-  "java/src/org/chromium/chrome/browser/preferences/privacy/BrowsingDataBridge.java",
-  "java/src/org/chromium/chrome/browser/preferences/privacy/BrowsingDataCounterBridge.java",
-  "java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataFetcher.java",
-  "java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java",
-  "java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesAdvanced.java",
-  "java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesBasic.java",
-  "java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataTabsFragment.java",
-  "java/src/org/chromium/chrome/browser/preferences/privacy/ConfirmImportantSitesDialogFragment.java",
-  "java/src/org/chromium/chrome/browser/preferences/privacy/ContextualSearchPreferenceFragment.java",
-  "java/src/org/chromium/chrome/browser/preferences/privacy/DoNotTrackPreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/privacy/OtherFormsOfHistoryDialogFragment.java",
-  "java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java",
-  "java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java",
-  "java/src/org/chromium/chrome/browser/preferences/privacy/UsageAndCrashReportsPreferenceFragment.java",
-  "java/src/org/chromium/chrome/browser/preferences/themes/RadioButtonGroupThemePreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/themes/ThemePreferences.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/AddExceptionPreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/ChosenObjectInfo.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/ChosenObjectPreferences.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/ClearWebsiteStorage.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/ClearWebsiteStorageDialog.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/ContentSetting.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/ContentSettingException.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/LocalStorageInfo.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/LocationCategory.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/ManageSpaceActivity.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/NotificationCategory.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/PermissionInfo.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/SettingsNavigationSource.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/SiteDataCleaner.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsCategory.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/StorageInfo.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/TriStateSiteSettingsPreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/Website.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/WebsiteAddress.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/WebsitePreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferenceBridge.java",
   "java/src/org/chromium/chrome/browser/prerender/ChromePrerenderService.java",
   "java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java",
   "java/src/org/chromium/chrome/browser/previews/PreviewsAndroidBridge.java",
@@ -1414,7 +1315,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/rappor/RapporServiceBridge.java",
   "java/src/org/chromium/chrome/browser/rlz/RevenueStats.java",
   "java/src/org/chromium/chrome/browser/rlz/RlzPingHandler.java",
-  "java/src/org/chromium/chrome/browser/safe_browsing/FileTypePolicies.java",
+  "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java",
   "java/src/org/chromium/chrome/browser/search_engines/SearchEngineChoiceMetrics.java",
   "java/src/org/chromium/chrome/browser/search_engines/SearchEngineChoiceNotification.java",
   "java/src/org/chromium/chrome/browser/search_engines/TemplateUrlServiceFactory.java",
@@ -1430,9 +1331,9 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/send_tab_to_self/SendTabToSelfEntry.java",
   "java/src/org/chromium/chrome/browser/send_tab_to_self/SendTabToSelfInfoBar.java",
   "java/src/org/chromium/chrome/browser/send_tab_to_self/SendTabToSelfInfoBarController.java",
+  "java/src/org/chromium/chrome/browser/send_tab_to_self/SendTabToSelfMetrics.java",
   "java/src/org/chromium/chrome/browser/send_tab_to_self/SendTabToSelfModelObserverBridge.java",
   "java/src/org/chromium/chrome/browser/send_tab_to_self/SendTabToSelfShareActivity.java",
-  "java/src/org/chromium/chrome/browser/send_tab_to_self/SendTabToSelfMetrics.java",
   "java/src/org/chromium/chrome/browser/send_tab_to_self/TargetDeviceInfo.java",
   "java/src/org/chromium/chrome/browser/services/AccountsChangedReceiver.java",
   "java/src/org/chromium/chrome/browser/services/AndroidEduAndChildAccountHelper.java",
@@ -1444,24 +1345,159 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/services/gcm/GcmUma.java",
   "java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java",
   "java/src/org/chromium/chrome/browser/sessions/SessionTabHelper.java",
+  "java/src/org/chromium/chrome/browser/settings/ButtonPreference.java",
+  "java/src/org/chromium/chrome/browser/settings/ChromeBaseCheckBoxPreference.java",
+  "java/src/org/chromium/chrome/browser/settings/ChromeBasePreference.java",
+  "java/src/org/chromium/chrome/browser/settings/ChromeImageViewPreference.java",
+  "java/src/org/chromium/chrome/browser/settings/ChromeSwitchPreference.java",
+  "java/src/org/chromium/chrome/browser/settings/ClearBrowsingDataCheckBoxPreference.java",
+  "java/src/org/chromium/chrome/browser/settings/ExpandablePreferenceGroup.java",
+  "java/src/org/chromium/chrome/browser/settings/HomepageEditor.java",
+  "java/src/org/chromium/chrome/browser/settings/HomepagePreferences.java",
+  "java/src/org/chromium/chrome/browser/settings/HyperlinkPreference.java",
+  "java/src/org/chromium/chrome/browser/settings/LearnMorePreference.java",
+  "java/src/org/chromium/chrome/browser/settings/LocationSettings.java",
+  "java/src/org/chromium/chrome/browser/settings/MainPreferences.java",
+  "java/src/org/chromium/chrome/browser/settings/ManagedPreferenceDelegate.java",
+  "java/src/org/chromium/chrome/browser/settings/ManagedPreferencesUtils.java",
+  "java/src/org/chromium/chrome/browser/settings/NotificationsPreferences.java",
+  "java/src/org/chromium/chrome/browser/settings/PreferencesLauncher.java",
+  "java/src/org/chromium/chrome/browser/settings/SearchEngineAdapter.java",
+  "java/src/org/chromium/chrome/browser/settings/SearchEnginePreference.java",
+  "java/src/org/chromium/chrome/browser/settings/SearchUtils.java",
+  "java/src/org/chromium/chrome/browser/settings/SeekBarPreference.java",
+  "java/src/org/chromium/chrome/browser/settings/SettingsActivity.java",
+  "java/src/org/chromium/chrome/browser/settings/SettingsUtils.java",
+  "java/src/org/chromium/chrome/browser/settings/SpinnerPreference.java",
+  "java/src/org/chromium/chrome/browser/settings/TextAndButtonPreference.java",
+  "java/src/org/chromium/chrome/browser/settings/TextMessagePreference.java",
+  "java/src/org/chromium/chrome/browser/settings/about/AboutChromePreferenceOSVersion.java",
+  "java/src/org/chromium/chrome/browser/settings/about/AboutChromeSettings.java",
+  "java/src/org/chromium/chrome/browser/settings/about/AboutSettingsBridge.java",
+  "java/src/org/chromium/chrome/browser/settings/about/LegalInformationSettings.java",
+  "java/src/org/chromium/chrome/browser/settings/accessibility/AccessibilitySettings.java",
+  "java/src/org/chromium/chrome/browser/settings/accessibility/TextScalePreference.java",
+  "java/src/org/chromium/chrome/browser/settings/autofill/AndroidPaymentAppPreference.java",
+  "java/src/org/chromium/chrome/browser/settings/autofill/AndroidPaymentAppsFragment.java",
+  "java/src/org/chromium/chrome/browser/settings/autofill/AutofillCreditCardEditor.java",
+  "java/src/org/chromium/chrome/browser/settings/autofill/AutofillEditorBase.java",
+  "java/src/org/chromium/chrome/browser/settings/autofill/AutofillLocalCardEditor.java",
+  "java/src/org/chromium/chrome/browser/settings/autofill/AutofillPaymentMethodsFragment.java",
+  "java/src/org/chromium/chrome/browser/settings/autofill/AutofillProfileBridge.java",
+  "java/src/org/chromium/chrome/browser/settings/autofill/AutofillProfileEditorPreference.java",
+  "java/src/org/chromium/chrome/browser/settings/autofill/AutofillProfilesFragment.java",
+  "java/src/org/chromium/chrome/browser/settings/autofill/AutofillServerCardEditor.java",
+  "java/src/org/chromium/chrome/browser/settings/autofill/AutofillServerProfileFragment.java",
+  "java/src/org/chromium/chrome/browser/settings/autofill/CreditCardNumberFormattingTextWatcher.java",
+  "java/src/org/chromium/chrome/browser/settings/autofill_assistant/AutofillAssistantPreferences.java",
+  "java/src/org/chromium/chrome/browser/settings/datareduction/DataReductionDataUseItem.java",
+  "java/src/org/chromium/chrome/browser/settings/datareduction/DataReductionPreferenceFragment.java",
+  "java/src/org/chromium/chrome/browser/settings/datareduction/DataReductionSiteBreakdownView.java",
+  "java/src/org/chromium/chrome/browser/settings/datareduction/DataReductionStatsPreference.java",
+  "java/src/org/chromium/chrome/browser/settings/developer/DeveloperSettings.java",
+  "java/src/org/chromium/chrome/browser/settings/developer/TracingCategoriesSettings.java",
+  "java/src/org/chromium/chrome/browser/settings/developer/TracingSettings.java",
+  "java/src/org/chromium/chrome/browser/settings/download/DownloadDirectoryAdapter.java",
+  "java/src/org/chromium/chrome/browser/settings/download/DownloadLocationPreference.java",
+  "java/src/org/chromium/chrome/browser/settings/download/DownloadLocationPreferenceAdapter.java",
+  "java/src/org/chromium/chrome/browser/settings/download/DownloadLocationPreferenceDialog.java",
+  "java/src/org/chromium/chrome/browser/settings/download/DownloadPreferences.java",
+  "java/src/org/chromium/chrome/browser/settings/languages/AddLanguageFragment.java",
+  "java/src/org/chromium/chrome/browser/settings/languages/LanguageItem.java",
+  "java/src/org/chromium/chrome/browser/settings/languages/LanguageListBaseAdapter.java",
+  "java/src/org/chromium/chrome/browser/settings/languages/LanguageListPreference.java",
+  "java/src/org/chromium/chrome/browser/settings/languages/LanguagesManager.java",
+  "java/src/org/chromium/chrome/browser/settings/languages/LanguagesPreferences.java",
+  "java/src/org/chromium/chrome/browser/settings/password/CallbackDelayer.java",
+  "java/src/org/chromium/chrome/browser/settings/password/DialogManager.java",
+  "java/src/org/chromium/chrome/browser/settings/password/ExportErrorDialogFragment.java",
+  "java/src/org/chromium/chrome/browser/settings/password/ExportFlow.java",
+  "java/src/org/chromium/chrome/browser/settings/password/ExportWarningDialogFragment.java",
+  "java/src/org/chromium/chrome/browser/settings/password/ManualCallbackDelayer.java",
+  "java/src/org/chromium/chrome/browser/settings/password/PasswordEditingBridge.java",
+  "java/src/org/chromium/chrome/browser/settings/password/PasswordEditingDelegate.java",
+  "java/src/org/chromium/chrome/browser/settings/password/PasswordEditingDelegateProvider.java",
+  "java/src/org/chromium/chrome/browser/settings/password/PasswordEntryEditor.java",
+  "java/src/org/chromium/chrome/browser/settings/password/PasswordEntryViewer.java",
+  "java/src/org/chromium/chrome/browser/settings/password/PasswordManagerHandler.java",
+  "java/src/org/chromium/chrome/browser/settings/password/PasswordManagerHandlerProvider.java",
+  "java/src/org/chromium/chrome/browser/settings/password/PasswordReauthenticationFragment.java",
+  "java/src/org/chromium/chrome/browser/settings/password/PasswordUIView.java",
+  "java/src/org/chromium/chrome/browser/settings/password/ProgressBarDialogFragment.java",
+  "java/src/org/chromium/chrome/browser/settings/password/ReauthenticationManager.java",
+  "java/src/org/chromium/chrome/browser/settings/password/SavePasswordsPreferences.java",
+  "java/src/org/chromium/chrome/browser/settings/password/SavedPasswordEntry.java",
+  "java/src/org/chromium/chrome/browser/settings/password/SingleThreadBarrierClosure.java",
+  "java/src/org/chromium/chrome/browser/settings/password/TimedCallbackDelayer.java",
+  "java/src/org/chromium/chrome/browser/settings/privacy/BandwidthType.java",
+  "java/src/org/chromium/chrome/browser/settings/privacy/BrowsingDataBridge.java",
+  "java/src/org/chromium/chrome/browser/settings/privacy/BrowsingDataCounterBridge.java",
+  "java/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataFetcher.java",
+  "java/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataPreferences.java",
+  "java/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataPreferencesAdvanced.java",
+  "java/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataPreferencesBasic.java",
+  "java/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataTabsFragment.java",
+  "java/src/org/chromium/chrome/browser/settings/privacy/ConfirmImportantSitesDialogFragment.java",
+  "java/src/org/chromium/chrome/browser/settings/privacy/ContextualSearchPreferenceFragment.java",
+  "java/src/org/chromium/chrome/browser/settings/privacy/DoNotTrackPreference.java",
+  "java/src/org/chromium/chrome/browser/settings/privacy/OtherFormsOfHistoryDialogFragment.java",
+  "java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java",
+  "java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferencesManager.java",
+  "java/src/org/chromium/chrome/browser/settings/sync/AccountManagementFragment.java",
+  "java/src/org/chromium/chrome/browser/settings/sync/ManageSyncPreferences.java",
+  "java/src/org/chromium/chrome/browser/settings/sync/SignInPreference.java",
+  "java/src/org/chromium/chrome/browser/settings/sync/SyncAndServicesPreferences.java",
+  "java/src/org/chromium/chrome/browser/settings/sync/SyncPreferenceUtils.java",
+  "java/src/org/chromium/chrome/browser/settings/themes/RadioButtonGroupThemePreference.java",
+  "java/src/org/chromium/chrome/browser/settings/themes/ThemePreferences.java",
+  "java/src/org/chromium/chrome/browser/settings/website/AddExceptionPreference.java",
+  "java/src/org/chromium/chrome/browser/settings/website/ChosenObjectInfo.java",
+  "java/src/org/chromium/chrome/browser/settings/website/ChosenObjectPreferences.java",
+  "java/src/org/chromium/chrome/browser/settings/website/ClearWebsiteStorage.java",
+  "java/src/org/chromium/chrome/browser/settings/website/ClearWebsiteStorageDialog.java",
+  "java/src/org/chromium/chrome/browser/settings/website/ContentSetting.java",
+  "java/src/org/chromium/chrome/browser/settings/website/ContentSettingException.java",
+  "java/src/org/chromium/chrome/browser/settings/website/ContentSettingsResources.java",
+  "java/src/org/chromium/chrome/browser/settings/website/LocalStorageInfo.java",
+  "java/src/org/chromium/chrome/browser/settings/website/LocationCategory.java",
+  "java/src/org/chromium/chrome/browser/settings/website/ManageSpaceActivity.java",
+  "java/src/org/chromium/chrome/browser/settings/website/NotificationCategory.java",
+  "java/src/org/chromium/chrome/browser/settings/website/PermissionInfo.java",
+  "java/src/org/chromium/chrome/browser/settings/website/SettingsNavigationSource.java",
+  "java/src/org/chromium/chrome/browser/settings/website/SingleCategoryPreferences.java",
+  "java/src/org/chromium/chrome/browser/settings/website/SingleWebsitePreferences.java",
+  "java/src/org/chromium/chrome/browser/settings/website/SiteDataCleaner.java",
+  "java/src/org/chromium/chrome/browser/settings/website/SiteSettingsCategory.java",
+  "java/src/org/chromium/chrome/browser/settings/website/SiteSettingsPreference.java",
+  "java/src/org/chromium/chrome/browser/settings/website/SiteSettingsPreferences.java",
+  "java/src/org/chromium/chrome/browser/settings/website/StorageInfo.java",
+  "java/src/org/chromium/chrome/browser/settings/website/TriStateSiteSettingsPreference.java",
+  "java/src/org/chromium/chrome/browser/settings/website/Website.java",
+  "java/src/org/chromium/chrome/browser/settings/website/WebsiteAddress.java",
+  "java/src/org/chromium/chrome/browser/settings/website/WebsitePermissionsFetcher.java",
+  "java/src/org/chromium/chrome/browser/settings/website/WebsitePreference.java",
+  "java/src/org/chromium/chrome/browser/settings/website/WebsitePreferenceBridge.java",
   "java/src/org/chromium/chrome/browser/share/LensUtils.java",
   "java/src/org/chromium/chrome/browser/share/OptionalShareTargetsManager.java",
   "java/src/org/chromium/chrome/browser/share/ShareActivity.java",
+  "java/src/org/chromium/chrome/browser/share/ShareDelegate.java",
+  "java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java",
   "java/src/org/chromium/chrome/browser/share/ShareDialogAdapter.java",
   "java/src/org/chromium/chrome/browser/share/ShareHelper.java",
-  "java/src/org/chromium/chrome/browser/share/ShareMenuActionHandler.java",
   "java/src/org/chromium/chrome/browser/share/ShareParams.java",
+  "java/src/org/chromium/chrome/browser/share/ShareSheetBottomSheetContent.java",
+  "java/src/org/chromium/chrome/browser/share/ShareSheetCoordinator.java",
+  "java/src/org/chromium/chrome/browser/share/ShareSheetItemViewProperties.java",
   "java/src/org/chromium/chrome/browser/sharing/SharingAdapter.java",
+  "java/src/org/chromium/chrome/browser/sharing/SharingJNIBridge.java",
   "java/src/org/chromium/chrome/browser/sharing/SharingNotificationUtil.java",
+  "java/src/org/chromium/chrome/browser/sharing/SharingServiceProxy.java",
   "java/src/org/chromium/chrome/browser/sharing/click_to_call/ClickToCallMessageHandler.java",
   "java/src/org/chromium/chrome/browser/sharing/click_to_call/ClickToCallUma.java",
   "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMessageHandler.java",
   "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMetrics.java",
   "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardShareActivity.java",
-  "java/src/org/chromium/chrome/browser/sharing/SharingJNIBridge.java",
-  "java/src/org/chromium/chrome/browser/sharing/SharingServiceProxy.java",
   "java/src/org/chromium/chrome/browser/signin/AccountPickerDialogFragment.java",
-  "java/src/org/chromium/chrome/browser/signin/IdentityServicesProvider.java",
   "java/src/org/chromium/chrome/browser/signin/ConfirmImportSyncDataDialog.java",
   "java/src/org/chromium/chrome/browser/signin/ConfirmManagedSyncDataDialog.java",
   "java/src/org/chromium/chrome/browser/signin/ConfirmSyncDataStateMachine.java",
@@ -1469,11 +1505,13 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/signin/ConsentTextTracker.java",
   "java/src/org/chromium/chrome/browser/signin/DisplayableProfileData.java",
   "java/src/org/chromium/chrome/browser/signin/GoogleActivityController.java",
+  "java/src/org/chromium/chrome/browser/signin/IdentityServicesProvider.java",
   "java/src/org/chromium/chrome/browser/signin/PersonalizedSigninPromoView.java",
   "java/src/org/chromium/chrome/browser/signin/ProfileDataCache.java",
   "java/src/org/chromium/chrome/browser/signin/ProfileDownloader.java",
   "java/src/org/chromium/chrome/browser/signin/SignOutDialogFragment.java",
   "java/src/org/chromium/chrome/browser/signin/SigninActivity.java",
+  "java/src/org/chromium/chrome/browser/signin/SigninActivityLauncher.java",
   "java/src/org/chromium/chrome/browser/signin/SigninFragment.java",
   "java/src/org/chromium/chrome/browser/signin/SigninFragmentBase.java",
   "java/src/org/chromium/chrome/browser/signin/SigninHelper.java",
@@ -1539,6 +1577,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/sync/SyncController.java",
   "java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java",
   "java/src/org/chromium/chrome/browser/sync/SyncUserDataWiper.java",
+  "java/src/org/chromium/chrome/browser/sync/TrustedVaultClient.java",
   "java/src/org/chromium/chrome/browser/sync/ui/PassphraseActivity.java",
   "java/src/org/chromium/chrome/browser/sync/ui/PassphraseCreationDialogFragment.java",
   "java/src/org/chromium/chrome/browser/sync/ui/PassphraseDialogFragment.java",
@@ -1554,17 +1593,19 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java",
   "java/src/org/chromium/chrome/browser/tab/TabAttributeKeys.java",
   "java/src/org/chromium/chrome/browser/tab/TabAttributes.java",
-  "java/src/org/chromium/chrome/browser/tab/TabBrowserControlsState.java",
+  "java/src/org/chromium/chrome/browser/tab/TabBrowserControlsConstraintsHelper.java",
+  "java/src/org/chromium/chrome/browser/tab/TabBrowserControlsOffsetHelper.java",
   "java/src/org/chromium/chrome/browser/tab/TabBuilder.java",
   "java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java",
   "java/src/org/chromium/chrome/browser/tab/TabContextMenuPopulator.java",
   "java/src/org/chromium/chrome/browser/tab/TabDelegateFactory.java",
   "java/src/org/chromium/chrome/browser/tab/TabFavicon.java",
+  "java/src/org/chromium/chrome/browser/tab/TabFeatureUtilities.java",
+  "java/src/org/chromium/chrome/browser/tab/TabHelpers.java",
   "java/src/org/chromium/chrome/browser/tab/TabIdManager.java",
+  "java/src/org/chromium/chrome/browser/tab/TabImpl.java",
   "java/src/org/chromium/chrome/browser/tab/TabImportanceManager.java",
-  "java/src/org/chromium/chrome/browser/tab/TabHelpers.java",
   "java/src/org/chromium/chrome/browser/tab/TabObserver.java",
-  "java/src/org/chromium/chrome/browser/tab/TabObserverRegistrar.java",
   "java/src/org/chromium/chrome/browser/tab/TabParentIntent.java",
   "java/src/org/chromium/chrome/browser/tab/TabRedirectHandler.java",
   "java/src/org/chromium/chrome/browser/tab/TabState.java",
@@ -1576,8 +1617,10 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/tab/TabWebContentsObserver.java",
   "java/src/org/chromium/chrome/browser/tab/TabWebContentsUserData.java",
   "java/src/org/chromium/chrome/browser/tab/TrustedCdn.java",
-  "java/src/org/chromium/chrome/browser/tabbed_mode/TabbedNavigationBarColorController.java",
+  "java/src/org/chromium/chrome/browser/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java",
+  "java/src/org/chromium/chrome/browser/tab_activity_glue/ReparentingTask.java",
   "java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java",
+  "java/src/org/chromium/chrome/browser/tabbed_mode/TabbedNavigationBarColorController.java",
   "java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java",
   "java/src/org/chromium/chrome/browser/tabbed_mode/TabbedSystemUiCoordinator.java",
   "java/src/org/chromium/chrome/browser/tabmodel/AsyncTabParams.java",
@@ -1619,11 +1662,9 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/tabmodel/TabbedModeTabPersistencePolicy.java",
   "java/src/org/chromium/chrome/browser/tabmodel/document/AsyncTabCreationParams.java",
   "java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java",
-  "java/src/org/chromium/chrome/browser/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java",
-  "java/src/org/chromium/chrome/browser/tab_activity_glue/TabDelegateFactoryImpl.java",
-  "java/src/org/chromium/chrome/browser/tasks/ReturnToChromeExperimentsUtil.java",
   "java/src/org/chromium/chrome/browser/tasks/EngagementTimeUtil.java",
   "java/src/org/chromium/chrome/browser/tasks/JourneyManager.java",
+  "java/src/org/chromium/chrome/browser/tasks/ReturnToChromeExperimentsUtil.java",
   "java/src/org/chromium/chrome/browser/tasks/TaskRecognizer.java",
   "java/src/org/chromium/chrome/browser/tasks/TasksUma.java",
   "java/src/org/chromium/chrome/browser/toolbar/AppThemeColorProvider.java",
@@ -1644,6 +1685,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/toolbar/TabSwitcherButtonViewBinder.java",
   "java/src/org/chromium/chrome/browser/toolbar/TabSwitcherDrawable.java",
   "java/src/org/chromium/chrome/browser/toolbar/ToolbarButtonInProductHelpController.java",
+  "java/src/org/chromium/chrome/browser/toolbar/ToolbarColors.java",
   "java/src/org/chromium/chrome/browser/toolbar/ToolbarCommonPropertiesModel.java",
   "java/src/org/chromium/chrome/browser/toolbar/ToolbarDataProvider.java",
   "java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java",
@@ -1654,9 +1696,13 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsMediator.java",
   "java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsProperties.java",
   "java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsViewBinder.java",
-  "java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarNewTabButton.java",
+  "java/src/org/chromium/chrome/browser/toolbar/bottom/BottomTabSwitcherActionMenuCoordinator.java",
+  "java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarAnimationCoordinator.java",
   "java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java",
+  "java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarNewTabButton.java",
+  "java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarVariationManager.java",
   "java/src/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java",
+  "java/src/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarLinearLayout.java",
   "java/src/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java",
   "java/src/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarModel.java",
   "java/src/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarViewBinder.java",
@@ -1674,6 +1720,12 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/toolbar/top/IncognitoSwitchCoordinator.java",
   "java/src/org/chromium/chrome/browser/toolbar/top/IncognitoSwitchProperties.java",
   "java/src/org/chromium/chrome/browser/toolbar/top/IncognitoSwitchViewBinder.java",
+  "java/src/org/chromium/chrome/browser/toolbar/top/StartSurfaceToolbarCoordinator.java",
+  "java/src/org/chromium/chrome/browser/toolbar/top/StartSurfaceToolbarMediator.java",
+  "java/src/org/chromium/chrome/browser/toolbar/top/StartSurfaceToolbarProperties.java",
+  "java/src/org/chromium/chrome/browser/toolbar/top/StartSurfaceToolbarView.java",
+  "java/src/org/chromium/chrome/browser/toolbar/top/StartSurfaceToolbarViewBinder.java",
+  "java/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherActionMenuCoordinator.java",
   "java/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTCoordinatorPhone.java",
   "java/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTPhone.java",
   "java/src/org/chromium/chrome/browser/toolbar/top/ToggleTabStackButton.java",
@@ -1685,14 +1737,18 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java",
   "java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarCoordinator.java",
   "java/src/org/chromium/chrome/browser/toolbar/top/ViewShiftingActionBarDelegate.java",
-  "java/src/org/chromium/chrome/browser/toolbar/top/tab_switcher_action_menu/TabSwitcherActionMenuCoordinator.java",
-  "java/src/org/chromium/chrome/browser/toolbar/top/tab_switcher_action_menu/TabSwitcherActionMenuItemBinder.java",
-  "java/src/org/chromium/chrome/browser/toolbar/top/tab_switcher_action_menu/TabSwitcherActionMenuItemProperties.java",
   "java/src/org/chromium/chrome/browser/tracing/TracingController.java",
   "java/src/org/chromium/chrome/browser/tracing/TracingNotificationManager.java",
   "java/src/org/chromium/chrome/browser/tracing/TracingNotificationService.java",
   "java/src/org/chromium/chrome/browser/translate/TranslateBridge.java",
   "java/src/org/chromium/chrome/browser/translate/TranslateUtils.java",
+  "java/src/org/chromium/chrome/browser/ui/ImmersiveModeManager.java",
+  "java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java",
+  "java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java",
+  "java/src/org/chromium/chrome/browser/ui/tablet/emptybackground/EmptyBackgroundViewTablet.java",
+  "java/src/org/chromium/chrome/browser/ui/tablet/emptybackground/EmptyBackgroundViewWrapper.java",
+  "java/src/org/chromium/chrome/browser/ui/tablet/emptybackground/incognitotoggle/IncognitoToggleButton.java",
+  "java/src/org/chromium/chrome/browser/ui/tablet/emptybackground/incognitotoggle/IncognitoToggleButtonTablet.java",
   "java/src/org/chromium/chrome/browser/upgrade/PackageReplacedBroadcastReceiver.java",
   "java/src/org/chromium/chrome/browser/usage_stats/DigitalWellbeingClient.java",
   "java/src/org/chromium/chrome/browser/usage_stats/EventTracker.java",
@@ -1709,16 +1765,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/usage_stats/UsageStatsMetricsReporter.java",
   "java/src/org/chromium/chrome/browser/usage_stats/UsageStatsService.java",
   "java/src/org/chromium/chrome/browser/usage_stats/WebsiteEvent.java",
-  "java/src/org/chromium/chrome/browser/ui/ImmersiveModeManager.java",
-  "java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java",
-  "java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java",
-  "java/src/org/chromium/chrome/browser/ui/tablet/emptybackground/EmptyBackgroundViewTablet.java",
-  "java/src/org/chromium/chrome/browser/ui/tablet/emptybackground/EmptyBackgroundViewWrapper.java",
-  "java/src/org/chromium/chrome/browser/ui/tablet/emptybackground/incognitotoggle/IncognitoToggleButton.java",
-  "java/src/org/chromium/chrome/browser/ui/tablet/emptybackground/incognitotoggle/IncognitoToggleButtonTablet.java",
-  "java/src/org/chromium/chrome/browser/util/ChromeIntentUtil.java",
-  "java/src/org/chromium/chrome/browser/util/ColorUtils.java",
-  "java/src/org/chromium/chrome/browser/util/FeatureUtilities.java",
   "java/src/org/chromium/chrome/browser/vr/ArDelegate.java",
   "java/src/org/chromium/chrome/browser/vr/ArDelegateProvider.java",
   "java/src/org/chromium/chrome/browser/webapps/ActivateWebApkActivity.java",
@@ -1726,7 +1772,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHost.java",
   "java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHostSignature.java",
   "java/src/org/chromium/chrome/browser/webapps/GooglePlayWebApkInstallDelegate.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebappSplashDelegate.java",
   "java/src/org/chromium/chrome/browser/webapps/SameTaskWebApkActivity.java",
   "java/src/org/chromium/chrome/browser/webapps/SplashController.java",
   "java/src/org/chromium/chrome/browser/webapps/SplashDelegate.java",
@@ -1742,12 +1787,14 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/webapps/WebApkActivity7.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkActivity8.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkActivity9.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebApkInfo.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebApkIntentDataProvider.java",
+  "java/src/org/chromium/chrome/browser/webapps/WebApkExtras.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkHandlerDelegate.java",
+  "java/src/org/chromium/chrome/browser/webapps/WebApkInfo.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkInstallService.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkInstaller.java",
+  "java/src/org/chromium/chrome/browser/webapps/WebApkIntentDataProviderFactory.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkManagedActivity.java",
+  "java/src/org/chromium/chrome/browser/webapps/WebApkOfflineDialog.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkPostShareTargetNavigator.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkServiceClient.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkShareTargetUtil.java",
@@ -1770,8 +1817,8 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/webapps/WebappActivity7.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappActivity8.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappActivity9.java",
+  "java/src/org/chromium/chrome/browser/webapps/WebappActivityTabController.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappAuthenticator.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebappBrowserControlsDelegate.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappCustomTabTimeSpentLogger.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappDataStorage.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappDelegateFactory.java",
@@ -1781,18 +1828,23 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/webapps/WebappIcon.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappInfo.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProvider.java",
+  "java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProviderFactory.java",
+  "java/src/org/chromium/chrome/browser/webapps/WebappIntentUtils.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappLauncherActivity.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappManagedActivity.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebApkExtras.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebApkOfflineDialog.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappRegistry.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappScopePolicy.java",
+  "java/src/org/chromium/chrome/browser/webapps/WebappSplashDelegate.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappTabDelegate.java",
-  "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenManager.java",
-  "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenProperties.java",
+  "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenCoordinator.java",
   "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenDialogView.java",
+  "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenInstaller.java",
+  "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenMediator.java",
+  "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenProperties.java",
   "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenViewBinder.java",
   "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenViewDelegate.java",
+  "java/src/org/chromium/chrome/browser/webapps/dependency_injection/WebappActivityComponent.java",
+  "java/src/org/chromium/chrome/browser/webapps/dependency_injection/WebappActivityModule.java",
   "java/src/org/chromium/chrome/browser/webauth/AuthenticatorFactory.java",
   "java/src/org/chromium/chrome/browser/webauth/AuthenticatorImpl.java",
   "java/src/org/chromium/chrome/browser/webauth/Fido2ApiHandler.java",
@@ -1813,6 +1865,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/widget/ThumbnailProviderImpl.java",
   "java/src/org/chromium/chrome/browser/widget/ThumbnailStorageDelegate.java",
   "java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java",
+  "java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetContent.java",
   "java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetController.java",
   "java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetObserver.java",
   "java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetSwipeDetector.java",