BASELINE: Update Chromium to 96.0.4664.181

Change-Id: I762cd1da89d73aa6313b4a753fe126c34833f046
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 83 insertions, 63 deletions

diff --git a/chromium/WATCHLISTS b/chromium/WATCHLISTS
index 9423b04248b..752826a843d 100644
--- a/chromium/WATCHLISTS
+++ b/chromium/WATCHLISTS
@@ -140,7 +140,7 @@
                   '|components/arc/ime/'
     },
     'arc_kiosk': {
-      'filepath': 'chrome/browser/chromeos/app_mode/arc/'\
+      'filepath': 'chrome/browser/ash/app_mode/arc/'\
                   '|components/arc/kiosk/'\
                   '|arc_kiosk'
     },
@@ -160,15 +160,24 @@
       'filepath': 'ash/webui/common/'\
                   '|chrome/test/data/webui/chromeos/ash_common/',
     },
-    'assistant': {
-      'filepath': 'ash/ambient/ui/.*assistant.*'\
+    'assistive': {
+      'filepath': 'ash/ambient/'\
                   '|ash/app_list/views/assistant/'\
                   '|ash/assistant/'\
+                  '|ash/public/cpp/ambient/'\
+                  '|ash/public/cpp/assistant/'\
+                  '|ash/public/cpp/wallpaper/'\
                   '|ash/wallpaper/'\
                   '|chromeos/assistant/'\
                   '|chromeos/components/personalization_app/'\
                   '|chromeos/services/assistant/'\
-                  '|chrome/browser/ui/ash/assistant/'
+                  '|chromeos/services/libassistant/'\
+                  '|chrome/browser/ash/web_applications/personalization_app/'\
+                  '|chrome/browser/resources/settings/chromeos/ambient_mode_page/'\
+                  '|chrome/browser/ui/ash/.*wallpaper.*/'\
+                  '|chrome/browser/ui/ash/ambient/'\
+                  '|chrome/browser/ui/ash/assistant/'\
+                  '|chrome/browser/ui/webui/settings/chromeos/ambient_mode_handler.*'\
     },
     'audio_service': {
       'filepath': 'services/audio/'
@@ -189,19 +198,6 @@
     'autoclick': {
       'filepath': 'ash/autoclick/',
     },
-    'autofill': {
-      'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/autofill/|'\
-                  'chrome/browser/autofill/|'\
-                  'chrome/browser/ui/android/autofill/|'\
-                  'chrome/browser/ui/autofill/|'\
-                  'chrome/browser/ui/cocoa/autofill/|'\
-                  'chrome/browser/ui/views/autofill/|'\
-                  'chrome/renderer/autofill/|'\
-                  'chrome/test/data/autofill/|'\
-                  'components/autofill/|'\
-                  'components/autofill/browser/webdata/|'\
-                  'components/webdata/',
-    },
     'autofill_assistant': {
       'filepath': 'chrome/android/features/autofill_assistant/|'\
                   'chrome/browser/android/autofill_assistant/|'\
@@ -390,9 +386,7 @@
                   '|third_party/blink/public/web/.*geolocation'
     },
     'blink_heap': {
-      'filepath': 'third_party/blink/renderer/platform/heap' \
-                  '|base/allocator/partition_allocator/' \
-                  '|components/gc/'
+      'filepath': 'third_party/blink/renderer/platform/heap'
     },
     'blink_html': {
       'filepath': 'third_party/blink/renderer/core/html/' \
@@ -754,14 +748,14 @@
                   'ui/login/',
     },
     'chromeos_media_app': {
-      'filepath': 'chromeos/components/media_app_ui/|'\
+      'filepath': 'ash/webui/media_app_ui/|'\
                   'chrome/browser/ash/web_applications/media_app/',
     },
     'chromeos_net': {
       'filepath': 'ash/system/network/|'\
                   'chromeos/network/|'\
                   'chromeos/services/network_config/|'\
-                  'chrome/browser/chromeos/net/|'\
+                  'chrome/browser/ash/net/|'\
                   'chrome/browser/extensions/api/networking_private/|'\
                   'chrome/browser/resources/chromeos/internet_config_dialog/|'\
                   'chrome/browser/resources/chromeos/internet_detail_dialog/|'\
@@ -869,6 +863,7 @@
       'filepath': 'chrome/browser/resources/settings/chromeos/os_printing_page/'\
                   '|chrome/test/data/webui/settings/cups_printer_page_tests.js'\
                   '|chrome/browser/ui/webui/settings/chromeos/cups_printers_handler'\
+                  '|chrome/browser/ash/printing/'\
                   '|chrome/browser/chromeos/printing/'\
                   '|printing/',
     },
@@ -925,6 +920,9 @@
     'devtools': {
       'filepath': 'devtools',
     },
+    'diagnostics_mojo': {
+      'filepath': 'chromeos/services/cros_healthd/public/mojom/',
+    },
     'diagnostics_ui': {
       'filepath': 'ash/webui/diagnostics_ui/',
     },
@@ -982,7 +980,7 @@
     },
     'feed': {
       'filepath': 'chrome/android/feed|' \
-                  'chrome/browser/android/feed/|' \
+                  'chrome/browser/feed/|' \
                   'components/feed/'
     },
     'feedback': {
@@ -1026,7 +1024,7 @@
     },
     'full_restore': {
       'filepath': 'chrome/browser/ash/full_restore/|' \
-                  'components/full_restore/'
+                  'components/app_restore/'
     },
     'fuzzing': {
       'filepath': 'fuzz|Fuzz',
@@ -1290,6 +1288,9 @@
                   '|chrome/test/media_router/' \
                   '|components/media_router/'
     },
+    'media_webrtc': {
+      'filepath': '^media/webrtc/'
+    },
     'message_loop': {
       'filepath': 'base/message_'
     },
@@ -1297,7 +1298,7 @@
       'filepath': 'base/metrics/'\
                   '|chrome/android/java/src/org/chromium/chrome/browser/metrics/'\
                   '|chrome/browser/metrics/'\
-                  '|chrome/browser/chromeos/external_metrics'\
+                  '|chrome/browser/ash/external_metrics'\
                   '|chrome/browser/extensions/api/metrics_private/'\
                   '|chrome/browser/ui/webui/metrics_handler'\
                   '|chromecast/browser/metrics/'\
@@ -1321,10 +1322,10 @@
     },
     'multidevice': {
       'filepath': 'ash/multi_device_setup/'\
-                  '|chrome/browser/chromeos/cryptauth/'\
-                  '|chrome/browser/chromeos/device_sync/'\
-                  '|chrome/browser/chromeos/multidevice_setup/'\
-                  '|chrome/browser/chromeos/secure_channel/'\
+                  '|chrome/browser/ash/cryptauth/'\
+                  '|chrome/browser/ash/device_sync/'\
+                  '|chrome/browser/ash/multidevice_setup/'\
+                  '|chrome/browser/ash/secure_channel/'\
                   '|chrome/browser/resources/chromeos/multidevice_setup/'\
                   '|chrome/browser/resources/settings/multidevice_page/'\
                   '|chrome/browser/resources/settings/chromeos/multidevice_page/'\
@@ -1493,6 +1494,9 @@
                   '|chrome/browser/ui/cocoa/panels'\
                   '|chrome/browser/ui/views/panels'
     },
+    'partition_alloc': {
+      'filepath': 'base/allocator/partition_allocator/'
+    },
     'password_manager': {
       'filepath': 'chrome/.*/password_'\
                   '|chrome/browser/ui/passwords'\
@@ -1540,7 +1544,7 @@
                   '|permission_context',
     },
     'phonehub': {
-      'filepath': 'chrome/browser/chromeos/phonehub/'\
+      'filepath': 'chrome/browser/ash/phonehub/'\
                   '|chromeos/components/phonehub/'\
                   '|ash/system/phonehub/',
     },
@@ -1596,9 +1600,9 @@
       'filepath': 'push_messaging'
     },
     'quick_answers': {
-      'filepath': 'ash/quick_answers/'\
-                  '|chrome/browser/renderer_context_menu/quick_answers.*'\
-                  '|chromeos/components/quick_answers/'
+      'filepath': 'ash/components/quick_answers/'\
+                  '|ash/quick_answers/'\
+                  '|chrome/browser/renderer_context_menu/quick_answers.*'
     },
     'relaunch_notification': {
       'filepath': 'chrome/browser/ui/views/relaunch_notification'
@@ -1703,9 +1707,12 @@
         'content/browser/browsing_instance',
     },
     'smartlock': {
-      'filepath': 'chrome/browser/ash/login/easy_unlock/'\
-                  '|chrome/browser/resources/easy_unlock/'\
-                  '|chromeos/components/proximity_auth/'
+      'filepath': 'ash/public/cpp/smartlock*'\
+                  '|chrome/browser/ash/login/easy_unlock/'\
+                  '|chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_smartlock*'\
+                  '|chrome/test/data/webui/settings/chromeos/multidevice_smartlock*'\
+                  '|chromeos/components/proximity_auth/'\
+                  '|chromeos/dbus/easy_unlock/',
     },
     'smb': {
       'filepath': 'chrome/browser/ash/file_system_provider' \
@@ -1832,7 +1839,7 @@
       'filepath': 'apitest|unittest|browsertest|uitest|chrome/test/',
     },
     'tether': {
-      'filepath': 'chrome/browser/chromeos/tether/'\
+      'filepath': 'chrome/browser/ash/tether/'\
                   '|chrome/browser/ui/ash/network/tether*'\
                   '|chromeos/components/tether/'
     },
@@ -1849,7 +1856,6 @@
     'textinput_chromeos': {
       'filepath': 'chrome/browser/ash/input_method/'\
                   '|chrome/browser/chromeos/extensions/input_method'\
-                  '|chrome/browser/chromeos/status/input_method'\
                   '|chrome/browser/extensions/api/input_ime'\
                   '|chrome/browser/resources/keyboard'\
                   'chromeos/.*(language|keyboard)'\
@@ -2061,12 +2067,7 @@
       'filepath': 'third_party/blink/web_tests/external/wpt/tools/',
     },
     'x11': {
-      'filepath': 'content/browser/renderer_host/backing_store_x\.' \
-                  '|chrome/browser/chromeos/system_key_event_listener\.' \
-                  '|chrome/browser/chromeos/'\
-                  'xinput_hierarchy_changed_event_listener\.' \
-                  '|chrome/browser/chromeos/wm_' \
-                  '|ui/base/x/'
+      'filepath': 'ui/base/x/'
     },
     'zlib': {
       'filepath': 'third_party/zlib'
@@ -2079,6 +2080,11 @@
                   '|content/public/browser/host_zoom_map.h' \
                   '|content/public/browser/storage_partition.h'
     },
+    'zte': {
+      'filepath': 'chrome/browser/ash/login/enrollment/*auto_enrollment*|' \
+                  'chrome/browser/ash/policy/enrollment/*auto_enrollment*|' \
+                  'chrome/browser/ash/policy/enrollment/private_membership/'
+    },
   },
 
   ##############################################################################
@@ -2159,14 +2165,12 @@
     'ash_webui_common': ['gavinwill+watch-ash-webui-common@chromium.org',
                          'jimmyxgong+watch-ash-webui-common@chromium.org',
                          'zentaro+watch-ash-webui-common@chromium.org'],
-    'assistant': ['croissant-eng+reviews@chromium.org'],
+    'assistive': ['croissant-eng+reviews@chromium.org'],
     'audio_service': ['marinaciocea+watch@chromium.org',
                       'olka+watch@chromium.org'],
     'aura': ['sadrul@chromium.org'],
     'aura_compositor': ['jbauman+watch@chromium.org'],
     'autoclick': ['katie+watch@chromium.org'],
-    'autofill': ['ftirelo+autofillwatch@chromium.org',
-                 'tmartino+autofillwatch@chromium.org'],
     'autofill_assistant': ['autofill_assistant+watch@google.com'],
     'autofill_payments': ['armalhotra+autofillwatch@google.com',
                           'jsaul+autofillwatch@google.com',
@@ -2240,7 +2244,7 @@
     'blink_geolocation': ['timvolodine@chromium.org'],
     'blink_heap': ['haraken@chromium.org',
                    'kouhei+heap@chromium.org',
-                   'oilpan-reviews@chromium.org'],
+                   'oilpan-reviews+blink@chromium.org'],
     'blink_html': ['blink-reviews-html@chromium.org'],
     'blink_htmlparser': ['kinuko+watch@chromium.org',
                          'loading-reviews+parser@chromium.org'],
@@ -2329,8 +2333,7 @@
                       'kinuko+worker@chromium.org',
                       'shimazu+worker@chromium.org'],
     'blink_wtf': ['blink-reviews-wtf@chromium.org'],
-    'blink_xml': ['dominicc+watchlist@chromium.org',
-                  'joelhockey+watch@chromium.org'],
+    'blink_xml': ['dominicc+watchlist@chromium.org'],
     'borealis': ['borealis-reviews+watch@google.com'],
     'bottombar': ['donnd+watch@chromium.org',
                   'mdjones+watch@chromium.org'],
@@ -2389,7 +2392,8 @@
                               'chrome-os-gardeners+watch@google.com'],
     'chromeos_timezone': ['alemate+watch@chromium.org'],
     'chromeos_webui': ['alemate+watch@chromium.org'],
-    'chromeos_wifi_sync': ['jonmann+watch@chromium.org',
+    'chromeos_wifi_sync': ['danlee+watch@google.com',
+                           'jonmann+watch@chromium.org',
                            'stevenjb+watch@chromium.org'],
     'chromevox': ['akihiroota@chromium.org',
                   'anastasi+watch@google.com',
@@ -2458,8 +2462,11 @@
                        'mattreynolds+watch@chromium.org',
                        'odejesush+watch@chromium.org'],
     'devtools': ['devtools-reviews@chromium.org'],
+    'diagnostics_mojo': ['ashleydp+watch-diagnostics_mojo@google.com',
+                         'gavindodd+watch-diagnostics_mojo@google.com',
+                         'michaelcheco+watch-diagnostics_mojo@google.com',
+                         'zentaro+watch-diagnostics_mojo@chromium.org'],
     'diagnostics_ui': ['gavinwill+diagnostics-watch@chromium.org',
-                       'joonbug+diagnostics-watch@chromium.org',
                        'michaelcheco+diagnostics-watch@google.com',
                        'zentaro+diagnostics-watch@chromium.org',
                        'gavindodd+diagnostics-watch@google.com',
@@ -2493,9 +2500,7 @@
     'feedback': ['cros-telemetry+feedback@google.com'],
     'fileapi': ['kinuko+fileapi@chromium.org'],
     'filebrowse': ['rginda+watch@chromium.org'],
-    'filesapp': ['filesapp-reviews@chromium.org',
-                 'fukino+watch@chromium.org',
-                 'yamaguchi+watch@chromium.org'],
+    'filesapp': ['filesapp-reviews@chromium.org'],
     'freetype_update': ['drott+watch@chromium.org',
                         'thestig@chromium.org'],
     'fsp': ['mtomasz+watch@chromium.org'],
@@ -2598,14 +2603,19 @@
                        'mfoltz+watch@chromium.org'],
     'media_router': ['mfoltz+watch@chromium.org',
                      'takumif+watch@chromium.org'],
+    'media_webrtc': ['alessiob@chromium.org',
+                     'peah@chromium.org',
+                     'saza@chromium.org'],
     'message_loop': ['sadrul@chromium.org'],
     'metrics': ['asvitkine+watch@chromium.org',
                 'chromiummetricswatch@microsoft.com'],
     'metrics_metadata_files': ['asvitkine+watchxml@chromium.org',
-                               'chromium-metrics-reviews@google.com'],
+                               'chromium-metrics-reviews@google.com',
+                               'lucmult+metrics@chromium.org'],
     'metrics_perf': ['cwp-reviews+chromium@google.com'],
     'midi': ['toyoshim+midi@chromium.org'],
-    'multidevice': ['hansberry+watch-multidevice@chromium.org',
+    'multidevice': ['danlee+watch-multidevice@google.com',
+                    'hansberry+watch-multidevice@chromium.org',
                     'nohle+watch-multidevice@chromium.org',
                     'themaxli+watch-multidevice@chromium.org'],
     'multipaste': ['andrewxu+watch-multipaste@google.com',
@@ -2618,6 +2628,7 @@
                    'creis+watch@chromium.org',
                    'navigation-cc+reviews@chromium.org'],
     'nearby': ['cclem+watch-nearby@google.com',
+               'danlee+watch-nearby@google.com',
                'hais+watch-nearby@google.com',
                'hansberry+watch-nearby@chromium.org',
                'hansenmichael+watch-nearby@google.com',
@@ -2637,7 +2648,7 @@
     'nfc': ['mattreynolds+watch@chromium.org',
             'rijubrata.bhaumik@intel.com'],
     'notification_scheduler': ['xingliu+watch@chromium.org'],
-    'notifications': ['peter@chromium.org'],
+    'notifications': ['peter@chromium.org', 'sarakato+watch@chromium.org'],
     'nqe': ['tbansal+watch-nqe@chromium.org'],
     'ntp_snippets': ['ntp-dev+reviews@chromium.org'],
     'ntp_tiles': ['ntp-dev+reviews@chromium.org'],
@@ -2666,6 +2677,9 @@
     'panels': ['dimich@chromium.org',
                'jennb@chromium.org',
                'jianli@chromium.org'],
+    'partition_alloc': ['chrome-memory-tok+pa@google.com',
+                        'haraken@chromium.org',
+                        'lizeb+pa@chromium.org'],
     'password_manager': ['gcasto+watchlist@chromium.org',
                          'vasilii+watchlistpasswordmanager@chromium.org'],
     'payments': ['rouslan+payments@chromium.org',
@@ -2740,7 +2754,10 @@
     'site_instance': ['ajwong+watch@chromium.org',
                       'alexmos+watch@chromium.org',
                       'creis+watch@chromium.org'],
-    'smartlock': ['hansberry+watch-smartlock@chromium.org'],
+    'smartlock': ['bhartmire+watch-smartlock@google.com',
+                  'cclem+watch-smartlock@google.com',
+                  'danlee+watch-smartlock@google.com',
+                  'hansberry+watch-smartlock@chromium.org'],
     'smb': ['cros-enterprise-lax+smbwatch@chromium.org'],
     'source_idls': ['jmedley+watch@chromium.org'],
     'speed_metrics_changelog': ['igrigorik@chromium.org',
@@ -2753,8 +2770,9 @@
     'spellcheck': ['rlp+watch@chromium.org',
                    'rouslan+spell@chromium.org',
                    'timvolodine@chromium.org'],
-    'startup': ['grt+watch@chromium.org',
-                'pastarmovj+watch@chromium.org'],
+    'startup': ['nicolaso+watch@chromium.org',
+                'pastarmovj+watch@chromium.org',
+                'ydago+watch@chromium.org'],
     'status_area': ['cros-status-area-eng+watchlist@google.com'],
     'storage_service': ['dmurph+watching-storageservice@chromium.org'],
     'structured_headers': ['iclelland+watch@chromium.org'],
@@ -2791,7 +2809,8 @@
     'telemetry': ['telemetry-reviews@chromium.org'],
     'test_runner': ['einbinder+watch-test-runner@chromium.org'],
     'tests': [],
-    'tether': ['hansberry+watch-tether@chromium.org'],
+    'tether': ['danlee+watch-tether@google.com',
+               'hansberry+watch-tether@chromium.org'],
     'text_to_speech': ['dtseng+watch@chromium.org'],
     'textinput': ['keithlee+watch@chromium.org',
                   'nona+watch@chromium.org',
@@ -2861,7 +2880,7 @@
     'webcodecs': ['feature-media-reviews@chromium.org'],
     'webgpu': ['cwallez+watch@chromium.org',
                'kainino+watch@chromium.org'],
-    'webid': ['majidvp+watch@chromium.org'],
+    'webid': ['yigu+watch@chromium.org'],
     'weblayer': ['cricke+watch@chromium.org'],
     'weblayer_safe_browsing' : ['carlosil+watch@chromium.org'],
     'weblayer_ssl' : ['carlosil+watch@chromium.org'],
@@ -2875,5 +2894,6 @@
             'yusukes+watch@chromium.org'],
     'zlib': ['cblume+zlib@chromium.org'],
     'zoom': ['wjmaclean@chromium.org'],
+    'zte': ['amraboelkher+watch@chromium.org'],
   },
 }