diff --git a/chromium_version.txt b/chromium_version.txt index 4a7dab91..088860fc 100644 --- a/chromium_version.txt +++ b/chromium_version.txt @@ -1 +1 @@ -125.0.6422.141 +126.0.6478.55 diff --git a/docs/flags.md b/docs/flags.md index 330f9fd5..f17b0555 100644 --- a/docs/flags.md +++ b/docs/flags.md @@ -66,6 +66,8 @@ These are also available on the `chrome://flags` page. `MinimalReferrers` | Removes all cross-origin referrers and strips same-origin referrers down to the origin. Has lower precedence than `NoCrossOriginReferrers`. `NoCrossOriginReferrers` | Removes all cross-origin referrers. Has lower precedence than `NoReferrers`. `NoReferrers` | Removes all referrers. + `ReducedSystemInfo` | Reduces the amount of system information obatainable through headers and javascript, also causes hardwareConcurrency to respond with two cores. + `RemoveClientHints` | Removes client hints (information sent to servers about your system, similar to a user agent). `SetIpv6ProbeFalse` | Forces the result of the browser's IPv6 probing (i.e. IPv6 connectivity test) to be unsuccessful. This causes IPv4 addresses to be prioritized over IPv6 addresses. Without this flag, the probing result is set to be successful, which causes IPv6 to be used over IPv4 when possible. - ### Available only on desktop diff --git a/domain_substitution.list b/domain_substitution.list index 5d008601..97c40061 100644 --- a/domain_substitution.list +++ b/domain_substitution.list @@ -122,11 +122,14 @@ ash/system/eche/eche_tray_unittest.cc ash/system/federated/federated_client_manager_unittest.cc ash/system/federated/federated_service_controller_impl_unittest.cc ash/system/focus_mode/sounds/focus_mode_sounds_controller.cc +ash/system/focus_mode/youtube_music/youtube_music_types.h ash/system/human_presence/snooping_protection_controller_unittest.cc ash/system/input_device_settings/input_device_settings_metrics_manager_unittest.cc ash/system/input_device_settings/input_device_settings_notification_controller.cc ash/system/input_device_settings/input_device_settings_notification_controller_unittest.cc ash/system/mahi/mahi_constants.h +ash/system/mahi/mahi_content_source_button_unittest.cc +ash/system/mahi/mahi_panel_view_unittest.cc ash/system/notification_center/message_center_test_util.cc ash/system/notification_center/notification_grouping_controller_unittest.cc ash/system/notification_center/views/ash_notification_view_unittest.cc @@ -163,6 +166,7 @@ ash/webui/camera_app_ui/resources/js/lib/analytics.js ash/webui/camera_app_ui/resources/js/metrics.ts ash/webui/camera_app_ui/resources/js/untrusted_ga_helper.ts ash/webui/camera_app_ui/resources/js/views/camera_intent.ts +ash/webui/camera_app_ui/resources/js/views/dialog.ts ash/webui/camera_app_ui/resources/js/views/document_fix_mode.ts ash/webui/camera_app_ui/resources/js/views/settings/primary.ts ash/webui/camera_app_ui/resources/strings/camera_strings.grd @@ -245,6 +249,7 @@ base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_defau base/allocator/partition_allocator/src/partition_alloc/stack/asm/x64/push_registers_asm.cc base/allocator/partition_allocator/src/partition_alloc/stack/stack.cc base/allocator/partition_allocator/src/partition_alloc/tagging.h +base/allocator/partition_allocator/src/partition_alloc/use_death_tests.h base/android/jni_android.cc base/android/jni_string.cc base/android/library_loader/library_loader_hooks.h @@ -266,6 +271,7 @@ base/debug/stack_trace_posix.cc base/debug/stack_trace_win.cc base/file_version_info.h base/files/file_enumerator_posix.cc +base/files/file_path_watcher_win.cc base/files/file_unittest.cc base/files/file_util_posix.cc base/files/file_util_win.cc @@ -331,7 +337,6 @@ base/test/test_file_util.h base/test/test_file_util_win.cc base/test/test_suite.cc base/third_party/cityhash/city.h -base/third_party/dynamic_annotations/dynamic_annotations.h base/third_party/nspr/prtime.cc base/third_party/nspr/prtime.h base/third_party/symbolize/symbolize.cc @@ -436,8 +441,623 @@ build/gn_ast/json_gn_editor.py build/install-build-deps.py build/ios/presubmit_support.py build/lacros/test_runner.py +build/linux/debian_bullseye_amd64-sysroot/usr/include/cairo/cairo-deprecated.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/cairo/cairo-ft.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/cairo/cairo-gobject.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/cairo/cairo-pdf.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/cairo/cairo-ps.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/cairo/cairo-script-interpreter.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/cairo/cairo-script.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/cairo/cairo-svg.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/cairo/cairo-tee.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/cairo/cairo-xcb.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/cairo/cairo-xlib-xrender.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/cairo/cairo-xlib.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/cairo/cairo.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/datrie/alpha-map.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/datrie/trie.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/datrie/triedefs.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/datrie/typedefs.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/freetype2/freetype/config/ftoption.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/freetype2/freetype/freetype.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/freetype2/freetype/ftdriver.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/freetype2/freetype/ftwinfnt.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/freetype2/freetype/ttnameid.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/fribidi/fribidi-arabic.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/fribidi/fribidi-bidi-types-list.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/fribidi/fribidi-bidi-types.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/fribidi/fribidi-bidi.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/fribidi/fribidi-brackets.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/fribidi/fribidi-char-sets-list.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/fribidi/fribidi-char-sets.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/fribidi/fribidi-common.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/fribidi/fribidi-deprecated.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/fribidi/fribidi-flags.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/fribidi/fribidi-joining-types-list.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/fribidi/fribidi-joining-types.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/fribidi/fribidi-joining.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/fribidi/fribidi-mirroring.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/fribidi/fribidi-shape.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/fribidi/fribidi-types.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/fribidi/fribidi-unicode.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/fribidi/fribidi.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/gbm.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-autocleanups.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/gio-unix-2.0/gio/gunixsocketaddress.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/glib-2.0/gio/gemblem.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/glib-2.0/gio/gemblemedicon.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/glib-2.0/gio/gfileinfo.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/glib-2.0/gio/ginetaddress.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/glib-2.0/gio/ginetsocketaddress.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/glib-2.0/gio/gnativesocketaddress.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/glib-2.0/gio/gsocket.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/glib-2.0/gio/gsocketaddress.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/glib-2.0/gio/gsocketconnection.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/glib-2.0/gio/gsocketlistener.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/graphite2/Font.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/graphite2/Log.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/graphite2/Segment.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/graphite2/Types.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/gtk-3.0/gtk/deprecated/gtkactivatable.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/gtk-3.0/gtk/gtklinkbutton.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/gtk-3.0/gtk/gtkscrollable.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/gtk-3.0/gtk/gtksizerequest.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/gtk-3.0/gtk/gtkspinner.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/gtk-4.0/gtk/gtklinkbutton.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/gtk-4.0/gtk/gtkscrollable.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/gtk-4.0/gtk/gtksizerequest.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/gtk-4.0/gtk/gtkspinner.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/harfbuzz/hb-common.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/harfbuzz/hb-ot-layout.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/harfbuzz/hb-ot-math.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/harfbuzz/hb-ot-meta.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/harfbuzz/hb-ot-metrics.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/libdrm/drm_mode.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/libdrm/msm_drm.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/linux/am437x-vpfe.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/linux/amt.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/linux/bfs_fs.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/linux/cifs/cifs_mount.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/linux/cn_proc.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/linux/hyperv.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/linux/map_to_14segment.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/linux/map_to_7segment.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/linux/phantom.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/linux/rpl.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/linux/rpl_iptunnel.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/linux/surface_aggregator/cdev.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/linux/surface_aggregator/dtx.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/linux/toshiba.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/linux/uinput.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/linux/usb/tmc.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/nspr.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/obsolete/pralarm.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/obsolete/probslet.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/obsolete/protypes.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/obsolete/prsem.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/plarena.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/plarenas.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/plbase64.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/plerror.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/plgetopt.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/plhash.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/plstr.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/pratom.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prbit.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prclist.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prcmon.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prcountr.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prcpucfg.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prcvar.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prdtoa.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prenv.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prerr.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prerror.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prinet.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prinit.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prinrval.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prio.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/pripcsem.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/private/pprio.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/private/pprthred.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/private/prpriv.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prlink.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prlock.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prlog.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prlong.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prmem.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prmon.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prmwait.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prnetdb.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prolock.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prpdce.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prprf.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prproces.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prrng.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prrwlock.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prshm.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prshma.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prsystem.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prthread.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prtime.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prtpool.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prtrace.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prtypes.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prvrsion.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr/prwin16.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/base64.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/blapit.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/cert.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/certdb.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/certt.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/ciferfam.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/cmmf.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/cmmft.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/cms.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/cmsreclist.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/cmst.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/crmf.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/crmft.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/cryptohi.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/cryptoht.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/eccutil.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/ecl-exp.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/hasht.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/jar-ds.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/jar.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/jarfile.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/key.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/keyhi.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/keyt.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/keythi.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/lowkeyi.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/lowkeyti.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/nss.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/nssb64.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/nssb64t.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/nssbase.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/nssbaset.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/nssckbi.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/nssckepv.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/nssckft.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/nssckfw.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/nssckfwc.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/nssckfwt.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/nssckg.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/nssckmdt.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/nssckt.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/nssilckt.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/nssilock.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/nsslocks.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/nsslowhash.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/nssrwlk.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/nssrwlkt.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/nssutil.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/ocsp.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/ocspt.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/p12.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/p12plcy.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/p12t.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/pk11func.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/pk11hpke.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/pk11pqg.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/pk11priv.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/pk11pub.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/pk11sdr.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/pkcs11.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/pkcs11f.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/pkcs11n.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/pkcs11p.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/pkcs11t.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/pkcs11u.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/pkcs11uri.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/pkcs12.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/pkcs12t.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/pkcs1sig.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/pkcs7t.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/portreg.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/preenc.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/secasn1.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/secasn1t.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/seccomon.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/secder.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/secdert.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/secdig.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/secdigt.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/secerr.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/sechash.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/secitem.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/secmime.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/secmod.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/secmodt.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/secoid.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/secoidt.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/secpkcs5.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/secpkcs7.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/secport.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/shsign.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/smime.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/ssl.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/sslerr.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/sslexp.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/sslproto.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/sslt.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/utilmodt.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/utilpars.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/utilparst.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/nss/utilrename.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/openssl/e_os2.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/spa-0.2/spa/interfaces/audio/aec.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/thai/thailib.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/thai/thbrk.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/thai/thcell.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/thai/thcoll.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/thai/thctype.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/thai/thinp.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/thai/thrend.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/thai/thstr.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/thai/thwbrk.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/thai/thwchar.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/thai/thwcoll.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/thai/thwctype.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/thai/thwinp.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/thai/thwrend.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/thai/thwstr.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/thai/tis.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/thai/wtt.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/va/va_compat.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/va/va_dec_av1.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/va/va_enc_av1.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/va/va_prot.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/valgrind/drd.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/valgrind/helgrind.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/valgrind/vki/vki-linux-drm.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/valgrind/vki/vki-solaris-repcache.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/wayland-egl-backend.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/webp/decode.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/webp/encode.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/webp/mux.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/webp/mux_types.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/webp/types.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/libavutil/audio_fifo.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/libavutil/display.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/libavutil/downmix_info.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/libavutil/hdr_dynamic_metadata.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/libavutil/mastering_display_metadata.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/libavutil/random_seed.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/libavutil/ripemd.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/libavutil/sha512.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/libavutil/spherical.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/libavutil/stereo3d.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/libavutil/timecode.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/qt5/QtCore/qcompilerdetection.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/qt5/QtCore/qregularexpression.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/qt5/QtCore/qstorageinfo.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/qt5/QtCore/qversionnumber.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/qt5/QtGui/qaccessible.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/qt5/QtNetwork/qsctpserver.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/qt5/QtNetwork/qsctpsocket.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/qt6/QtCore/qcompilerdetection.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/qt6/QtCore/qglobal.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/qt6/QtCore/qregularexpression.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/qt6/QtCore/qsimd.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/qt6/QtCore/qstorageinfo.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/qt6/QtCore/qversionnumber.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/qt6/QtGui/qaccessible_base.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/qt6/QtNetwork/qsctpserver.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/qt6/QtNetwork/qsctpsocket.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/x86_64-linux-gnu/qt6/QtNetwork/qsslserver.h +build/linux/debian_bullseye_amd64-sysroot/usr/include/xf86drmMode.h +build/linux/debian_bullseye_amd64-sysroot/usr/libexec/valgrind/dh_view.js +build/linux/debian_bullseye_i386-sysroot/usr/include/cairo/cairo-deprecated.h +build/linux/debian_bullseye_i386-sysroot/usr/include/cairo/cairo-ft.h +build/linux/debian_bullseye_i386-sysroot/usr/include/cairo/cairo-gobject.h +build/linux/debian_bullseye_i386-sysroot/usr/include/cairo/cairo-pdf.h +build/linux/debian_bullseye_i386-sysroot/usr/include/cairo/cairo-ps.h +build/linux/debian_bullseye_i386-sysroot/usr/include/cairo/cairo-script-interpreter.h +build/linux/debian_bullseye_i386-sysroot/usr/include/cairo/cairo-script.h +build/linux/debian_bullseye_i386-sysroot/usr/include/cairo/cairo-svg.h +build/linux/debian_bullseye_i386-sysroot/usr/include/cairo/cairo-tee.h +build/linux/debian_bullseye_i386-sysroot/usr/include/cairo/cairo-xcb.h +build/linux/debian_bullseye_i386-sysroot/usr/include/cairo/cairo-xlib-xrender.h +build/linux/debian_bullseye_i386-sysroot/usr/include/cairo/cairo-xlib.h +build/linux/debian_bullseye_i386-sysroot/usr/include/cairo/cairo.h +build/linux/debian_bullseye_i386-sysroot/usr/include/datrie/alpha-map.h +build/linux/debian_bullseye_i386-sysroot/usr/include/datrie/trie.h +build/linux/debian_bullseye_i386-sysroot/usr/include/datrie/triedefs.h +build/linux/debian_bullseye_i386-sysroot/usr/include/datrie/typedefs.h +build/linux/debian_bullseye_i386-sysroot/usr/include/freetype2/freetype/config/ftoption.h +build/linux/debian_bullseye_i386-sysroot/usr/include/freetype2/freetype/freetype.h +build/linux/debian_bullseye_i386-sysroot/usr/include/freetype2/freetype/ftdriver.h +build/linux/debian_bullseye_i386-sysroot/usr/include/freetype2/freetype/ftwinfnt.h +build/linux/debian_bullseye_i386-sysroot/usr/include/freetype2/freetype/ttnameid.h +build/linux/debian_bullseye_i386-sysroot/usr/include/fribidi/fribidi-arabic.h +build/linux/debian_bullseye_i386-sysroot/usr/include/fribidi/fribidi-bidi-types-list.h +build/linux/debian_bullseye_i386-sysroot/usr/include/fribidi/fribidi-bidi-types.h +build/linux/debian_bullseye_i386-sysroot/usr/include/fribidi/fribidi-bidi.h +build/linux/debian_bullseye_i386-sysroot/usr/include/fribidi/fribidi-brackets.h +build/linux/debian_bullseye_i386-sysroot/usr/include/fribidi/fribidi-char-sets-list.h +build/linux/debian_bullseye_i386-sysroot/usr/include/fribidi/fribidi-char-sets.h +build/linux/debian_bullseye_i386-sysroot/usr/include/fribidi/fribidi-common.h +build/linux/debian_bullseye_i386-sysroot/usr/include/fribidi/fribidi-deprecated.h +build/linux/debian_bullseye_i386-sysroot/usr/include/fribidi/fribidi-flags.h +build/linux/debian_bullseye_i386-sysroot/usr/include/fribidi/fribidi-joining-types-list.h +build/linux/debian_bullseye_i386-sysroot/usr/include/fribidi/fribidi-joining-types.h +build/linux/debian_bullseye_i386-sysroot/usr/include/fribidi/fribidi-joining.h +build/linux/debian_bullseye_i386-sysroot/usr/include/fribidi/fribidi-mirroring.h +build/linux/debian_bullseye_i386-sysroot/usr/include/fribidi/fribidi-shape.h +build/linux/debian_bullseye_i386-sysroot/usr/include/fribidi/fribidi-types.h +build/linux/debian_bullseye_i386-sysroot/usr/include/fribidi/fribidi-unicode.h +build/linux/debian_bullseye_i386-sysroot/usr/include/fribidi/fribidi.h +build/linux/debian_bullseye_i386-sysroot/usr/include/gbm.h +build/linux/debian_bullseye_i386-sysroot/usr/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-autocleanups.h +build/linux/debian_bullseye_i386-sysroot/usr/include/gio-unix-2.0/gio/gunixsocketaddress.h +build/linux/debian_bullseye_i386-sysroot/usr/include/glib-2.0/gio/gemblem.h +build/linux/debian_bullseye_i386-sysroot/usr/include/glib-2.0/gio/gemblemedicon.h +build/linux/debian_bullseye_i386-sysroot/usr/include/glib-2.0/gio/gfileinfo.h +build/linux/debian_bullseye_i386-sysroot/usr/include/glib-2.0/gio/ginetaddress.h +build/linux/debian_bullseye_i386-sysroot/usr/include/glib-2.0/gio/ginetsocketaddress.h +build/linux/debian_bullseye_i386-sysroot/usr/include/glib-2.0/gio/gnativesocketaddress.h +build/linux/debian_bullseye_i386-sysroot/usr/include/glib-2.0/gio/gsocket.h +build/linux/debian_bullseye_i386-sysroot/usr/include/glib-2.0/gio/gsocketaddress.h +build/linux/debian_bullseye_i386-sysroot/usr/include/glib-2.0/gio/gsocketconnection.h +build/linux/debian_bullseye_i386-sysroot/usr/include/glib-2.0/gio/gsocketlistener.h +build/linux/debian_bullseye_i386-sysroot/usr/include/graphite2/Font.h +build/linux/debian_bullseye_i386-sysroot/usr/include/graphite2/Log.h +build/linux/debian_bullseye_i386-sysroot/usr/include/graphite2/Segment.h +build/linux/debian_bullseye_i386-sysroot/usr/include/graphite2/Types.h +build/linux/debian_bullseye_i386-sysroot/usr/include/gtk-3.0/gtk/deprecated/gtkactivatable.h +build/linux/debian_bullseye_i386-sysroot/usr/include/gtk-3.0/gtk/gtklinkbutton.h +build/linux/debian_bullseye_i386-sysroot/usr/include/gtk-3.0/gtk/gtkscrollable.h +build/linux/debian_bullseye_i386-sysroot/usr/include/gtk-3.0/gtk/gtksizerequest.h +build/linux/debian_bullseye_i386-sysroot/usr/include/gtk-3.0/gtk/gtkspinner.h +build/linux/debian_bullseye_i386-sysroot/usr/include/gtk-4.0/gtk/gtklinkbutton.h +build/linux/debian_bullseye_i386-sysroot/usr/include/gtk-4.0/gtk/gtkscrollable.h +build/linux/debian_bullseye_i386-sysroot/usr/include/gtk-4.0/gtk/gtksizerequest.h +build/linux/debian_bullseye_i386-sysroot/usr/include/gtk-4.0/gtk/gtkspinner.h +build/linux/debian_bullseye_i386-sysroot/usr/include/harfbuzz/hb-common.h +build/linux/debian_bullseye_i386-sysroot/usr/include/harfbuzz/hb-ot-layout.h +build/linux/debian_bullseye_i386-sysroot/usr/include/harfbuzz/hb-ot-math.h +build/linux/debian_bullseye_i386-sysroot/usr/include/harfbuzz/hb-ot-meta.h +build/linux/debian_bullseye_i386-sysroot/usr/include/harfbuzz/hb-ot-metrics.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/libavutil/audio_fifo.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/libavutil/display.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/libavutil/downmix_info.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/libavutil/hdr_dynamic_metadata.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/libavutil/mastering_display_metadata.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/libavutil/random_seed.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/libavutil/ripemd.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/libavutil/sha512.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/libavutil/spherical.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/libavutil/stereo3d.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/libavutil/timecode.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/qt5/QtCore/qcompilerdetection.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/qt5/QtCore/qregularexpression.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/qt5/QtCore/qstorageinfo.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/qt5/QtCore/qversionnumber.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/qt5/QtGui/qaccessible.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/qt5/QtNetwork/qsctpserver.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/qt5/QtNetwork/qsctpsocket.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/qt6/QtCore/qcompilerdetection.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/qt6/QtCore/qglobal.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/qt6/QtCore/qregularexpression.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/qt6/QtCore/qsimd.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/qt6/QtCore/qstorageinfo.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/qt6/QtCore/qversionnumber.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/qt6/QtGui/qaccessible_base.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/qt6/QtNetwork/qsctpserver.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/qt6/QtNetwork/qsctpsocket.h +build/linux/debian_bullseye_i386-sysroot/usr/include/i386-linux-gnu/qt6/QtNetwork/qsslserver.h +build/linux/debian_bullseye_i386-sysroot/usr/include/libdrm/drm_mode.h +build/linux/debian_bullseye_i386-sysroot/usr/include/libdrm/msm_drm.h +build/linux/debian_bullseye_i386-sysroot/usr/include/linux/am437x-vpfe.h +build/linux/debian_bullseye_i386-sysroot/usr/include/linux/amt.h +build/linux/debian_bullseye_i386-sysroot/usr/include/linux/bfs_fs.h +build/linux/debian_bullseye_i386-sysroot/usr/include/linux/cifs/cifs_mount.h +build/linux/debian_bullseye_i386-sysroot/usr/include/linux/cn_proc.h +build/linux/debian_bullseye_i386-sysroot/usr/include/linux/hyperv.h +build/linux/debian_bullseye_i386-sysroot/usr/include/linux/map_to_14segment.h +build/linux/debian_bullseye_i386-sysroot/usr/include/linux/map_to_7segment.h +build/linux/debian_bullseye_i386-sysroot/usr/include/linux/phantom.h +build/linux/debian_bullseye_i386-sysroot/usr/include/linux/rpl.h +build/linux/debian_bullseye_i386-sysroot/usr/include/linux/rpl_iptunnel.h +build/linux/debian_bullseye_i386-sysroot/usr/include/linux/surface_aggregator/cdev.h +build/linux/debian_bullseye_i386-sysroot/usr/include/linux/surface_aggregator/dtx.h +build/linux/debian_bullseye_i386-sysroot/usr/include/linux/toshiba.h +build/linux/debian_bullseye_i386-sysroot/usr/include/linux/uinput.h +build/linux/debian_bullseye_i386-sysroot/usr/include/linux/usb/tmc.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/nspr.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/obsolete/pralarm.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/obsolete/probslet.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/obsolete/protypes.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/obsolete/prsem.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/plarena.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/plarenas.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/plbase64.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/plerror.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/plgetopt.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/plhash.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/plstr.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/pratom.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prbit.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prclist.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prcmon.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prcountr.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prcpucfg.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prcvar.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prdtoa.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prenv.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prerr.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prerror.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prinet.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prinit.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prinrval.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prio.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/pripcsem.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/private/pprio.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/private/pprthred.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/private/prpriv.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prlink.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prlock.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prlog.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prlong.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prmem.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prmon.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prmwait.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prnetdb.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prolock.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prpdce.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prprf.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prproces.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prrng.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prrwlock.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prshm.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prshma.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prsystem.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prthread.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prtime.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prtpool.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prtrace.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prtypes.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prvrsion.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nspr/prwin16.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/base64.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/blapit.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/cert.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/certdb.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/certt.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/ciferfam.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/cmmf.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/cmmft.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/cms.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/cmsreclist.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/cmst.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/crmf.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/crmft.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/cryptohi.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/cryptoht.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/eccutil.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/ecl-exp.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/hasht.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/jar-ds.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/jar.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/jarfile.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/key.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/keyhi.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/keyt.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/keythi.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/lowkeyi.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/lowkeyti.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/nss.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/nssb64.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/nssb64t.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/nssbase.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/nssbaset.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/nssckbi.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/nssckepv.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/nssckft.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/nssckfw.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/nssckfwc.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/nssckfwt.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/nssckg.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/nssckmdt.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/nssckt.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/nssilckt.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/nssilock.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/nsslocks.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/nsslowhash.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/nssrwlk.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/nssrwlkt.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/nssutil.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/ocsp.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/ocspt.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/p12.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/p12plcy.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/p12t.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/pk11func.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/pk11hpke.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/pk11pqg.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/pk11priv.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/pk11pub.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/pk11sdr.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/pkcs11.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/pkcs11f.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/pkcs11n.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/pkcs11p.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/pkcs11t.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/pkcs11u.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/pkcs11uri.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/pkcs12.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/pkcs12t.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/pkcs1sig.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/pkcs7t.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/portreg.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/preenc.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/secasn1.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/secasn1t.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/seccomon.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/secder.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/secdert.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/secdig.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/secdigt.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/secerr.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/sechash.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/secitem.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/secmime.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/secmod.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/secmodt.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/secoid.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/secoidt.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/secpkcs5.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/secpkcs7.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/secport.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/shsign.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/smime.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/ssl.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/sslerr.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/sslexp.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/sslproto.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/sslt.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/utilmodt.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/utilpars.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/utilparst.h +build/linux/debian_bullseye_i386-sysroot/usr/include/nss/utilrename.h +build/linux/debian_bullseye_i386-sysroot/usr/include/openssl/e_os2.h +build/linux/debian_bullseye_i386-sysroot/usr/include/spa-0.2/spa/interfaces/audio/aec.h +build/linux/debian_bullseye_i386-sysroot/usr/include/thai/thailib.h +build/linux/debian_bullseye_i386-sysroot/usr/include/thai/thbrk.h +build/linux/debian_bullseye_i386-sysroot/usr/include/thai/thcell.h +build/linux/debian_bullseye_i386-sysroot/usr/include/thai/thcoll.h +build/linux/debian_bullseye_i386-sysroot/usr/include/thai/thctype.h +build/linux/debian_bullseye_i386-sysroot/usr/include/thai/thinp.h +build/linux/debian_bullseye_i386-sysroot/usr/include/thai/thrend.h +build/linux/debian_bullseye_i386-sysroot/usr/include/thai/thstr.h +build/linux/debian_bullseye_i386-sysroot/usr/include/thai/thwbrk.h +build/linux/debian_bullseye_i386-sysroot/usr/include/thai/thwchar.h +build/linux/debian_bullseye_i386-sysroot/usr/include/thai/thwcoll.h +build/linux/debian_bullseye_i386-sysroot/usr/include/thai/thwctype.h +build/linux/debian_bullseye_i386-sysroot/usr/include/thai/thwinp.h +build/linux/debian_bullseye_i386-sysroot/usr/include/thai/thwrend.h +build/linux/debian_bullseye_i386-sysroot/usr/include/thai/thwstr.h +build/linux/debian_bullseye_i386-sysroot/usr/include/thai/tis.h +build/linux/debian_bullseye_i386-sysroot/usr/include/thai/wtt.h +build/linux/debian_bullseye_i386-sysroot/usr/include/va/va_compat.h +build/linux/debian_bullseye_i386-sysroot/usr/include/va/va_dec_av1.h +build/linux/debian_bullseye_i386-sysroot/usr/include/va/va_enc_av1.h +build/linux/debian_bullseye_i386-sysroot/usr/include/va/va_prot.h +build/linux/debian_bullseye_i386-sysroot/usr/include/valgrind/drd.h +build/linux/debian_bullseye_i386-sysroot/usr/include/valgrind/helgrind.h +build/linux/debian_bullseye_i386-sysroot/usr/include/valgrind/vki/vki-linux-drm.h +build/linux/debian_bullseye_i386-sysroot/usr/include/valgrind/vki/vki-solaris-repcache.h +build/linux/debian_bullseye_i386-sysroot/usr/include/wayland-egl-backend.h +build/linux/debian_bullseye_i386-sysroot/usr/include/webp/decode.h +build/linux/debian_bullseye_i386-sysroot/usr/include/webp/encode.h +build/linux/debian_bullseye_i386-sysroot/usr/include/webp/mux.h +build/linux/debian_bullseye_i386-sysroot/usr/include/webp/mux_types.h +build/linux/debian_bullseye_i386-sysroot/usr/include/webp/types.h +build/linux/debian_bullseye_i386-sysroot/usr/include/xf86drmMode.h +build/linux/debian_bullseye_i386-sysroot/usr/libexec/valgrind/dh_view.js build/linux/install-chromeos-fonts.py -build/linux/sysroot_scripts/build_and_upload.py build/linux/sysroot_scripts/sysroots.json build/linux/unbundle/remove_bundled_libraries.py build/mac_toolchain.py @@ -480,6 +1100,7 @@ chrome/PRESUBMIT.py chrome/android/chrome_public_apk_tmpl.gni chrome/android/expectations/lint-baseline.xml chrome/android/expectations/lint-suppressions.xml +chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd chrome/android/java/res/values-sw600dp/values.xml chrome/android/java/res/values/dimens.xml chrome/android/java/res/values/strings.xml @@ -536,18 +1157,19 @@ chrome/browser/apps/almanac_api_client/almanac_api_util_unittest.cc chrome/browser/apps/almanac_api_client/almanac_icon_cache.cc chrome/browser/apps/almanac_api_client/device_info_manager.cc chrome/browser/apps/almanac_api_client/proto_file_manager_unittest.cc -chrome/browser/apps/app_deduplication_service/app_deduplication_server_connector.cc +chrome/browser/apps/app_deduplication_service/app_deduplication_almanac_endpoint.cc chrome/browser/apps/app_deduplication_service/app_deduplication_service_unittest.cc chrome/browser/apps/app_discovery_service/app_discovery_service_unittest.cc -chrome/browser/apps/app_discovery_service/launcher_app_almanac_connector.cc +chrome/browser/apps/app_discovery_service/launcher_app_almanac_endpoint.cc chrome/browser/apps/app_discovery_service/recommended_arc_app_fetcher_unittest.cc chrome/browser/apps/app_discovery_service/recommended_arc_apps/recommend_apps_fetcher_impl.cc chrome/browser/apps/app_discovery_service/recommended_arc_apps/recommend_apps_fetcher_impl_unittest.cc +chrome/browser/apps/app_preload_service/app_preload_almanac_endpoint.cc chrome/browser/apps/app_preload_service/app_preload_service_browsertest.cc chrome/browser/apps/app_preload_service/preload_app_definition_unittest.cc chrome/browser/apps/app_service/app_icon/app_icon_loader.cc -chrome/browser/apps/app_service/app_install/app_install_almanac_connector.cc -chrome/browser/apps/app_service/app_install/app_install_almanac_connector_unittest.cc +chrome/browser/apps/app_service/app_install/app_install_almanac_endpoint.cc +chrome/browser/apps/app_service/app_install/app_install_almanac_endpoint_unittest.cc chrome/browser/apps/app_service/app_install/app_install_service_ash.cc chrome/browser/apps/app_service/app_install/app_install_service_ash_browsertest.cc chrome/browser/apps/app_service/app_install/web_app_installer.cc @@ -591,10 +1213,10 @@ chrome/browser/ash/app_list/search/arc/recommend_apps_fetcher_impl.cc chrome/browser/ash/app_list/search/common/string_util.cc chrome/browser/ash/app_list/search/common/string_util_unittest.cc chrome/browser/ash/app_list/search/essential_search/essential_search_manager.h +chrome/browser/ash/app_list/search/essential_search/essential_search_manager_unittest.cc chrome/browser/ash/app_list/search/essential_search/socs_cookie_fetcher.cc chrome/browser/ash/app_list/search/essential_search/socs_cookie_fetcher_unittest.cc chrome/browser/ash/app_list/search/local_image_search/image_annotation_worker.cc -chrome/browser/ash/app_list/search/manatee/manatee_cache.cc chrome/browser/ash/app_list/search/omnibox/omnibox_lacros_provider_unittest.cc chrome/browser/ash/app_list/search/omnibox/omnibox_provider_unittest.cc chrome/browser/ash/app_list/search/omnibox/omnibox_util.cc @@ -629,6 +1251,7 @@ chrome/browser/ash/arc/session/arc_play_store_enabled_preference_handler_unittes chrome/browser/ash/arc/session/arc_session_manager_browsertest.cc chrome/browser/ash/arc/session/arc_session_manager_unittest.cc chrome/browser/ash/arc/tracing/arc_app_performance_tracing.cc +chrome/browser/ash/arc/tracing/overview_tracing_handler.cc chrome/browser/ash/assistant/assistant_util.cc chrome/browser/ash/assistant/assistant_util_unittest.cc chrome/browser/ash/attestation/attestation_ca_client.cc @@ -686,6 +1309,7 @@ chrome/browser/ash/file_suggest/item_suggest_cache.h chrome/browser/ash/file_suggest/item_suggest_cache_unittest.cc chrome/browser/ash/file_system_provider/fileapi/provider_async_file_util.h chrome/browser/ash/floating_workspace/floating_workspace_service_unittest.cc +chrome/browser/ash/growth/campaigns_manager_interactive_uitest.cc chrome/browser/ash/growth/install_web_app_action_unittest.cc chrome/browser/ash/growth/open_url_action_performer_unittest.cc chrome/browser/ash/hats/hats_dialog.cc @@ -731,6 +1355,7 @@ chrome/browser/ash/login/shill_profile_loading_browsertest.cc chrome/browser/ash/login/signin/device_id_browsertest.cc chrome/browser/ash/login/signin/oauth2_browsertest.cc chrome/browser/ash/login/test/logged_in_user_mixin.cc +chrome/browser/ash/login/test/logged_in_user_mixin.h chrome/browser/ash/login/test/login_manager_mixin.cc chrome/browser/ash/login/test/login_manager_mixin.h chrome/browser/ash/login/ui/captive_portal_view.cc @@ -877,6 +1502,7 @@ chrome/browser/chromeos/extensions/desk_api/desk_api_extension_manager.cc chrome/browser/chromeos/extensions/desk_api/desk_api_extension_manager.h chrome/browser/chromeos/extensions/odfs_config_private/odfs_config_private_api_unittest.cc chrome/browser/chromeos/extensions/telemetry/api/common/api_guard_delegate_unittest.cc +chrome/browser/chromeos/launcher_search/search_util.cc chrome/browser/chromeos/network/network_portal_signin_window_ash_browsertest.cc chrome/browser/chromeos/network/network_portal_signin_window_lacros_browsertest.cc chrome/browser/chromeos/platform_keys/extension_key_permissions_service.cc @@ -914,6 +1540,7 @@ chrome/browser/devtools/devtools_browsertest.cc chrome/browser/devtools/devtools_ui_bindings.cc chrome/browser/devtools/devtools_ui_bindings_unittest.cc chrome/browser/devtools/protocol/devtools_protocol_browsertest.cc +chrome/browser/devtools/protocol/devtools_pwa_browsertest.cc chrome/browser/devtools/url_constants.cc chrome/browser/dips/cookie_access_filter_unittest.cc chrome/browser/dips/dips_bounce_detector_browsertest.cc @@ -929,7 +1556,6 @@ chrome/browser/engagement/important_sites_util_browsertest.cc chrome/browser/engagement/important_sites_util_unittest.cc chrome/browser/engagement/site_engagement_service_unittest.cc chrome/browser/enterprise/browser_management/browser_management_service.cc -chrome/browser/enterprise/connectors/analysis/analysis_service_settings_unittest.cc chrome/browser/enterprise/connectors/analysis/content_analysis_delegate_browsertest.cc chrome/browser/enterprise/connectors/analysis/content_analysis_delegate_unittest.cc chrome/browser/enterprise/connectors/analysis/content_analysis_dialog_browsertest.cc @@ -949,11 +1575,13 @@ chrome/browser/enterprise/connectors/device_trust/signals/decorators/ash/ash_sig chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator_unittest.cc chrome/browser/enterprise/connectors/device_trust/test/test_constants.cc chrome/browser/enterprise/connectors/reporting/reporting_service_settings_unittest.cc -chrome/browser/enterprise/connectors/service_provider_config.cc -chrome/browser/enterprise/connectors/service_provider_config_unittest.cc -chrome/browser/enterprise/data_controls/rules_service_unittest.cc -chrome/browser/enterprise/data_protection/data_protection_clipboard_utils_browsertests.cc +chrome/browser/enterprise/connectors/test/deep_scanning_test_utils.cc +chrome/browser/enterprise/data_controls/chrome_rules_service_unittest.cc +chrome/browser/enterprise/data_controls/reporting_service_unittest.cc +chrome/browser/enterprise/data_protection/clipboard_browsertest.cc +chrome/browser/enterprise/data_protection/data_protection_clipboard_utils_browsertest.cc chrome/browser/enterprise/data_protection/data_protection_navigation_observer_unittest.cc +chrome/browser/enterprise/data_protection/paste_allowed_request_unittest.cc chrome/browser/enterprise/data_protection/print_utils_unittest.cc chrome/browser/enterprise/platform_auth/cloud_ap_provider_win.cc chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc @@ -1052,6 +1680,7 @@ chrome/browser/extensions/extension_loading_browsertest.cc chrome/browser/extensions/extension_override_apitest.cc chrome/browser/extensions/extension_prefs_unittest.cc chrome/browser/extensions/extension_service_sync_unittest.cc +chrome/browser/extensions/extension_service_test_base.cc chrome/browser/extensions/extension_service_unittest.cc chrome/browser/extensions/extension_sync_data_unittest.cc chrome/browser/extensions/extension_tab_util_browsertest.cc @@ -1094,6 +1723,7 @@ chrome/browser/favicon/favicon_utils_unittest.cc chrome/browser/feed/android/feed_reliability_logging_bridge.cc chrome/browser/feedback/android/family_info_feedback_source_unittest.cc chrome/browser/feedback/show_feedback_page.cc +chrome/browser/feedback/system_logs/log_sources/chrome_root_store_log_source.cc chrome/browser/feedback/system_logs/log_sources/crash_ids_source.cc chrome/browser/feedback/system_logs/log_sources/family_info_log_source_unittest.cc chrome/browser/file_system_access/cloud_identifier/cloud_identifier_util_ash.cc @@ -1135,8 +1765,6 @@ chrome/browser/lacros/lacros_url_handling_unittest.cc chrome/browser/lacros/net/network_settings_observer_browsertest.cc chrome/browser/lacros/net/network_settings_translation_unittest.cc chrome/browser/lacros/sync/crosapi_session_sync_favicon_delegate_unittest.cc -chrome/browser/lens/lens_overlay/lens_overlay_query_controller.cc -chrome/browser/lens/lens_overlay/lens_overlay_url_builder_unittest.cc chrome/browser/lifetime/switch_utils_unittest.cc chrome/browser/loader/keep_alive_url_browsertest.cc chrome/browser/local_discovery/service_discovery_client_mac.mm @@ -1174,6 +1802,7 @@ chrome/browser/metrics/chrome_metrics_service_client.cc chrome/browser/metrics/chrome_metrics_service_client_ash_unittest.cc chrome/browser/metrics/family_link_user_metrics_provider_unittest.cc chrome/browser/metrics/family_user_metrics_provider_browsertest.cc +chrome/browser/metrics/per_user_state_manager_chromeos_browsertest.cc chrome/browser/metrics/perf/perf_events_collector.cc chrome/browser/metrics/testing/sync_metrics_test_utils.cc chrome/browser/metrics/usage_scenario/tab_usage_scenario_tracker.cc @@ -1195,7 +1824,6 @@ chrome/browser/nearby_sharing/instantmessaging/constants.h chrome/browser/nearby_sharing/instantmessaging/stream_parser.cc chrome/browser/nearby_sharing/local_device_data/nearby_share_device_data_updater_impl_unittest.cc chrome/browser/nearby_sharing/local_device_data/nearby_share_local_device_data_manager_impl_unittest.cc -chrome/browser/nearby_sharing/nearby_connections_manager_impl_unittest.cc chrome/browser/nearby_sharing/nearby_notification_manager_unittest.cc chrome/browser/nearby_sharing/nearby_share_profile_info_provider_impl_unittest.cc chrome/browser/nearby_sharing/network_traversal_ice_config_fetcher.cc @@ -1253,6 +1881,7 @@ chrome/browser/optimization_guide/optimization_guide_keyed_service_browsertest.c chrome/browser/origin_trials/origin_trials_browsertest.cc chrome/browser/os_crypt/app_bound_encryption_win.cc chrome/browser/page_content_annotations/page_content_annotations_service_browsertest.cc +chrome/browser/page_image_service/android/image_service_bridge_unittest.cc chrome/browser/page_load_metrics/observers/core/amp_page_load_metrics_observer.h chrome/browser/page_load_metrics/observers/core/amp_page_load_metrics_observer_unittest.cc chrome/browser/page_load_metrics/observers/core/ukm_page_load_metrics_observer_unittest.cc @@ -1274,6 +1903,7 @@ chrome/browser/page_load_metrics/observers/security_state_page_load_metrics_obse chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_observer.cc chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_observer_unittest.cc chrome/browser/password_check/android/password_check_manager_unittest.cc +chrome/browser/password_manager/android/account_storage_notice/BUILD.gn chrome/browser/password_manager/android/android_backend_with_double_deletion_unittest.cc chrome/browser/password_manager/android/built_in_backend_to_android_backend_migrator_unittest.cc chrome/browser/password_manager/android/chromesync_status_code.h @@ -1304,6 +1934,7 @@ chrome/browser/permissions/chrome_permission_manager_unittest.cc chrome/browser/permissions/chrome_permission_request_manager_unittest.cc chrome/browser/permissions/notifications_engagement_service_unittest.cc chrome/browser/permissions/permission_context_base_permissions_policy_unittest.cc +chrome/browser/permissions/permission_element_origin_trial_browsertest.cc chrome/browser/permissions/permissions_security_model_interactive_uitest.cc chrome/browser/permissions/quiet_permission_prompt_model_android.cc chrome/browser/platform_util_win.cc @@ -1332,6 +1963,7 @@ chrome/browser/predictors/lcp_critical_path_predictor/lcp_critical_path_predicto chrome/browser/predictors/lcp_critical_path_predictor/prewarm_http_disk_cache_manager.cc chrome/browser/predictors/loading_data_collector_unittest.cc chrome/browser/predictors/loading_predictor_browsertest.cc +chrome/browser/predictors/loading_predictor_config.h chrome/browser/predictors/loading_predictor_unittest.cc chrome/browser/predictors/loading_stats_collector_unittest.cc chrome/browser/predictors/preconnect_manager_unittest.cc @@ -1353,6 +1985,7 @@ chrome/browser/preloading/preview/preview_navigation_throttle.h chrome/browser/preloading/preview/preview_zoom_controller.h chrome/browser/printing/print_preview_dialog_controller_unittest.cc chrome/browser/privacy/secure_dns_bridge.cc +chrome/browser/privacy_sandbox/privacy_sandbox_service.h chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc chrome/browser/privacy_sandbox/privacy_sandbox_service_impl_unittest.cc chrome/browser/private_network_access/private_network_device_chooser_controller_unittest.cc @@ -1379,6 +2012,8 @@ chrome/browser/push_messaging/push_messaging_notification_manager.h chrome/browser/push_messaging/push_messaging_notification_manager_unittest.cc chrome/browser/push_messaging/push_messaging_service_impl.cc chrome/browser/push_notification/server_client/push_notification_desktop_api_call_flow_impl_unittest.cc +chrome/browser/push_notification/server_client/push_notification_server_client_desktop_impl.cc +chrome/browser/push_notification/server_client/push_notification_server_client_desktop_impl_unittest.cc chrome/browser/reading_list/android/reading_list_manager_impl_unittest.cc chrome/browser/renderer_context_menu/link_to_text_menu_observer_interactive_uitest.cc chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc @@ -1416,10 +2051,12 @@ chrome/browser/resources/bookmarks/command_manager.ts chrome/browser/resources/browsing_topics/browsing_topics_internals.html chrome/browser/resources/chromeos/about_os_credits.html chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/macros/list_commands_macro.ts +chrome/browser/resources/chromeos/accessibility/accessibility_common/facegaze/camera_stream.html +chrome/browser/resources/chromeos/accessibility/accessibility_common/facegaze/mouse_controller.ts chrome/browser/resources/chromeos/accessibility/chromevox/background/background_test.js chrome/browser/resources/chromeos/accessibility/chromevox/background/braille/braille_input_handler_test.js chrome/browser/resources/chromeos/accessibility/chromevox/background/download_handler.js -chrome/browser/resources/chromeos/accessibility/chromevox/background/editing/editable_text_base_test.js +chrome/browser/resources/chromeos/accessibility/chromevox/background/editing/editable_text_test.js chrome/browser/resources/chromeos/accessibility/chromevox/background/input/command_handler.js chrome/browser/resources/chromeos/accessibility/chromevox/common/locale_output_helper_test.js chrome/browser/resources/chromeos/accessibility/chromevox/common/spannable_test.js @@ -1480,7 +2117,8 @@ chrome/browser/resources/gaia_auth_host/authenticator.js chrome/browser/resources/gaia_auth_host/password_change_authenticator.js chrome/browser/resources/gaia_auth_host/saml_handler.js chrome/browser/resources/gaia_auth_host/saml_password_attributes.js -chrome/browser/resources/hangout_services/manifest.json +chrome/browser/resources/hangout_services/manifest_v2.json +chrome/browser/resources/hangout_services/manifest_v3.json chrome/browser/resources/hats/hats.ts chrome/browser/resources/inspect/inspect.html chrome/browser/resources/internals/query_tiles/query_tiles_internals.html @@ -1525,6 +2163,7 @@ chrome/browser/resources/settings/incompatible_applications_page/incompatible_ap chrome/browser/resources/settings/languages_page/edit_dictionary_page.ts chrome/browser/resources/settings/settings_shared.css chrome/browser/resources/side_panel/read_anything/read_anything_toolbar.ts +chrome/browser/resources/side_panel/read_anything/voice_language_util.ts chrome/browser/resources/usb_internals/descriptor_panel.ts chrome/browser/resources/webstore_app/manifest.json chrome/browser/resources/webui_gallery/demos/card/card_demo.ts @@ -1640,6 +2279,7 @@ chrome/browser/ssl/stateful_ssl_host_state_delegate_test.cc chrome/browser/ssl/typed_navigation_upgrade_throttle_browsertest.cc chrome/browser/startup_data.h chrome/browser/storage/durable_storage_permission_context_unittest.cc +chrome/browser/storage_access_api/api_browsertest.cc chrome/browser/subresource_filter/subresource_filter_browsertest.cc chrome/browser/subresource_filter/subresource_filter_fenced_frame_browsertest.cc chrome/browser/supervised_user/android/java/res/drawable/ic_family_link.xml @@ -1664,6 +2304,7 @@ chrome/browser/sync/test/integration/single_client_history_sync_test.cc chrome/browser/sync/test/integration/single_client_preferences_sync_test.cc chrome/browser/sync/test/integration/single_client_send_tab_to_self_sync_test.cc chrome/browser/sync/test/integration/single_client_user_events_sync_test.cc +chrome/browser/sync/test/integration/single_client_wallet_credential_sync_test.cc chrome/browser/sync/test/integration/sync_auth_test.cc chrome/browser/sync/test/integration/sync_errors_test.cc chrome/browser/sync/test/integration/sync_service_impl_harness.cc @@ -1711,7 +2352,6 @@ chrome/browser/ui/ash/calendar/calendar_client_impl_unittest.cc chrome/browser/ui/ash/calendar/calendar_keyed_service.cc chrome/browser/ui/ash/calendar/calendar_keyed_service_unittest.cc chrome/browser/ui/ash/chrome_shell_delegate.cc -chrome/browser/ui/ash/container_app/container_app_interactive_uitest.cc chrome/browser/ui/ash/desks/desks_client_browsertest.cc chrome/browser/ui/ash/glanceables/glanceables_browsertest.cc chrome/browser/ui/ash/glanceables/glanceables_classroom_client_impl.cc @@ -1735,6 +2375,7 @@ chrome/browser/ui/ash/shelf/chrome_shelf_controller_unittest.cc chrome/browser/ui/ash/system_tray_client_impl.cc chrome/browser/ui/ash/system_tray_client_impl_browsertest.cc chrome/browser/ui/autofill/address_editor_controller_unittest.cc +chrome/browser/ui/autofill/autofill_bubble_signin_promo_controller_unittest.cc chrome/browser/ui/autofill/autofill_signin_promo_tab_helper_browsertest.cc chrome/browser/ui/autofill/delete_address_profile_dialog_controller_impl_unittest.cc chrome/browser/ui/autofill/payments/offer_notification_bubble_controller_impl_unittest.cc @@ -1747,6 +2388,7 @@ chrome/browser/ui/bookmarks/bookmark_ui_utils_desktop_unittest.cc chrome/browser/ui/browser_browsertest.cc chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc +chrome/browser/ui/browser_finder.h chrome/browser/ui/browser_finder_unittest.cc chrome/browser/ui/browser_focus_uitest.cc chrome/browser/ui/browser_instant_controller_unittest.cc @@ -1767,7 +2409,6 @@ chrome/browser/ui/cocoa/share_menu_controller_browsertest.mm chrome/browser/ui/commerce/price_tracking_page_action_controller.cc chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc -chrome/browser/ui/cookie_controls/cookie_controls_controller_unittest.cc chrome/browser/ui/crypto_module_password_dialog_nss.cc chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc chrome/browser/ui/extensions/controlled_home_bubble_delegate_unittest.cc @@ -1777,6 +2418,13 @@ chrome/browser/ui/extensions/installation_error_infobar_delegate.cc chrome/browser/ui/global_media_controls/presentation_request_notification_producer_unittest.cc chrome/browser/ui/hid/hid_chooser_controller_unittest.cc chrome/browser/ui/intent_picker_tab_helper_unittest.cc +chrome/browser/ui/lens/lens_overlay_controller_browsertest.cc +chrome/browser/ui/lens/lens_overlay_query_controller.cc +chrome/browser/ui/lens/lens_overlay_query_controller_unittest.cc +chrome/browser/ui/lens/lens_overlay_side_panel_coordinator.cc +chrome/browser/ui/lens/lens_overlay_side_panel_navigation_throttle_unittest.cc +chrome/browser/ui/lens/lens_overlay_url_builder_unittest.cc +chrome/browser/ui/lens/lens_untrusted_ui.cc chrome/browser/ui/login/http_auth_coordinator.h chrome/browser/ui/managed_ui.cc chrome/browser/ui/managed_ui_browsertest.cc @@ -1804,6 +2452,7 @@ chrome/browser/ui/search/ntp_user_data_logger_unittest.cc chrome/browser/ui/search/search_tab_helper.h chrome/browser/ui/search/third_party_ntp_browsertest.cc chrome/browser/ui/side_panel/companion/exps_registration_success_observer_unittest.cc +chrome/browser/ui/signin/cookie_clear_on_exit_migration_notice_browsertest.cc chrome/browser/ui/signin/signin_reauth_view_controller_browsertest.cc chrome/browser/ui/signin/signin_view_controller.cc chrome/browser/ui/signin/signin_view_controller_browsertest.cc @@ -1815,6 +2464,7 @@ chrome/browser/ui/startup/first_run_service_unittest.cc chrome/browser/ui/startup/launch_mode_recorder_unittest.cc chrome/browser/ui/startup/startup_browser_creator_browsertest.cc chrome/browser/ui/startup/startup_tab_provider_unittest.cc +chrome/browser/ui/tab_helpers.cc chrome/browser/ui/tab_helpers.h chrome/browser/ui/tab_sharing/tab_sharing_infobar_delegate_unittest.cc chrome/browser/ui/tabs/pinned_tab_codec_unittest.cc @@ -1905,9 +2555,11 @@ chrome/browser/ui/views/side_panel/search_companion/companion_page_browsertest.c chrome/browser/ui/views/side_panel/search_companion/companion_side_panel_controller.cc chrome/browser/ui/views/site_data/page_specific_site_data_dialog_unittest.cc chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc +chrome/browser/ui/views/tabs/tab_group_editor_bubble_view.cc chrome/browser/ui/views/tabs/tab_hover_card_controller_interactive_uitest.cc chrome/browser/ui/views/translate/translate_bubble_view_interactive_uitest.cc chrome/browser/ui/views/user_education/browser_user_education_service.cc +chrome/browser/ui/views/user_education/low_usage_promo.cc chrome/browser/ui/views/web_apps/force_installed_preinstalled_deprecated_app_dialog_view.cc chrome/browser/ui/views/web_apps/frame_toolbar/web_app_frame_toolbar_browsertest.cc chrome/browser/ui/views/webauthn/authenticator_request_bubble.cc @@ -1920,6 +2572,7 @@ chrome/browser/ui/web_applications/web_app_navigate_browsertest.cc chrome/browser/ui/web_applications/web_app_profile_deletion_browsertest.cc chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc +chrome/browser/ui/webauthn/authenticator_request_window.cc chrome/browser/ui/webauthn/sheet_models.cc chrome/browser/ui/webui/PRESUBMIT.py chrome/browser/ui/webui/access_code_cast/access_code_cast_handler_unittest.cc @@ -1929,7 +2582,6 @@ chrome/browser/ui/webui/app_management/app_management_page_handler_chromeos.cc chrome/browser/ui/webui/app_management/app_management_page_handler_unittest.cc chrome/browser/ui/webui/ash/add_supervision/add_supervision_ui.cc chrome/browser/ui/webui/ash/add_supervision/add_supervision_ui_browsertest.cc -chrome/browser/ui/webui/ash/arc_graphics_tracing/arc_graphics_tracing_handler.cc chrome/browser/ui/webui/ash/cloud_upload/cloud_upload_dialog.cc chrome/browser/ui/webui/ash/cloud_upload/cloud_upload_dialog_browsertest.cc chrome/browser/ui/webui/ash/cloud_upload/drive_upload_handler.cc @@ -1961,7 +2613,6 @@ chrome/browser/ui/webui/hats/hats_ui.cc chrome/browser/ui/webui/history/browsing_history_handler_unittest.cc chrome/browser/ui/webui/history_clusters/history_clusters_handler_unittest.cc chrome/browser/ui/webui/interstitials/interstitial_ui.cc -chrome/browser/ui/webui/lens/lens_untrusted_ui.cc chrome/browser/ui/webui/log_web_ui_url_unittest.cc chrome/browser/ui/webui/management/management_ui_handler_unittest.cc chrome/browser/ui/webui/media_router/cast_feedback_ui.cc @@ -2033,14 +2684,14 @@ chrome/browser/usb/usb_policy_allowed_devices_unittest.cc chrome/browser/usb/web_usb_detector_unittest.cc chrome/browser/user_notes/user_note_service_delegate_impl_unittest.cc chrome/browser/user_notes/user_notes_tab_helper_unittest.cc +chrome/browser/visited_url_ranking/desktop_tab_model_url_visit_data_fetcher_unittest.cc chrome/browser/vr/PRESUBMIT.py chrome/browser/vr/test/gl_test_environment_unittest.cc chrome/browser/wallet/android/boarding_pass_detector_unittest.cc chrome/browser/web_applications/chromeos_web_app_experiments_browsertest.cc chrome/browser/web_applications/commands/fetch_manifest_and_install_command.cc -chrome/browser/web_applications/commands/install_preloaded_verified_app_command.cc -chrome/browser/web_applications/commands/install_preloaded_verified_app_command_browsertest.cc -chrome/browser/web_applications/extensions/bookmark_app_util_unittest.cc +chrome/browser/web_applications/commands/install_app_from_verified_manifest_command.cc +chrome/browser/web_applications/commands/install_app_from_verified_manifest_command_browsertest.cc chrome/browser/web_applications/isolated_web_apps/isolated_web_app_downloader.cc chrome/browser/web_applications/isolated_web_apps/isolated_web_app_source_unittest.cc chrome/browser/web_applications/isolated_web_apps/isolated_web_app_update_manager.h @@ -2049,7 +2700,6 @@ chrome/browser/web_applications/os_integration/web_app_handler_registration_util chrome/browser/web_applications/os_integration/web_app_handler_registration_utils_win.h chrome/browser/web_applications/os_integration/web_app_handler_registration_utils_win_unittest.cc chrome/browser/web_applications/preinstalled_web_app_manager_unittest.cc -chrome/browser/web_applications/preinstalled_web_app_window_experiment_browsertest.cc chrome/browser/web_applications/preinstalled_web_apps/gmail.cc chrome/browser/web_applications/preinstalled_web_apps/google_calendar.cc chrome/browser/web_applications/preinstalled_web_apps/google_chat.cc @@ -2066,10 +2716,10 @@ chrome/browser/web_applications/web_app_helpers_unittest.cc chrome/browser/web_applications/web_app_id_constants.h chrome/browser/web_applications/web_app_install_utils_unittest.cc chrome/browser/web_applications/web_app_provider.cc -chrome/browser/web_applications/web_app_registrar_unittest.cc chrome/browser/web_applications/web_contents/web_app_icon_downloader_unittest.cc chrome/browser/webapps/installable/installable_manager_browsertest.cc chrome/browser/webauthn/authenticator_request_dialog_model.cc +chrome/browser/webauthn/authenticator_request_dialog_model.h chrome/browser/webauthn/cablev2_devices.h chrome/browser/webauthn/chrome_authenticator_request_delegate.cc chrome/browser/webauthn/chrome_authenticator_request_delegate_unittest.cc @@ -2087,6 +2737,7 @@ chrome/browser/win/conflicts/installed_applications.cc chrome/browser/win/jumplist.cc chrome/browser/win/jumplist_update_util_unittest.cc chrome/browser/win/parental_controls.cc +chrome/browser/window_management/window_management_browsertest.cc chrome/chrome_elf/chrome_elf_main.cc chrome/chrome_elf/nt_registry/nt_registry.cc chrome/chrome_elf/nt_registry/nt_registry.h @@ -2272,7 +2923,6 @@ chrome/services/file_util/public/cpp/sandboxed_document_analyzer_unittest.cc chrome/services/mac_notifications/mac_notification_service_ns.mm chrome/services/mac_notifications/mac_notification_service_ns_unittest.mm chrome/services/mac_notifications/mac_notification_service_un_unittest.mm -chrome/services/sharing/nearby/nearby_connections_unittest.cc chrome/services/sharing/nearby/nearby_presence_unittest.cc chrome/services/sharing/nearby/quick_start_decoder/quick_start_decoder_unittest.cc chrome/services/util_win/av_products.cc @@ -2316,7 +2966,6 @@ chrome/test/enterprise/e2e/policy/allow_deleting_browser_history/allow_deleting_ chrome/test/enterprise/e2e/policy/allow_deleting_browser_history/allow_deleting_browser_history_webdriver_test.py chrome/test/enterprise/e2e/policy/apps_shortcut/apps_shortcut.py chrome/test/enterprise/e2e/policy/bookmarkbar_enabled/bookmarkbar_enabled.py -chrome/test/enterprise/e2e/policy/cbcm_enroll.py chrome/test/enterprise/e2e/policy/cloud_management_enrollment_token/cloud_management_enrollment_token.py chrome/test/enterprise/e2e/policy/default_search_provider/default_search_provider.py chrome/test/enterprise/e2e/policy/encrypted_reporting/report_cbcm_events.py @@ -2415,6 +3064,8 @@ chromecast/net/connectivity_checker_impl.h chromecast/net/net_switches.cc chromecast/public/bluetooth/gatt.h chromecast/public/output_restrictions.h +chromecast/starboard/media/cdm/starboard_decryptor_cast.cc +chromecast/starboard/media/cdm/starboard_decryptor_cast_test.cc chromeos/BUILD.gn chromeos/ash/components/attestation/attestation_flow_adaptive_unittest.cc chromeos/ash/components/attestation/attestation_flow_integrated_unittest.cc @@ -2435,6 +3086,9 @@ chromeos/ash/components/dbus/dlcservice/dlcservice_client.h chromeos/ash/components/dbus/rmad/fake_rmad_client.cc chromeos/ash/components/dbus/shill/shill_manager_client.h chromeos/ash/components/drivefs/drivefs_http_client_unittest.cc +chromeos/ash/components/file_manager/indexing/file_index_service_registry_unittest.cc +chromeos/ash/components/fwupd/firmware_update_manager.cc +chromeos/ash/components/fwupd/firmware_update_manager_unittest.cc chromeos/ash/components/geolocation/simple_geolocation_provider.h chromeos/ash/components/growth/campaigns_manager_unittest.cc chromeos/ash/components/growth/campaigns_model.h @@ -2443,12 +3097,9 @@ chromeos/ash/components/login/auth/recovery/service_constants.cc chromeos/ash/components/multidevice/remote_device_test_util.cc chromeos/ash/components/multidevice/stub_multidevice_util.cc chromeos/ash/components/nearby/common/client/nearby_api_call_flow_impl_unittest.cc -chromeos/ash/components/nearby/presence/conversions/proto_conversions_unittest.cc chromeos/ash/components/nearby/presence/credentials/local_device_data_provider_impl_unittest.cc -chromeos/ash/components/nearby/presence/credentials/nearby_presence_credential_manager_impl_unittest.cc chromeos/ash/components/nearby/presence/credentials/nearby_presence_server_client_impl.cc chromeos/ash/components/nearby/presence/credentials/nearby_presence_server_client_impl_unittest.cc -chromeos/ash/components/nearby/presence/nearby_presence_service_impl_unittest.cc chromeos/ash/components/network/geolocation_handler.cc chromeos/ash/components/network/network_cert_loader.cc chromeos/ash/components/network/network_util.h @@ -2467,6 +3118,7 @@ chromeos/ash/components/report/utils/network_utils_unittest.cc chromeos/ash/components/standalone_browser/lacros_availability.cc chromeos/ash/components/standalone_browser/lacros_availability.h chromeos/ash/components/standalone_browser/lacros_availability_unittest.cc +chromeos/ash/components/standalone_browser/lacros_selection_unittest.cc chromeos/ash/components/string_matching/tokenized_string_unittest.cc chromeos/ash/components/timezone/timezone_request.cc chromeos/ash/components/tpm/tpm_token_info_getter_unittest.cc @@ -2484,6 +3136,7 @@ chromeos/ash/services/device_sync/remote_device_provider_impl_unittest.cc chromeos/ash/services/device_sync/remote_device_v2_loader_impl_unittest.cc chromeos/ash/services/device_sync/switches.cc chromeos/ash/services/ime/constants.cc +chromeos/ash/services/ime/input_method_user_data_service_impl_unittest.cc chromeos/ash/services/ime/public/mojom/mojom_traits.cc chromeos/ash/services/libassistant/public/cpp/assistant_suggestion.h chromeos/ash/services/quick_pair/fast_pair_data_parser.cc @@ -2529,7 +3182,6 @@ components/affiliations/core/browser/hash_affiliation_fetcher.cc components/affiliations/core/browser/hash_affiliation_fetcher_unittest.cc components/aggregation_service/aggregation_coordinator_utils.h components/android_autofill/PRESUBMIT.py -components/android_autofill/browser/android_autofill_features.cc components/android_system_error_page/error_page_populator.cc components/app_restore/app_restore_info_unittest.cc components/arc/common/intent_helper/link_handler_model_unittest.cc @@ -2581,6 +3233,7 @@ components/autofill/core/browser/payments/payments_service_url_unittest.cc components/autofill/core/browser/payments_data_manager_unittest.cc components/autofill/core/browser/ui/autofill_image_fetcher.cc components/autofill/core/browser/webdata/addresses/autofill_profile_sync_bridge.h +components/autofill/core/browser/webdata/payments/autofill_wallet_sync_bridge.h components/autofill/core/browser/webdata/payments/autofill_wallet_sync_bridge_unittest.cc components/autofill/core/browser/webdata/payments/autofill_wallet_usage_data_sync_bridge_unittest.cc components/autofill/core/browser/webdata/payments/payments_autofill_table.h @@ -2667,6 +3320,8 @@ components/cronet/tools/cr_cronet.py components/cronet/tools/generate_javadoc.py components/cronet/tools/utils.py components/custom_handlers/protocol_handler_registry_unittest.cc +components/data_sharing/internal/data_sharing_service_impl_unittest.cc +components/data_sharing/internal/group_data_proto_utils_unittest.cc components/desks_storage/core/admin_template_service_unittests.cc components/desks_storage/core/desk_model_wrapper_unittests.cc components/desks_storage/core/desk_sync_bridge_unittest.cc @@ -2694,6 +3349,8 @@ components/drive/service/drive_api_service.cc components/drive/service/fake_drive_service.cc components/embedder_support/android/BUILD.gn components/endpoint_fetcher/endpoint_fetcher_unittest.cc +components/enterprise/connectors/service_provider_config.cc +components/enterprise/connectors/service_provider_config_unittest.cc components/enterprise/data_controls/attributes_condition_unittest.cc components/enterprise/data_controls/data_controls_policy_handler_unittest.cc components/enterprise/data_controls/rule_unittest.cc @@ -2736,6 +3393,7 @@ components/gcm_driver/gcm_account_mapper_unittest.cc components/gcm_driver/gcm_client_impl.cc components/gcm_driver/gcm_client_impl_unittest.cc components/global_media_controls/public/media_session_notification_item_unittest.cc +components/global_media_controls/public/views/chapter_item_view_unittest.cc components/global_media_controls/public/views/media_item_ui_detailed_view_unittest.cc components/google/core/common/google_util.cc components/google/core/common/google_util_unittest.cc @@ -2806,6 +3464,8 @@ components/manta/base_provider_test_helper.cc components/manta/manta_service_callbacks.cc components/manta/orca_provider.cc components/manta/orca_provider_unittest.cc +components/manta/sparky/sparky_provider.cc +components/manta/sparky/sparky_provider_unittest.cc components/media_router/browser/android/flinging_controller_bridge.cc components/media_router/browser/media_router_dialog_controller_unittest.cc components/media_router/browser/media_router_metrics_unittest.cc @@ -2917,6 +3577,8 @@ components/optimization_guide/core/hints_manager_unittest.cc components/optimization_guide/core/model_execution/model_execution_fetcher.cc components/optimization_guide/core/model_execution/model_execution_fetcher_unittest.cc components/optimization_guide/core/model_execution/model_execution_manager_unittest.cc +components/optimization_guide/core/model_execution/on_device_model_adaptation_loader.cc +components/optimization_guide/core/model_execution/on_device_model_adaptation_loader_unittest.cc components/optimization_guide/core/model_execution/on_device_model_service_controller_unittest.cc components/optimization_guide/core/model_handler_unittest.cc components/optimization_guide/core/model_quality/model_quality_logs_uploader_service.cc @@ -3071,8 +3733,6 @@ components/performance_manager/graph/frame_node_impl.cc components/performance_manager/public/graph/frame_node.h components/performance_manager/public/graph/process_node.h components/performance_manager/public/graph/worker_node.h -components/performance_manager/resource_attribution/cpu_measurement_monitor.cc -components/performance_manager/resource_attribution/memory_measurement_provider.cc components/permissions/android/permissions_android_strings.grd components/permissions/constants.cc components/permissions/object_permission_context_base_unittest.cc @@ -3249,7 +3909,6 @@ components/proxy_config/proxy_policy_handler_unittest.cc components/query_tiles/test/fake_tile_service.cc components/quirks/quirks_client.cc components/reading_list/core/offline_url_utils_unittest.cc -components/remote_cocoa/app_shim/select_file_dialog_bridge.mm components/reporting/PRESUBMIT.py components/reporting/storage/storage_queue_unittest.cc components/resources/PRESUBMIT.py @@ -3345,6 +4004,7 @@ components/safe_search_api/safe_search_util_unittest.cc components/safe_search_api/stub_url_checker.cc components/safety_check/update_check_helper.h components/safety_check/url_constants.cc +components/saved_tab_groups/android/tab_group_sync_service_android_unittest.cc components/saved_tab_groups/saved_tab_group_sync_bridge_unittest.cc components/saved_tab_groups/saved_tab_group_test_utils.cc components/saved_tab_groups/saved_tab_group_unittest.cc @@ -3357,6 +4017,7 @@ components/search_engines/keyword_table_unittest.cc components/search_engines/template_url.cc components/search_engines/template_url_data_unittest.cc components/search_engines/template_url_prepopulate_data_unittest.cc +components/search_engines/template_url_service_unittest.cc components/search_engines/template_url_starter_pack_data.cc components/search_engines/template_url_unittest.cc components/search_engines/util.cc @@ -3378,7 +4039,6 @@ components/security_state/core/security_state.h components/segmentation_platform/internal/execution/optimization_guide/optimization_guide_segmentation_model_provider.cc components/segmentation_platform/internal/execution/optimization_guide/optimization_guide_segmentation_model_provider_unittest.cc components/segmentation_platform/internal/execution/optimization_guide/segmentation_model_executor_unittest.cc -components/segmentation_platform/internal/execution/processing/uma_feature_processor.h components/segmentation_platform/internal/proto/PRESUBMIT.py components/send_tab_to_self/send_tab_to_self_bridge_unittest.cc components/send_tab_to_self/target_device_info_unittest.cc @@ -3424,6 +4084,7 @@ components/signin/core/browser/dice_account_reconcilor_delegate_unittest.cc components/signin/core/browser/mirror_landing_account_reconcilor_delegate_unittest.cc components/signin/core/browser/resources/signin_internals.js components/signin/core/browser/signin_header_helper_unittest.cc +components/signin/core/browser/signin_metrics_service_unittests.cc components/signin/internal/identity_manager/account_capabilities_fetcher_unittest.cc components/signin/internal/identity_manager/account_tracker_service_unittest.cc components/signin/internal/identity_manager/gaia_cookie_manager_service.cc @@ -3450,6 +4111,7 @@ components/signin/public/identity_manager/diagnostics_provider_unittest.cc components/signin/public/identity_manager/identity_manager.h components/signin/public/identity_manager/identity_manager_unittest.cc components/signin/public/identity_manager/identity_test_environment.h +components/signin/public/identity_manager/identity_test_environment_unittest.cc components/signin/public/identity_manager/identity_test_utils.cc components/signin/public/identity_manager/identity_utils_unittest.cc components/signin/public/identity_manager/primary_account_access_token_fetcher_unittest.cc @@ -3502,7 +4164,7 @@ components/sync_preferences/pref_service_syncable_unittest.cc components/sync_sessions/PRESUBMIT.py components/sync_sessions/session_sync_bridge.h components/system_cpu/cpu_probe_win.cc -components/tpcd/metadata/parser_unittest.cc +components/tpcd/metadata/browser/parser_unittest.cc components/tracing/common/etw_system_data_source_win.cc components/tracing/common/graphics_memory_dump_provider_android.h components/translate/core/browser/translate_language_list_unittest.cc @@ -3562,21 +4224,30 @@ components/variations/service/safe_seed_manager.h components/variations/variations_murmur_hash.h components/variations/variations_seed_processor.cc components/variations/variations_url_constants.cc +components/visited_url_ranking/internal/history_url_visit_data_fetcher_unittest.cc +components/visited_url_ranking/internal/session_url_visit_data_fetcher_unittest.cc +components/visited_url_ranking/internal/transformer/default_app_url_visit_aggregates_transformer_unittest.cc +components/visited_url_ranking/internal/transformer/transformer_test_support.h +components/visited_url_ranking/internal/url_visit_util.h +components/visited_url_ranking/internal/visited_url_ranking_service_impl_unittest.cc components/visitedlink/test/visitedlink_perftest.cc components/visitedlink/test/visitedlink_unittest.cc components/viz/client/frame_eviction_manager.cc components/viz/common/features.h components/viz/common/quads/render_pass_io_unittest.cc +components/viz/common/resources/shared_image_format.h components/viz/common/switches.cc components/viz/service/display/output_surface.h components/viz/service/display/overlay_candidate.h components/viz/service/display/overlay_processor_using_strategy.cc components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc components/viz/service/display_embedder/skia_render_copy_results.cc +components/viz/test/test_context_provider.cc components/webapps/browser/android/add_to_homescreen_data_fetcher_unittest.cc components/webapps/browser/android/java/res/values/dimens.xml components/webapps/browser/android/shortcut_info.cc -components/webapps/browser/android/webapk/webapk_icon_hasher_unittest.cc +components/webapps/browser/android/webapk/webapk_icons_hasher_unittest.cc +components/webapps/browser/android/webapk/webapk_single_icon_hasher_unittest.cc components/webapps/browser/banners/app_banner_settings_helper_unittest.cc components/webapps/browser/installable/installable_evaluator_unittest.cc components/webdata/common/PRESUBMIT.py @@ -3718,7 +4389,6 @@ content/browser/renderer_host/render_widget_host_delegate.h content/browser/renderer_host/render_widget_host_impl.h content/browser/renderer_host/render_widget_host_input_event_router.cc content/browser/renderer_host/render_widget_host_view_aura.h -content/browser/renderer_host/render_widget_host_view_input.h content/browser/renderer_host/should_swap_browsing_instance.h content/browser/renderer_host/text_input_client_mac.h content/browser/renderer_host/virtual_keyboard_controller_win.h @@ -3728,9 +4398,9 @@ content/browser/resources/traces_internals/icons.html content/browser/sandbox_ipc_linux.h content/browser/screen_orientation/screen_orientation_provider_unittest.cc content/browser/serial/serial_unittest.cc -content/browser/service_worker/service_worker_container_host.cc content/browser/service_worker/service_worker_hid_delegate_observer_unittest.cc content/browser/service_worker/service_worker_main_resource_loader.h +content/browser/service_worker/service_worker_security_utils.cc content/browser/service_worker/service_worker_usb_delegate_observer_unittest.cc content/browser/service_worker/service_worker_version_browsertest.cc content/browser/session_history_browsertest.cc @@ -3771,6 +4441,7 @@ content/browser/zygote_host/zygote_host_impl_linux.cc content/child/runtime_features.cc content/common/features.cc content/common/input/render_input_router.h +content/common/input/render_widget_host_view_input.h content/common/input/touch_action_filter.h content/common/service_worker/race_network_request_url_loader_client.cc content/common/zygote/zygote_communication_linux.h @@ -4101,13 +4772,16 @@ gpu/command_buffer/service/shared_image/dcomp_image_backing_factory.cc gpu/command_buffer/service/shared_image/dcomp_surface_image_backing.cc gpu/command_buffer/service/shared_image/dxgi_swap_chain_image_representation.cc gpu/command_buffer/service/shared_image/ozone_image_backing_factory.cc +gpu/command_buffer/service/shared_image/shared_image_factory.cc gpu/command_buffer/service/shared_image/video_image_reader_image_backing.cc +gpu/command_buffer/service/shared_image_interface_in_process.cc gpu/command_buffer/service/surface_texture_gl_owner.cc gpu/config/PRESUBMIT.py gpu/config/gpu_control_list_format.txt gpu/config/gpu_finch_features.cc gpu/config/gpu_info_collector_win.cc gpu/config/gpu_switches.cc +gpu/ipc/client/shared_image_interface_proxy.cc gpu/ipc/common/PRESUBMIT.py gpu/ipc/common/gpu_memory_buffer_impl_test_template.h gpu/ipc/service/gpu_memory_buffer_factory_dxgi.cc @@ -4194,6 +4868,7 @@ ios/chrome/browser/ui/authentication/signin/add_account_signin/add_account_signi ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_mediator_unittest.mm ios/chrome/browser/ui/authentication/signin/signin_utils_unittest.mm ios/chrome/browser/ui/authentication/signin_earl_grey_ui_test_util.mm +ios/chrome/browser/ui/autofill/authentication/authentication_egtest_util.mm ios/chrome/browser/ui/autofill/authentication/card_unmask_authentication_egtest.mm ios/chrome/browser/ui/autofill/cells/target_account_item_unittest.mm ios/chrome/browser/ui/autofill/manual_fill/form_observer_helper_unittest.mm @@ -4382,6 +5057,7 @@ media/base/win/mf_helpers.h media/base/win/mf_initializer.cc media/capture/content/smooth_event_sampler_unittest.cc media/capture/video/android/video_capture_device_android.h +media/capture/video/apple/video_capture_device_avfoundation.mm media/capture/video/chromeos/camera_3a_controller.cc media/capture/video/chromeos/camera_3a_controller.h media/capture/video/chromeos/camera_device_delegate.cc @@ -4775,6 +5451,7 @@ net/quic/quic_network_transaction_unittest.cc net/quic/quic_proxy_client_socket_test_base.h net/quic/quic_session_pool.cc net/quic/quic_session_pool_test.cc +net/quic/quic_test_packet_maker.h net/server/web_socket.h net/socket/socket_options.h net/socket/socket_test_util.cc @@ -4897,8 +5574,6 @@ printing/metafile_skia.cc printing/print_settings_initializer_win.cc printing/printing_context.h printing/test/PRESUBMIT.py -remoting/android/java/res/layout/host_offline.xml -remoting/android/java/res/layout/host_online.xml remoting/base/corp_auth_util.cc remoting/base/is_google_email.cc remoting/base/service_urls.cc @@ -5073,6 +5748,7 @@ services/webnn/dml/adapter.h services/webnn/dml/context_impl.cc services/webnn/dml/graph_builder.h services/webnn/dml/graph_impl.cc +services/webnn/dml/graph_impl.h services/webnn/dml/tensor_desc.cc services/webnn/dml/utils.cc services/webnn/webnn_graph_impl_backend_test.cc @@ -5237,11 +5913,8 @@ third_party/android_deps/libs/com_google_android_gms_play_services_iid/3pp/fetch third_party/android_deps/libs/com_google_android_gms_play_services_instantapps/3pp/fetch.py third_party/android_deps/libs/com_google_android_gms_play_services_location/3pp/fetch.py third_party/android_deps/libs/com_google_android_gms_play_services_phenotype/3pp/fetch.py -third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport/3pp/fetch.py third_party/android_deps/libs/com_google_android_gms_play_services_stats/3pp/fetch.py third_party/android_deps/libs/com_google_android_gms_play_services_tasks/3pp/fetch.py -third_party/android_deps/libs/com_google_android_gms_play_services_tflite_impl/3pp/fetch.py -third_party/android_deps/libs/com_google_android_gms_play_services_tflite_java/3pp/fetch.py third_party/android_deps/libs/com_google_android_gms_play_services_vision/3pp/fetch.py third_party/android_deps/libs/com_google_android_gms_play_services_vision_common/3pp/fetch.py third_party/android_deps/libs/com_google_android_material_material/3pp/fetch.py @@ -5313,6 +5986,7 @@ third_party/angle/extensions/EGL_ANGLE_global_fence_sync.txt third_party/angle/extensions/EGL_ANGLE_iosurface_client_buffer.txt third_party/angle/extensions/EGL_ANGLE_keyed_mutex.txt third_party/angle/extensions/EGL_ANGLE_metal_texture_client_buffer.txt +third_party/angle/extensions/EGL_ANGLE_no_error.txt third_party/angle/extensions/EGL_ANGLE_platform_angle_d3d_luid.txt third_party/angle/extensions/EGL_ANGLE_platform_angle_device_id.txt third_party/angle/extensions/EGL_ANGLE_power_preference.txt @@ -5667,11 +6341,21 @@ third_party/blink/renderer/core/css/element_rule_collector_test.cc third_party/blink/renderer/core/css/invalidation/pending_invalidations.h third_party/blink/renderer/core/css/invalidation/style_invalidator.h third_party/blink/renderer/core/css/parser/css_selector_parser.cc +third_party/blink/renderer/core/css/perftest_data/ecommerce.json +third_party/blink/renderer/core/css/perftest_data/encyclopedia.json +third_party/blink/renderer/core/css/perftest_data/extension.json +third_party/blink/renderer/core/css/perftest_data/news.json +third_party/blink/renderer/core/css/perftest_data/search.json +third_party/blink/renderer/core/css/perftest_data/social1.json +third_party/blink/renderer/core/css/perftest_data/social2.json +third_party/blink/renderer/core/css/perftest_data/sports.json +third_party/blink/renderer/core/css/perftest_data/video.json third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc third_party/blink/renderer/core/css/remote_font_face_source.cc third_party/blink/renderer/core/css/resolver/style_adjuster.cc third_party/blink/renderer/core/css/rule_feature_set.cc third_party/blink/renderer/core/css/selector_checker.cc +third_party/blink/renderer/core/css/selector_query.cc third_party/blink/renderer/core/css/style_engine.cc third_party/blink/renderer/core/css/style_engine_test.cc third_party/blink/renderer/core/css/style_rule_import.cc @@ -5754,6 +6438,7 @@ third_party/blink/renderer/core/events/ui_event_with_key_state.h third_party/blink/renderer/core/events/wheel_event.cc third_party/blink/renderer/core/events/wheel_event.h third_party/blink/renderer/core/events/wheel_event.idl +third_party/blink/renderer/core/execution_context/execution_context.h third_party/blink/renderer/core/execution_context/navigator_base.cc third_party/blink/renderer/core/exported/web_plugin_container_impl.cc third_party/blink/renderer/core/exported/web_searchable_form_data.cc @@ -5962,6 +6647,8 @@ third_party/blink/renderer/core/svg/svg_path_element.idl third_party/blink/renderer/core/svg/svg_point.idl third_party/blink/renderer/core/svg/svg_rect.idl third_party/blink/renderer/core/svg/svg_rect_element.idl +third_party/blink/renderer/core/svg/svg_resource_document_cache.cc +third_party/blink/renderer/core/svg/svg_resource_document_cache.h third_party/blink/renderer/core/svg/svg_resource_document_content.cc third_party/blink/renderer/core/svg/svg_resource_document_content.h third_party/blink/renderer/core/svg/svg_style_element.idl @@ -5978,6 +6665,7 @@ third_party/blink/renderer/core/timing/performance.idl third_party/blink/renderer/core/timing/performance_entry.h third_party/blink/renderer/core/timing/performance_resource_timing.h third_party/blink/renderer/core/timing/responsiveness_metrics.cc +third_party/blink/renderer/core/timing/third_party_script_detector.cc third_party/blink/renderer/core/timing/window_performance.cc third_party/blink/renderer/core/timing/window_performance_test.cc third_party/blink/renderer/core/trustedtypes/generate_eventhandler_names.py @@ -6046,7 +6734,6 @@ third_party/blink/renderer/platform/PRESUBMIT.py third_party/blink/renderer/platform/animation/timing_function.h third_party/blink/renderer/platform/bindings/script_regexp.cc third_party/blink/renderer/platform/exported/web_crypto_algorithm.cc -third_party/blink/renderer/platform/exported/web_url_response.cc third_party/blink/renderer/platform/fonts/bitmap_glyphs_block_list.cc third_party/blink/renderer/platform/fonts/font_custom_platform_data.cc third_party/blink/renderer/platform/fonts/font_description.cc @@ -6126,7 +6813,9 @@ third_party/blink/renderer/platform/network/network_utils_test.cc third_party/blink/renderer/platform/network/parsed_content_header_field_parameters.h third_party/blink/renderer/platform/peerconnection/rtc_video_decoder_factory.cc third_party/blink/renderer/platform/peerconnection/rtc_video_encoder.cc +third_party/blink/renderer/platform/peerconnection/webrtc_video_track_source.cc third_party/blink/renderer/platform/scheduler/main_thread/main_thread_task_queue.h +third_party/blink/renderer/platform/scheduler/main_thread/memory_purge_manager.cc third_party/blink/renderer/platform/scheduler/main_thread/memory_purge_manager.h third_party/blink/renderer/platform/scheduler/public/rail_mode_observer.h third_party/blink/renderer/platform/testing/image_decode_to_nia.cc @@ -6394,6 +7083,9 @@ third_party/catapult/dashboard/dashboard/pinpoint/elements/jobs-page/new-job-fab third_party/catapult/dashboard/dashboard/pinpoint/elements/navigation-bar-test.html third_party/catapult/dashboard/dashboard/pinpoint/elements/navigation-bar.html third_party/catapult/dashboard/dashboard/pinpoint/elements/results2-frame.html +third_party/catapult/dashboard/dashboard/pinpoint/handlers/job.py +third_party/catapult/dashboard/dashboard/pinpoint/handlers/job_test.py +third_party/catapult/dashboard/dashboard/pinpoint/handlers/new.py third_party/catapult/dashboard/dashboard/pinpoint/handlers/new_test.py third_party/catapult/dashboard/dashboard/pinpoint/index/index.html third_party/catapult/dashboard/dashboard/pinpoint/models/change/change_test.py @@ -7821,6 +8513,7 @@ third_party/dawn/src/dawn/native/d3d11/BufferD3D11.cpp third_party/dawn/src/dawn/native/d3d11/DeviceInfoD3D11.cpp third_party/dawn/src/dawn/native/d3d11/PhysicalDeviceD3D11.cpp third_party/dawn/src/dawn/native/d3d11/PipelineLayoutD3D11.cpp +third_party/dawn/src/dawn/native/d3d11/QueueD3D11.cpp third_party/dawn/src/dawn/native/d3d11/SamplerD3D11.cpp third_party/dawn/src/dawn/native/d3d11/SwapChainD3D11.cpp third_party/dawn/src/dawn/native/d3d11/TextureD3D11.cpp @@ -7845,7 +8538,6 @@ third_party/dawn/src/dawn/partition_alloc/partition_alloc/pointers/raw_ptr.h third_party/dawn/src/dawn/partition_alloc/partition_alloc/pointers/raw_ptr_exclusion.h third_party/dawn/src/dawn/partition_alloc/partition_alloc/pointers/raw_ref.h third_party/dawn/src/dawn/platform/metrics/HistogramMacros.h -third_party/dawn/src/dawn/samples/SampleUtils.cpp third_party/dawn/src/dawn/tests/PartitionAllocSupport.cpp third_party/dawn/src/dawn/tests/end2end/DepthBiasTests.cpp third_party/dawn/src/dawn/tests/end2end/TextureFormatTests.cpp @@ -7863,7 +8555,6 @@ third_party/dawn/src/dawn/tests/unittests/validation/ValidationTest.cpp third_party/dawn/src/dawn/tests/white_box/SharedTextureMemoryTests_dmabuf.cpp third_party/dawn/src/dawn/tests/white_box/VulkanImageWrappingTests_DmaBuf.cpp third_party/dawn/src/dawn/utils/WindowsDebugLogger.cpp -third_party/dawn/src/tint/fuzzers/cli.cc third_party/dawn/src/tint/lang/core/constant/eval_builtin_test.cc third_party/dawn/src/tint/lang/hlsl/writer/ast_printer/ast_printer.cc third_party/dawn/src/tint/lang/spirv/reader/ast_parser/ast_parser.cc @@ -8360,7 +9051,6 @@ third_party/devtools-frontend/src/front_end/models/issues_manager/SharedArrayBuf third_party/devtools-frontend/src/front_end/models/persistence/NetworkPersistenceManager.test.ts third_party/devtools-frontend/src/front_end/models/persistence/NetworkPersistenceManager.ts third_party/devtools-frontend/src/front_end/models/persistence/PersistenceImpl.test.ts -third_party/devtools-frontend/src/front_end/models/timeline_model/TimelineModel.ts third_party/devtools-frontend/src/front_end/models/trace/ModelImpl.test.ts third_party/devtools-frontend/src/front_end/models/trace/handlers/MetaHandler.test.ts third_party/devtools-frontend/src/front_end/models/trace/handlers/MetaHandler.ts @@ -8368,6 +9058,7 @@ third_party/devtools-frontend/src/front_end/models/trace/handlers/NetworkRequest third_party/devtools-frontend/src/front_end/models/trace/handlers/UserInteractionsHandler.ts third_party/devtools-frontend/src/front_end/models/trace/handlers/UserTimingsHandler.ts third_party/devtools-frontend/src/front_end/models/trace/helpers/Trace.test.ts +third_party/devtools-frontend/src/front_end/models/trace/insights/CumulativeLayoutShift.ts third_party/devtools-frontend/src/front_end/models/trace/insights/InteractionToNextPaint.ts third_party/devtools-frontend/src/front_end/models/trace/insights/RenderBlocking.test.ts third_party/devtools-frontend/src/front_end/models/trace/types/TraceEvents.ts @@ -8432,6 +9123,7 @@ third_party/devtools-frontend/src/front_end/panels/sources/components/HeadersVie third_party/devtools-frontend/src/front_end/panels/timeline/EventUICategory.ts third_party/devtools-frontend/src/front_end/panels/timeline/ThreadAppender.ts third_party/devtools-frontend/src/front_end/panels/timeline/TimelinePanel.ts +third_party/devtools-frontend/src/front_end/panels/timeline/TimelineTreeView.test.ts third_party/devtools-frontend/src/front_end/panels/timeline/TimelineUIUtils.test.ts third_party/devtools-frontend/src/front_end/panels/timeline/components/DetailsView.ts third_party/devtools-frontend/src/front_end/panels/timeline/track_appenders/ThreadAppender.test.ts @@ -8563,11 +9255,11 @@ third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cj third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/common/Device.js third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/common/FileChooser.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/common/FileChooser.js +third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/common/PDFOptions.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/common/QueryHandler.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/common/QueryHandler.js third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/common/Viewport.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/common/util.js -third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/node/ChromeLauncher.js third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/node/FirefoxLauncher.js third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/node/LaunchOptions.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/node/PuppeteerNode.d.ts @@ -8600,11 +9292,11 @@ third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/es third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/Device.js third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/FileChooser.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/FileChooser.js +third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/PDFOptions.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/QueryHandler.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/QueryHandler.js third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/Viewport.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/util.js -third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/node/ChromeLauncher.js third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/node/FirefoxLauncher.js third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/node/LaunchOptions.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/node/PuppeteerNode.d.ts @@ -8628,10 +9320,10 @@ third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/co third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/common/CustomQueryHandler.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/common/Device.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/common/FileChooser.ts +third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/common/PDFOptions.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/common/QueryHandler.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/common/Viewport.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/common/util.ts -third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/node/ChromeLauncher.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/node/FirefoxLauncher.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/node/LaunchOptions.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/node/PuppeteerNode.ts @@ -8789,11 +9481,13 @@ third_party/devtools-frontend/src/node_modules/chai/lib/chai/interface/assert.js third_party/devtools-frontend/src/node_modules/chai/lib/chai/interface/should.js third_party/devtools-frontend/src/node_modules/chai/lib/chai/utils/isNaN.js third_party/devtools-frontend/src/node_modules/chai/package.json -third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/cjs/bidiMapper/domains/browser/BrowserProcessor.js -third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/cjs/bidiMapper/domains/context/BrowsingContextProcessor.js -third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/cjs/bidiMapper/domains/input/ActionDispatcher.js -third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/cjs/bidiMapper/domains/input/InputSource.js +third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/cjs/bidiMapper/modules/browser/BrowserProcessor.js +third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/cjs/bidiMapper/modules/context/BrowsingContextProcessor.js +third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/cjs/bidiMapper/modules/input/ActionDispatcher.js +third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/cjs/bidiMapper/modules/input/InputSource.js +third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/cjs/bidiMapper/modules/storage/StorageProcessor.js third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/cjs/utils/uuid.js +third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/iife/mapperTab.js third_party/devtools-frontend/src/node_modules/clone-regexp/index.d.ts third_party/devtools-frontend/src/node_modules/clone-regexp/package.json third_party/devtools-frontend/src/node_modules/clone/package.json @@ -8819,7 +9513,6 @@ third_party/devtools-frontend/src/node_modules/core-js-pure/modules/es.symbol.js third_party/devtools-frontend/src/node_modules/core-js-pure/modules/web.url.js third_party/devtools-frontend/src/node_modules/cors/package.json third_party/devtools-frontend/src/node_modules/cosmiconfig/package.json -third_party/devtools-frontend/src/node_modules/cross-fetch/package.json third_party/devtools-frontend/src/node_modules/css-select/node_modules/domutils/lib/stringify.d.ts third_party/devtools-frontend/src/node_modules/css-select/node_modules/domutils/lib/stringify.js third_party/devtools-frontend/src/node_modules/css-tree/data/patch.json @@ -9237,7 +9930,6 @@ third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/esm/puppeteer/ third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/types.d.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/node_modules/debug/package.json third_party/devtools-frontend/src/node_modules/puppeteer-core/node_modules/debug/src/browser.js -third_party/devtools-frontend/src/node_modules/puppeteer-core/node_modules/ws/package.json third_party/devtools-frontend/src/node_modules/puppeteer-core/src/api/Browser.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/src/api/BrowserContext.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/src/api/ElementHandle.ts @@ -9469,6 +10161,7 @@ third_party/devtools-frontend/src/scripts/deps/download_emscripten.py third_party/devtools-frontend/src/scripts/deps/roll_to_chromium.py third_party/devtools-frontend/src/scripts/hosted_mode/server.js third_party/devtools-frontend/src/scripts/tools/update_goldens.py +third_party/devtools-frontend/src/test/conductor/resultsdb.ts third_party/devtools-frontend/src/test/e2e/application/reporting-api_test.ts third_party/devtools-frontend/src/test/e2e/console/console-message-format_test.ts third_party/devtools-frontend/src/test/e2e/console/console-truncate-long-messages_test.ts @@ -9480,7 +10173,6 @@ third_party/devtools-frontend/src/test/e2e/rendering/Rendering_test.ts third_party/devtools-frontend/src/test/e2e/resources/console/primitives.html third_party/devtools-frontend/src/test/e2e/resources/elements/inactive-css-page.html third_party/devtools-frontend/src/test/perf/report/report.ts -third_party/devtools-frontend/src/test/shared/resultsdb.ts third_party/devtools-frontend/src/third_party/blink/public/devtools_protocol/browser_protocol.json third_party/devtools-frontend/src/third_party/pyjson5/src/benchmarks/chromium.linux.json third_party/devtools-frontend/src/third_party/pyjson5/src/setup.py @@ -9538,6 +10230,7 @@ third_party/eigen3/src/Eigen/src/Core/PlainObjectBase.h third_party/eigen3/src/Eigen/src/Core/Product.h third_party/eigen3/src/Eigen/src/Core/ProductEvaluators.h third_party/eigen3/src/Eigen/src/Core/Random.h +third_party/eigen3/src/Eigen/src/Core/RandomImpl.h third_party/eigen3/src/Eigen/src/Core/Redux.h third_party/eigen3/src/Eigen/src/Core/Ref.h third_party/eigen3/src/Eigen/src/Core/Replicate.h @@ -9899,6 +10592,7 @@ third_party/eigen3/src/test/main.h third_party/eigen3/src/test/mapped_matrix.cpp third_party/eigen3/src/test/mapstaticmethods.cpp third_party/eigen3/src/test/mapstride.cpp +third_party/eigen3/src/test/matrix_cwise.cpp third_party/eigen3/src/test/meta.cpp third_party/eigen3/src/test/metis_support.cpp third_party/eigen3/src/test/miscmatrices.cpp @@ -9985,7 +10679,7 @@ third_party/eigen3/src/test/type_alias.cpp third_party/eigen3/src/test/umeyama.cpp third_party/eigen3/src/test/umfpack_support.cpp third_party/eigen3/src/test/unalignedcount.cpp -third_party/eigen3/src/test/unaryviewstride.cpp +third_party/eigen3/src/test/unaryview.cpp third_party/eigen3/src/test/upperbidiagonalization.cpp third_party/eigen3/src/test/vectorization_logic.cpp third_party/eigen3/src/test/vectorwiseop.cpp @@ -10066,6 +10760,7 @@ third_party/eigen3/src/unsupported/Eigen/CXX11/src/util/CXX11Workarounds.h third_party/eigen3/src/unsupported/Eigen/src/AutoDiff/AutoDiffJacobian.h third_party/eigen3/src/unsupported/Eigen/src/AutoDiff/AutoDiffScalar.h third_party/eigen3/src/unsupported/Eigen/src/AutoDiff/AutoDiffVector.h +third_party/eigen3/src/unsupported/Eigen/src/AutoDiff/CoherentPadOp.h third_party/eigen3/src/unsupported/Eigen/src/BVH/BVAlgorithms.h third_party/eigen3/src/unsupported/Eigen/src/BVH/KdBVH.h third_party/eigen3/src/unsupported/Eigen/src/Eigenvalues/ArpackSelfAdjointEigenSolver.h @@ -10399,6 +11094,8 @@ third_party/ffmpeg/libavcodec/libjxl.c third_party/ffmpeg/libavcodec/libjxl.h third_party/ffmpeg/libavcodec/libjxldec.c third_party/ffmpeg/libavcodec/libjxlenc.c +third_party/ffmpeg/libavcodec/liblc3dec.c +third_party/ffmpeg/libavcodec/liblc3enc.c third_party/ffmpeg/libavcodec/librsvgdec.c third_party/ffmpeg/libavcodec/libtheoraenc.c third_party/ffmpeg/libavcodec/libuavs3d.c @@ -10546,6 +11243,7 @@ third_party/ffmpeg/libavformat/av1dec.c third_party/ffmpeg/libavformat/avs3dec.c third_party/ffmpeg/libavformat/c93.c third_party/ffmpeg/libavformat/dnxhddec.c +third_party/ffmpeg/libavformat/ffjni.c third_party/ffmpeg/libavformat/ftp.c third_party/ffmpeg/libavformat/hevc.c third_party/ffmpeg/libavformat/hevc.h @@ -11280,7 +11978,6 @@ third_party/isimpledom/ISimpleDOMDocument.idl third_party/isimpledom/ISimpleDOMNode.idl third_party/isimpledom/ISimpleDOMText.idl third_party/jni_zero/PRESUBMIT.py -third_party/js_code_coverage/package.json third_party/jstemplate/compile.py third_party/jstemplate/jsevalcontext.js third_party/jstemplate/jstemplate.js @@ -11336,6 +12033,7 @@ third_party/libaom/source/libaom/av1/encoder/speed_features.c third_party/libaom/source/libaom/av1/encoder/speed_features.h third_party/libaom/source/libaom/av1/encoder/tx_search.c third_party/libaom/source/libaom/av1/encoder/var_based_part.c +third_party/libaom/source/libaom/common/tools_common.h third_party/libaom/source/libaom/test/gviz_api.py third_party/libaom/source/libaom/test/metrics_template.html third_party/libaom/source/libaom/test/visual_metrics.py @@ -11601,6 +12299,8 @@ third_party/libwebp/src/src/utils/huffman_encode_utils.c third_party/libwebp/src/src/utils/huffman_encode_utils.h third_party/libwebp/src/src/utils/huffman_utils.c third_party/libwebp/src/src/utils/huffman_utils.h +third_party/libwebp/src/src/utils/palette.c +third_party/libwebp/src/src/utils/palette.h third_party/libwebp/src/src/utils/quant_levels_dec_utils.c third_party/libwebp/src/src/utils/quant_levels_dec_utils.h third_party/libwebp/src/src/utils/quant_levels_utils.c @@ -11725,7 +12425,6 @@ third_party/nearby/src/fastpair/scanning/fastpair/fast_pair_non_discoverable_sca third_party/nearby/src/fastpair/server_access/fast_pair_client_impl.cc third_party/nearby/src/fastpair/server_access/fast_pair_client_impl_test.cc third_party/nearby/src/internal/crypto_cros/hmac_unittest.cc -third_party/nearby/src/internal/crypto_cros/random.h third_party/nearby/src/internal/crypto_cros/rsa_private_key_unittest.cc third_party/nearby/src/internal/crypto_cros/secure_util.h third_party/nearby/src/internal/network/http_client_impl_test.cc @@ -12016,6 +12715,9 @@ third_party/openscreen/src/discovery/mdns/impl/mdns_responder_unittest.cc third_party/openscreen/src/discovery/mdns/public/mdns_reader.cc third_party/openscreen/src/discovery/public/dns_sd_service_watcher.h third_party/openscreen/src/osp/impl/message_demuxer.cc +third_party/openscreen/src/osp/impl/presentation/presentation_controller.cc +third_party/openscreen/src/osp/impl/quic/quic_client.h +third_party/openscreen/src/osp/impl/quic/quic_connection_factory_client.cc third_party/openscreen/src/osp/impl/quic/quic_connection_factory_server.cc third_party/openscreen/src/platform/impl/tls_connection_factory_posix.cc third_party/openscreen/src/platform/impl/tls_connection_posix.cc @@ -12617,6 +13319,7 @@ third_party/perfetto/src/trace_processor/importers/proto/statsd_module.cc third_party/perfetto/src/trace_processor/importers/proto/system_probes_parser.cc third_party/perfetto/src/trace_processor/metrics/sql/android/unsymbolized_frames.sql third_party/perfetto/src/trace_processor/metrics/sql/chrome/rail_modes.sql +third_party/perfetto/src/trace_processor/perfetto_sql/stdlib/android/startup/time_to_display.sql third_party/perfetto/src/trace_processor/perfetto_sql/stdlib/chrome/page_loads.sql third_party/perfetto/src/traceconv/trace_to_hprof.cc third_party/perfetto/src/traced/probes/android_log/android_log_data_source.cc @@ -12650,6 +13353,7 @@ third_party/perfetto/ui/src/frontend/home_page.ts third_party/perfetto/ui/src/frontend/index.ts third_party/perfetto/ui/src/frontend/pan_and_zoom_handler.ts third_party/perfetto/ui/src/frontend/post_message_handler.ts +third_party/perfetto/ui/src/frontend/post_message_handler_unittest.ts third_party/perfetto/ui/src/frontend/record_page.ts third_party/perfetto/ui/src/frontend/sidebar.ts third_party/perfetto/ui/src/frontend/trace_info_page.ts @@ -13438,6 +14142,8 @@ third_party/rust/PRESUBMIT.py third_party/rust/aho_corasick/v1/BUILD.gn third_party/rust/anyhow/v1/BUILD.gn third_party/rust/bytemuck/v1/BUILD.gn +third_party/rust/bytemuck_derive/v1/BUILD.gn +third_party/rust/chromium_crates_io/vendor/prost-0.12.4/.devcontainer/devcontainer.json third_party/rust/cxx/v1/BUILD.gn third_party/rust/cxxbridge_cmd/v1/BUILD.gn third_party/rust/cxxbridge_flags/v1/BUILD.gn @@ -13506,6 +14212,7 @@ third_party/skia/demos.skia.org/demos/web_worker/index.html third_party/skia/demos.skia.org/demos/web_worker/main.js third_party/skia/demos.skia.org/demos/web_worker/worker.js third_party/skia/demos.skia.org/demos/webgpu/index.html +third_party/skia/example/external_client/src/gl_context_helper.mm third_party/skia/experimental/tools/pdf-comparison.py third_party/skia/fuzz/FuzzPathop.cpp third_party/skia/gm/addarc.cpp @@ -13528,6 +14235,7 @@ third_party/skia/gn/gn_to_bp.py third_party/skia/gn/skia/BUILD.gn third_party/skia/include/ports/SkImageGeneratorWIC.h third_party/skia/include/ports/SkTypeface_mac.h +third_party/skia/include/private/SkGainmapInfo.h third_party/skia/include/private/SkPathRef.h third_party/skia/infra/bots/assets/android_ndk_darwin/create.py third_party/skia/infra/bots/assets/android_ndk_linux/create.py @@ -13642,6 +14350,7 @@ third_party/skia/src/gpu/ganesh/gl/GrGLCaps.cpp third_party/skia/src/gpu/ganesh/gl/GrGLCaps.h third_party/skia/src/gpu/ganesh/gl/GrGLGpu.cpp third_party/skia/src/gpu/ganesh/vk/GrVkCaps.cpp +third_party/skia/src/gpu/graphite/Device.cpp third_party/skia/src/gpu/graphite/dawn/DawnCommandBuffer.cpp third_party/skia/src/gpu/graphite/render/AnalyticRRectRenderStep.cpp third_party/skia/src/gpu/graphite/render/PerEdgeAAQuadRenderStep.cpp @@ -13685,7 +14394,6 @@ third_party/skia/third_party/freetype2/include/freetype-android/freetype/config/ third_party/skia/third_party/freetype2/include/freetype-no-type1/freetype/config/ftoption.h third_party/skia/third_party/icu_bidi/BUILD.gn third_party/skia/tools/abandon_gerrit_cls.py -third_party/skia/tools/add_codereview_message.py third_party/skia/tools/bloaty_treemap.py third_party/skia/tools/copyright/main.py third_party/skia/tools/flags/CommandLineFlags.h @@ -13967,8 +14675,6 @@ third_party/tflite/src/tensorflow/tools/android/test/jni/rgb2yuv.cc third_party/tflite/src/tensorflow/tools/compatibility/tf_upgrade_v2_safety_test.py third_party/tflite/src/tensorflow/tools/pip_package/THIRD_PARTY_NOTICES.txt third_party/tflite/src/tensorflow/tools/pip_package/setup.py -third_party/tflite/src/third_party/xla/third_party/tsl/tsl/distributed_runtime/coordination/coordination_service_error_util.h -third_party/tflite/src/third_party/xla/third_party/tsl/tsl/distributed_runtime/rpc/grpc_util.h third_party/tflite/src/third_party/xla/third_party/tsl/tsl/lib/io/format.h third_party/tflite/src/third_party/xla/third_party/tsl/tsl/platform/cloud/compute_engine_metadata_client.h third_party/tflite/src/third_party/xla/third_party/tsl/tsl/platform/cloud/curl_http_request.cc @@ -13994,6 +14700,8 @@ third_party/tflite/src/third_party/xla/xla/service/gpu/fusions/transpose.h third_party/tflite/src/third_party/xla/xla/service/gpu/fusions/transpose_mlir.h third_party/tflite/src/third_party/xla/xla/service/hlo_graph_dumper.cc third_party/tflite/src/third_party/xla/xla/service/hlo_verifier.cc +third_party/tflite/src/third_party/xla/xla/tsl/distributed_runtime/coordination/coordination_service_error_util.h +third_party/tflite/src/third_party/xla/xla/tsl/distributed_runtime/rpc/grpc_util.h third_party/tflite_support/src/tensorflow_lite_support/c/task/processor/category.h third_party/updater/chrome_mac_universal/3pp/fetch.py third_party/updater/chrome_mac_universal_prod/3pp/fetch.py @@ -14281,6 +14989,7 @@ third_party/webgl/src/other/get.webgl.org/troubleshooting/DoNotCopyOrLinkThisFil third_party/webgl/src/other/get.webgl.org/webgl2/troubleshooting/DoNotCopyOrLinkThisFileElseYouWillNotGetAutoUpdatedHelpForYourUsers.js third_party/webgl/src/other/test-runner/android/PortForwarderService/proguard-project.txt third_party/webgl/src/other/test-runner/package.json +third_party/webgl/src/resources/html5lib-1.1/src/html5lib/tests/test_parser2.py third_party/webgl/src/resources/html5lib/src/html5lib/serializer/htmlserializer.py third_party/webgl/src/resources/html5lib/src/html5lib/tests/test_parser2.py third_party/webgl/src/sdk/demos/google/particles/index.html @@ -14386,7 +15095,6 @@ third_party/webgpu-cts/src/src/webgpu/shader/execution/shader_io/fragment_builti third_party/webgpu-cts/src/standalone/index.html third_party/webrtc/BUILD.gn third_party/webrtc/PRESUBMIT.py -third_party/webrtc/api/audio/audio_frame.cc third_party/webrtc/api/audio_codecs/opus/audio_encoder_opus_config.h third_party/webrtc/api/location.h third_party/webrtc/api/scoped_refptr.h @@ -14491,7 +15199,6 @@ third_party/webrtc/rtc_base/system/arch.h third_party/webrtc/rtc_base/thread_annotations.h third_party/webrtc/rtc_base/thread_unittest.cc third_party/webrtc/rtc_base/timestamp_aligner_unittest.cc -third_party/webrtc/rtc_base/trace_event.h third_party/webrtc/rtc_base/win/scoped_com_initializer.h third_party/webrtc/rtc_base/win/windows_version.cc third_party/webrtc/rtc_base/win32_unittest.cc @@ -14501,7 +15208,6 @@ third_party/webrtc/rtc_tools/unpack_aecdump/unpack.cc third_party/webrtc/sdk/android/native_api/jni/class_loader.cc third_party/webrtc/sdk/android/native_api/jni/class_loader.h third_party/webrtc/sdk/android/native_api/jni/java_types.h -third_party/webrtc/sdk/android/native_api/jni/jni_int_wrapper.h third_party/webrtc/sdk/android/native_api/jni/scoped_java_ref.h third_party/webrtc/sdk/android/native_unittests/audio_device/audio_device_unittest.cc third_party/webrtc/sdk/android/src/jni/android_network_monitor.cc @@ -14620,7 +15326,6 @@ third_party/wpt_tools/wpt/tools/wpt/android.py third_party/wpt_tools/wpt/tools/wpt/browser.py third_party/wpt_tools/wpt/tools/wptrunner/requirements.txt third_party/wpt_tools/wpt/tools/wptrunner/setup.py -third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/browsers/android_weblayer.py third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/browsers/android_webview.py third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/browsers/base.py third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/browsers/chrome.py @@ -14631,7 +15336,6 @@ third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/test-wait.js third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/formatters/chromium.py third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/testharnessreport-content-shell.js third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/wpttest.py -third_party/wpt_tools/wpt/websockets/handlers/send-backpressure_wsh.py third_party/wuffs/BUILD.gn third_party/wuffs/src/release/c/wuffs-v0.3.c third_party/xdg-utils/scripts/desc/xdg-settings.xml @@ -14865,6 +15569,8 @@ tools/metrics/histograms/metadata/ash/enums.xml tools/metrics/histograms/metadata/ash/histograms.xml tools/metrics/histograms/metadata/ash_clipboard/enums.xml tools/metrics/histograms/metadata/ash_clipboard/histograms.xml +tools/metrics/histograms/metadata/ash_growth/enums.xml +tools/metrics/histograms/metadata/ash_growth/histograms.xml tools/metrics/histograms/metadata/ash_user_education/enums.xml tools/metrics/histograms/metadata/ash_user_education/histograms.xml tools/metrics/histograms/metadata/assistant/histograms.xml @@ -14922,7 +15628,6 @@ tools/metrics/histograms/metadata/cryptohome/histograms.xml tools/metrics/histograms/metadata/custom_tabs/enums.xml tools/metrics/histograms/metadata/custom_tabs/histograms.xml tools/metrics/histograms/metadata/data/histograms.xml -tools/metrics/histograms/metadata/desktop/histograms.xml tools/metrics/histograms/metadata/dev/enums.xml tools/metrics/histograms/metadata/dev/histograms.xml tools/metrics/histograms/metadata/disk/histograms.xml @@ -14934,6 +15639,8 @@ tools/metrics/histograms/metadata/event/enums.xml tools/metrics/histograms/metadata/event/histograms.xml tools/metrics/histograms/metadata/extensions/enums.xml tools/metrics/histograms/metadata/extensions/histograms.xml +tools/metrics/histograms/metadata/facilitated_payments/enums.xml +tools/metrics/histograms/metadata/facilitated_payments/histograms.xml tools/metrics/histograms/metadata/families/enums.xml tools/metrics/histograms/metadata/families/histograms.xml tools/metrics/histograms/metadata/fastpair/enums.xml @@ -14941,7 +15648,9 @@ tools/metrics/histograms/metadata/fastpair/histograms.xml tools/metrics/histograms/metadata/feature_engagement/histograms.xml tools/metrics/histograms/metadata/file/enums.xml tools/metrics/histograms/metadata/file/histograms.xml +tools/metrics/histograms/metadata/fingerprint/enums.xml tools/metrics/histograms/metadata/fingerprint/histograms.xml +tools/metrics/histograms/metadata/fingerprinting_protection/histograms.xml tools/metrics/histograms/metadata/game_mode/histograms.xml tools/metrics/histograms/metadata/gcm/histograms.xml tools/metrics/histograms/metadata/geolocation/enums.xml @@ -14971,6 +15680,8 @@ tools/metrics/histograms/metadata/kerberos/histograms.xml tools/metrics/histograms/metadata/kiosk/histograms.xml tools/metrics/histograms/metadata/language/enums.xml tools/metrics/histograms/metadata/language/histograms.xml +tools/metrics/histograms/metadata/lens/enums.xml +tools/metrics/histograms/metadata/lens/histograms.xml tools/metrics/histograms/metadata/leveldb_proto/histograms.xml tools/metrics/histograms/metadata/local/histograms.xml tools/metrics/histograms/metadata/login/histograms.xml @@ -15065,7 +15776,10 @@ tools/metrics/histograms/metadata/session/enums.xml tools/metrics/histograms/metadata/session/histograms.xml tools/metrics/histograms/metadata/settings/enums.xml tools/metrics/histograms/metadata/settings/histograms.xml +tools/metrics/histograms/metadata/sharing/enums.xml tools/metrics/histograms/metadata/sharing/histograms.xml +tools/metrics/histograms/metadata/shortcuts/enums.xml +tools/metrics/histograms/metadata/shortcuts/histograms.xml tools/metrics/histograms/metadata/side_search/histograms.xml tools/metrics/histograms/metadata/signin/enums.xml tools/metrics/histograms/metadata/signin/histograms.xml @@ -15525,6 +16239,7 @@ ui/display/display_transform.cc ui/display/mac/display_link_mac.cc ui/display/win/test/virtual_display_util_win.cc ui/events/android/motion_event_android_unittest.cc +ui/events/ash/keyboard_capability_unittest.cc ui/events/blink/blink_event_util.cc ui/events/devices/input_device_observer_win.cc ui/events/gesture_detection/gesture_provider_unittest.cc @@ -15606,6 +16321,8 @@ ui/strings/ui_strings.grd ui/views/PRESUBMIT.py ui/views/accessibility/view_accessibility.cc ui/views/accessibility/view_ax_platform_node_delegate_win_unittest.cc +ui/views/animation/animation_builder.cc +ui/views/animation/animation_builder.h ui/views/animation/ink_drop_ripple.h ui/views/bubble/bubble_dialog_delegate_view.cc ui/views/controls/textfield/textfield_model_unittest.cc diff --git a/patches/core/bromite/disable-fetching-field-trials.patch b/patches/core/bromite/disable-fetching-field-trials.patch index 12925572..10f07a08 100644 --- a/patches/core/bromite/disable-fetching-field-trials.patch +++ b/patches/core/bromite/disable-fetching-field-trials.patch @@ -10,7 +10,7 @@ Subject: Disable fetching of all field trials --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -51,7 +51,7 @@ public abstract class ChromeFeatureList +@@ -52,7 +52,7 @@ public abstract class ChromeFeatureList * |kFeaturesExposedToJava| in chrome/browser/flags/android/chrome_feature_list.cc */ public static String getFieldTrialParamByFeature(String featureName, String paramName) { @@ -19,7 +19,7 @@ Subject: Disable fetching of all field trials } /** -@@ -63,8 +63,7 @@ public abstract class ChromeFeatureList +@@ -64,8 +64,7 @@ public abstract class ChromeFeatureList */ public static boolean getFieldTrialParamByFeatureAsBoolean( String featureName, String paramName, boolean defaultValue) { @@ -29,7 +29,7 @@ Subject: Disable fetching of all field trials } /** -@@ -76,8 +75,7 @@ public abstract class ChromeFeatureList +@@ -77,8 +76,7 @@ public abstract class ChromeFeatureList */ public static int getFieldTrialParamByFeatureAsInt( String featureName, String paramName, int defaultValue) { @@ -39,7 +39,7 @@ Subject: Disable fetching of all field trials } /** -@@ -89,8 +87,7 @@ public abstract class ChromeFeatureList +@@ -90,8 +88,7 @@ public abstract class ChromeFeatureList */ public static double getFieldTrialParamByFeatureAsDouble( String featureName, String paramName, double defaultValue) { diff --git a/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch b/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch index eccfe74a..b8232469 100644 --- a/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch +++ b/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2425,7 +2425,6 @@ static_library("browser") { +@@ -2434,7 +2434,6 @@ static_library("browser") { "//components/reporting/util:task_runner_context", "//components/resources", "//components/safe_browsing/content/browser", @@ -8,7 +8,7 @@ "//components/safe_browsing/content/browser:safe_browsing_service", "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/web_ui", -@@ -3829,8 +3828,6 @@ static_library("browser") { +@@ -3882,8 +3881,6 @@ static_library("browser") { "download/download_commands.h", "download/download_crx_util.cc", "download/download_crx_util.h", @@ -30,7 +30,7 @@ namespace subresource_filter { class RulesetService; } -@@ -222,9 +218,6 @@ class BrowserProcess { +@@ -223,9 +219,6 @@ class BrowserProcess { // on this platform (or this is a unit test). virtual StatusTray* status_tray() = 0; @@ -42,7 +42,7 @@ virtual subresource_filter::RulesetService* --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc -@@ -75,7 +75,6 @@ +@@ -76,7 +76,6 @@ #include "chrome/browser/printing/print_job_manager.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/resource_coordinator/resource_coordinator_parts.h" @@ -50,7 +50,7 @@ #include "chrome/browser/shell_integration.h" #include "chrome/browser/site_isolation/prefs_observer.h" #include "chrome/browser/ssl/secure_origin_prefs_observer.h" -@@ -452,8 +451,6 @@ void BrowserProcessImpl::StartTearDown() +@@ -458,8 +457,6 @@ void BrowserProcessImpl::StartTearDown() #endif metrics_services_manager_.reset(); intranet_redirect_detector_.reset(); @@ -59,7 +59,7 @@ network_time_tracker_.reset(); #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) -@@ -1122,14 +1119,6 @@ StatusTray* BrowserProcessImpl::status_t +@@ -1138,14 +1135,6 @@ StatusTray* BrowserProcessImpl::status_t return status_tray_.get(); } @@ -74,7 +74,7 @@ subresource_filter::RulesetService* BrowserProcessImpl::subresource_filter_ruleset_service() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -1429,26 +1418,6 @@ void BrowserProcessImpl::CreateBackgroun +@@ -1453,26 +1442,6 @@ void BrowserProcessImpl::CreateBackgroun #endif } @@ -90,8 +90,8 @@ - safe_browsing::GetSafeBrowsingServiceFactory()); - } - -- // TODO(crbug/925153): Port consumers of the |safe_browsing_service_| to use -- // the interface in components/safe_browsing, and remove this cast. +- // TODO(crbug.com/41437292): Port consumers of the |safe_browsing_service_| to +- // use the interface in components/safe_browsing, and remove this cast. - safe_browsing_service_ = static_cast( - safe_browsing::SafeBrowsingServiceInterface::CreateSafeBrowsingService()); - if (safe_browsing_service_) @@ -103,7 +103,7 @@ created_subresource_filter_ruleset_service_ = true; --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h -@@ -197,7 +197,6 @@ class BrowserProcessImpl : public Browse +@@ -200,7 +200,6 @@ class BrowserProcessImpl : public Browse std::unique_ptr manager) override; #endif StatusTray* status_tray() override; @@ -111,7 +111,7 @@ subresource_filter::RulesetService* subresource_filter_ruleset_service() override; subresource_filter::RulesetService* -@@ -360,9 +359,6 @@ class BrowserProcessImpl : public Browse +@@ -367,9 +366,6 @@ class BrowserProcessImpl : public Browse std::unique_ptr background_mode_manager_; #endif @@ -123,7 +123,7 @@ subresource_filter_ruleset_service_; --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc -@@ -68,7 +68,6 @@ +@@ -69,7 +69,6 @@ #include "chrome/browser/profiles/keep_alive/scoped_profile_keep_alive.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/reading_list/reading_list_model_factory.h" @@ -131,7 +131,7 @@ #include "chrome/browser/safe_browsing/verdict_cache_manager_factory.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/share/share_history.h" -@@ -641,10 +640,6 @@ void ChromeBrowsingDataRemoverDelegate:: +@@ -643,10 +642,6 @@ void ChromeBrowsingDataRemoverDelegate:: base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies")); network::mojom::NetworkContext* safe_browsing_context = nullptr; @@ -144,7 +144,7 @@ browsing_data::RemoveFederatedSiteSettingsData(delete_begin_, delete_end_, --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -5169,10 +5169,6 @@ ChromeContentBrowserClient::CreateThrott +@@ -5187,10 +5187,6 @@ ChromeContentBrowserClient::CreateThrott throttles.push_back(std::make_unique( handle, handle->GetWebContents()->GetBrowserContext())); @@ -155,7 +155,7 @@ throttles.push_back(std::make_unique( handle, base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp), -@@ -5224,16 +5220,6 @@ ChromeContentBrowserClient::CreateThrott +@@ -5242,16 +5238,6 @@ ChromeContentBrowserClient::CreateThrott &throttles); #endif @@ -172,7 +172,7 @@ if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) { throttles.push_back( std::make_unique( -@@ -5534,8 +5520,6 @@ bool ChromeContentBrowserClient::IsPlugi +@@ -5569,8 +5555,6 @@ bool ChromeContentBrowserClient::IsPlugi void ChromeContentBrowserClient::InitOnUIThread() { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -221,7 +221,7 @@ if (download_manager_) { download_manager_->AddObserver(this); } -@@ -933,17 +926,6 @@ void ChromeDownloadManagerDelegate::Choo +@@ -940,17 +933,6 @@ void ChromeDownloadManagerDelegate::Choo void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName( base::FilePath* filename, const GURL& source_url) { @@ -250,7 +250,7 @@ // Whether the download is currently being revived. bool is_being_revived_ = false; -@@ -535,13 +535,13 @@ void DownloadItemModel::SetShouldPreferO +@@ -536,13 +536,13 @@ void DownloadItemModel::SetShouldPreferO data->should_prefer_opening_in_browser_ = preference; } @@ -267,7 +267,7 @@ DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_); data->danger_level_ = danger_level; } -@@ -748,9 +748,6 @@ bool DownloadItemModel::IsCommandEnabled +@@ -749,9 +749,6 @@ bool DownloadItemModel::IsCommandEnabled // filename. Don't base an "Always open" decision based on it. Also // exclude extensions. return download_->CanOpenDownload() && @@ -279,7 +279,7 @@ return !download_->IsSavePackageDownload() && --- a/chrome/browser/download/download_prefs.cc +++ b/chrome/browser/download/download_prefs.cc -@@ -263,14 +263,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr +@@ -261,14 +261,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr base::FilePath::StringType(1, base::FilePath::kExtensionSeparator) + extension); @@ -295,7 +295,7 @@ } } -@@ -448,10 +441,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c +@@ -444,10 +437,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension( const base::FilePath& file_name) { base::FilePath::StringType extension = file_name.Extension(); @@ -308,7 +308,7 @@ extension.erase(0, 1); --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -324,13 +324,6 @@ base::FilePath DownloadTargetDeterminer: +@@ -323,13 +323,6 @@ base::FilePath DownloadTargetDeterminer: download_->GetURL(), download_->GetContentDisposition(), referrer_charset, suggested_filename, sniffed_mime_type, default_filename); @@ -322,7 +322,7 @@ // If no mime type or explicitly specified a name, don't replace file // extension. if (sniffed_mime_type.empty() || !suggested_filename.empty()) -@@ -1291,30 +1284,7 @@ DownloadFileType::DangerLevel DownloadTa +@@ -1290,30 +1283,7 @@ DownloadFileType::DangerLevel DownloadTa download_->HasUserGesture()) return DownloadFileType::NOT_DANGEROUS; @@ -500,7 +500,7 @@ referrer_entries))); --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -692,18 +692,6 @@ void WebstorePrivateBeginInstallWithMani +@@ -697,18 +697,6 @@ void WebstorePrivateBeginInstallWithMani void WebstorePrivateBeginInstallWithManifest3Function:: ReportFrictionAcceptedEvent() { @@ -519,7 +519,7 @@ } void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone( -@@ -1202,54 +1190,9 @@ WebstorePrivateGetReferrerChainFunction: +@@ -1207,54 +1195,9 @@ WebstorePrivateGetReferrerChainFunction: ExtensionFunction::ResponseAction WebstorePrivateGetReferrerChainFunction::Run() { @@ -647,7 +647,7 @@ // SimpleURLLoader -> (owned loader, extension id). --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -92,7 +92,6 @@ +@@ -91,7 +91,6 @@ #include "chrome/browser/push_messaging/push_messaging_service_factory.h" #include "chrome/browser/push_messaging/push_messaging_service_impl.h" #include "chrome/browser/reduce_accept_language/reduce_accept_language_factory.h" @@ -655,7 +655,7 @@ #include "chrome/browser/sessions/exit_type_service.h" #include "chrome/browser/sharing/sharing_service_factory.h" #include "chrome/browser/signin/identity_manager_factory.h" -@@ -640,17 +639,6 @@ void ProfileImpl::LoadPrefsForNormalStar +@@ -639,17 +638,6 @@ void ProfileImpl::LoadPrefsForNormalStar mojo::PendingRemote pref_validation_delegate; @@ -695,7 +695,7 @@ sources = [ "chrome_controller_client.cc", "chrome_controller_client.h", -@@ -69,6 +70,7 @@ static_library("safe_browsing") { +@@ -70,6 +71,7 @@ static_library("safe_browsing") { "//mojo/public/cpp/system", "//services/preferences/public/cpp", ] @@ -703,7 +703,7 @@ if (is_android) { deps += [ "//chrome/browser/password_manager/android:utils" ] -@@ -506,6 +508,7 @@ static_library("advanced_protection") { +@@ -512,6 +514,7 @@ static_library("advanced_protection") { } source_set("metrics_collector") { @@ -711,7 +711,7 @@ sources = [ "safe_browsing_metrics_collector_factory.cc", "safe_browsing_metrics_collector_factory.h", -@@ -525,6 +528,7 @@ source_set("metrics_collector") { +@@ -531,6 +534,7 @@ source_set("metrics_collector") { "//components/safe_browsing/core/common:safe_browsing_prefs", "//content/public/browser", ] @@ -817,7 +817,7 @@ --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -5327,7 +5327,6 @@ static_library("ui") { +@@ -5390,7 +5390,6 @@ static_library("ui") { "views/download/bubble/download_dialog_view.h", "views/download/bubble/download_toolbar_button_view.cc", "views/download/bubble/download_toolbar_button_view.h", @@ -827,7 +827,7 @@ "views/download/download_item_view.cc", --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -486,22 +486,6 @@ void TabHelpers::AttachTabHelpers(WebCon +@@ -501,22 +501,6 @@ void TabHelpers::AttachTabHelpers(WebCon // See https://crbug.com/910288. resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents( web_contents); @@ -852,7 +852,7 @@ SecurityStateTabHelper::CreateForWebContents(web_contents); --- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc -@@ -25,7 +25,6 @@ +@@ -26,7 +26,6 @@ #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/download/bubble/download_bubble_ui_controller.h" @@ -860,7 +860,7 @@ #include "chrome/browser/download/download_history.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_item_warning_data.h" -@@ -287,13 +286,6 @@ void DownloadsDOMHandler::SaveDangerousR +@@ -292,13 +291,6 @@ void DownloadsDOMHandler::SaveDangerousR } CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS); @@ -874,7 +874,7 @@ } // "Suspicious" in this context applies to insecure as well as dangerous -@@ -558,12 +550,6 @@ void DownloadsDOMHandler::RemoveDownload +@@ -569,12 +561,6 @@ void DownloadsDOMHandler::RemoveDownload IdSet ids; for (download::DownloadItem* download : to_remove) { @@ -887,7 +887,7 @@ DownloadItemModel item_model(download); if (!item_model.ShouldShowInShelf() || download->GetState() == download::DownloadItem::IN_PROGRESS) { -@@ -723,54 +709,6 @@ void DownloadsDOMHandler::FinalizeRemova +@@ -783,54 +769,6 @@ void DownloadsDOMHandler::FinalizeRemova } } @@ -939,9 +939,9 @@ - item->ValidateDangerousDownload(); -} - - bool DownloadsDOMHandler::IsDeletingHistoryAllowed() { - content::DownloadManager* manager = GetMainNotifierManager(); - return manager && Profile::FromBrowserContext(manager->GetBrowserContext()) + void DownloadsDOMHandler::MaybeTriggerDownloadWarningHatsSurvey( + download::DownloadItem* item, + DownloadWarningHatsType survey_type) { --- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.h +++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.h @@ -12,7 +12,6 @@ @@ -949,10 +949,10 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" -#include "chrome/browser/download/download_danger_prompt.h" + #include "chrome/browser/download/download_warning_desktop_hats_utils.h" #include "chrome/browser/ui/webui/downloads/downloads.mojom-forward.h" #include "chrome/browser/ui/webui/downloads/downloads_list_tracker.h" - #include "content/public/browser/web_contents_observer.h" -@@ -104,18 +103,6 @@ class DownloadsDOMHandler : public conte +@@ -120,18 +119,6 @@ class DownloadsDOMHandler : public conte // null-checking |original_notifier_|. content::DownloadManager* GetOriginalNotifierManager() const; @@ -968,9 +968,9 @@ - // DownloadItem. - void DangerPromptDone(int download_id, DownloadDangerPrompt::Action action); - - // Returns true if the records of any downloaded items are allowed (and able) - // to be deleted. - bool IsDeletingHistoryAllowed(); + // Launches a HaTS survey for a download warning that is heeded, bypassed, or + // ignored (if all preconditions are met). + void MaybeTriggerDownloadWarningHatsSurvey( --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc @@ -275,69 +275,6 @@ CreateHttpsOnlyModePage(content::WebCont diff --git a/patches/core/inox-patchset/0005-disable-default-extensions.patch b/patches/core/inox-patchset/0005-disable-default-extensions.patch index dfe56e28..d0db48fd 100644 --- a/patches/core/inox-patchset/0005-disable-default-extensions.patch +++ b/patches/core/inox-patchset/0005-disable-default-extensions.patch @@ -10,7 +10,7 @@ extension_misc::kAssessmentAssistantExtensionId, --- a/chrome/browser/extensions/component_loader.cc +++ b/chrome/browser/extensions/component_loader.cc -@@ -397,11 +397,6 @@ void ComponentLoader::AddWebStoreApp() { +@@ -410,11 +410,6 @@ void ComponentLoader::AddWebStoreApp() { return; } #endif diff --git a/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch b/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch index 9719116e..f350cd42 100644 --- a/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch +++ b/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch @@ -112,7 +112,7 @@ by default. scoped_refptr task_runner) --- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -525,7 +525,7 @@ void WebRtcLogUploader::UploadCompressed +@@ -528,7 +528,7 @@ void WebRtcLogUploader::UploadCompressed } })"); @@ -285,14 +285,14 @@ by default. --- a/components/google/core/common/google_util.cc +++ b/components/google/core/common/google_util.cc -@@ -139,7 +139,7 @@ bool IsGoogleSearchSubdomainUrl(const GU +@@ -140,7 +140,7 @@ bool IsGoogleSearchSubdomainUrl(const GU // Global functions ----------------------------------------------------------- -const char kGoogleHomepageURL[] = "https://www.google.com/"; +const char kGoogleHomepageURL[] = "trk:113:https://www.google.com/"; - bool HasGoogleSearchQueryParam(base::StringPiece str) { + bool HasGoogleSearchQueryParam(std::string_view str) { url::Component query(0, static_cast(str.length())), key, value; --- a/components/history/core/browser/web_history_service.cc +++ b/components/history/core/browser/web_history_service.cc diff --git a/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch b/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch index 32774da6..94d82e63 100644 --- a/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch +++ b/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch @@ -67,7 +67,7 @@ the URL so we get notified if this happens again in the future). } --- a/components/security_interstitials/core/safe_browsing_loud_error_ui.cc +++ b/components/security_interstitials/core/safe_browsing_loud_error_ui.cc -@@ -26,11 +26,11 @@ namespace { +@@ -27,11 +27,11 @@ namespace { // For malware interstitial pages, we link the problematic URL to Google's // diagnostic page. const char kSbDiagnosticUrl[] = diff --git a/patches/core/ungoogled-chromium/block-requests.patch b/patches/core/ungoogled-chromium/block-requests.patch index c28a9045..931435dd 100644 --- a/patches/core/ungoogled-chromium/block-requests.patch +++ b/patches/core/ungoogled-chromium/block-requests.patch @@ -8,7 +8,7 @@ # Dev tools attempts to download css data --- a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc +++ b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc -@@ -287,6 +287,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad +@@ -289,6 +289,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad OneGoogleBarLoaderImpl::~OneGoogleBarLoaderImpl() = default; void OneGoogleBarLoaderImpl::Load(OneGoogleCallback callback) { diff --git a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch index 2ffc1353..8172c73d 100644 --- a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch +++ b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch @@ -23,7 +23,7 @@ url.SchemeIs(dom_distiller::kDomDistillerScheme)) --- a/chrome/browser/ui/singleton_tabs.cc +++ b/chrome/browser/ui/singleton_tabs.cc -@@ -170,7 +170,8 @@ int GetIndexOfExistingTab(Browser* brows +@@ -165,7 +165,8 @@ int GetIndexOfExistingTab(Browser* brows // RewriteURLIfNecessary removes the "view-source:" scheme which could lead // to incorrect matching, so ensure that the target and the candidate are // either both view-source:, or neither is. @@ -35,7 +35,7 @@ --- a/components/omnibox/browser/autocomplete_input.cc +++ b/components/omnibox/browser/autocomplete_input.cc -@@ -581,7 +581,8 @@ void AutocompleteInput::ParseForEmphasiz +@@ -582,7 +582,8 @@ void AutocompleteInput::ParseForEmphasiz // For the view-source and blob schemes, we should emphasize the host of the // URL qualified by the view-source or blob prefix. if ((base::EqualsCaseInsensitiveASCII(scheme_str, kViewSourceScheme) || @@ -47,7 +47,7 @@ std::u16string real_url(text.substr(after_scheme_and_colon)); --- a/components/url_formatter/url_fixer.cc +++ b/components/url_formatter/url_fixer.cc -@@ -576,6 +576,10 @@ GURL FixupURLInternal(const std::string& +@@ -575,6 +575,10 @@ GURL FixupURLInternal(const std::string& } } @@ -60,7 +60,7 @@ return GURL(parts.scheme.is_valid() ? text : FixupPath(text)); --- a/content/browser/child_process_security_policy_impl.cc +++ b/content/browser/child_process_security_policy_impl.cc -@@ -825,6 +825,7 @@ ChildProcessSecurityPolicyImpl::ChildPro +@@ -840,6 +840,7 @@ ChildProcessSecurityPolicyImpl::ChildPro RegisterWebSafeScheme(url::kWssScheme); #endif // BUILDFLAG(ENABLE_WEBSOCKETS) RegisterWebSafeScheme(url::kDataScheme); @@ -158,7 +158,7 @@ namespace net { -@@ -591,6 +593,12 @@ URLRequest::URLRequest(base::PassKey URLRe +@@ -584,6 +585,9 @@ std::unique_ptr URLRe } protocol_handlers_.clear(); @@ -193,7 +193,7 @@ if (cookie_deprecation_label_.has_value()) { --- a/url/url_constants.h +++ b/url/url_constants.h -@@ -45,6 +45,8 @@ inline constexpr char kMailToScheme[] = +@@ -47,6 +47,8 @@ inline constexpr char kMailToScheme[] = inline constexpr char16_t kMailToScheme16[] = u"mailto"; inline constexpr char kTelScheme[] = "tel"; inline constexpr char16_t kTelScheme16[] = u"tel"; @@ -204,7 +204,7 @@ inline constexpr char kUuidInPackageScheme[] = "uuid-in-package"; --- a/url/url_util.cc +++ b/url/url_util.cc -@@ -78,6 +78,7 @@ struct SchemeRegistry { +@@ -79,6 +79,7 @@ struct SchemeRegistry { kWssScheme, kDataScheme, kAboutScheme, @@ -212,7 +212,7 @@ }; // Schemes that normal pages cannot link to or access (i.e., with the same -@@ -92,6 +93,7 @@ struct SchemeRegistry { +@@ -93,6 +94,7 @@ struct SchemeRegistry { kAboutScheme, kJavaScriptScheme, kDataScheme, diff --git a/patches/core/ungoogled-chromium/build-without-webnn.patch b/patches/core/ungoogled-chromium/build-without-webnn.patch new file mode 100644 index 00000000..237e87db --- /dev/null +++ b/patches/core/ungoogled-chromium/build-without-webnn.patch @@ -0,0 +1,58 @@ +--- a/components/viz/service/BUILD.gn ++++ b/components/viz/service/BUILD.gn +@@ -284,7 +284,6 @@ viz_component("service") { + "//services/metrics/public/mojom", + "//services/tracing/public/cpp:cpp", + "//services/viz/privileged/mojom", +- "//services/webnn:webnn_service", + "//skia", + "//skia:skcms", + "//third_party/libyuv", +--- a/components/viz/service/gl/gpu_service_impl.cc ++++ b/components/viz/service/gl/gpu_service_impl.cc +@@ -902,15 +902,6 @@ void GpuServiceImpl::BindClientGmbInterf + void GpuServiceImpl::BindWebNNContextProvider( + mojo::PendingReceiver pending_receiver, + int client_id) { +- if (!main_runner_->BelongsToCurrentThread()) { +- main_runner_->PostTask( +- FROM_HERE, +- base::BindOnce(&GpuServiceImpl::BindWebNNContextProvider, weak_ptr_, +- std::move(pending_receiver), client_id)); +- return; +- } +- webnn::WebNNContextProviderImpl::Create(std::move(pending_receiver), +- GetContextState(), gpu_feature_info_); + } + #endif // !BUILDFLAG(IS_CHROMEOS) + +--- a/content/browser/BUILD.gn ++++ b/content/browser/BUILD.gn +@@ -229,7 +229,6 @@ source_set("browser") { + "//services/viz/privileged/mojom", + "//services/viz/public/cpp/gpu", + "//services/viz/public/mojom", +- "//services/webnn:webnn_service", + "//services/webnn:webnn_switches", + "//skia", + "//skia/public/mojom", +--- a/content/gpu/BUILD.gn ++++ b/content/gpu/BUILD.gn +@@ -75,7 +75,6 @@ target(link_target_type, "gpu_sources") + "//services/service_manager/public/mojom", + "//services/tracing/public/cpp", + "//services/viz/privileged/mojom", +- "//services/webnn:webnn_service", + "//services/webnn/public/mojom", + "//skia", + "//third_party/angle:angle_gpu_info_util", +--- a/services/BUILD.gn ++++ b/services/BUILD.gn +@@ -58,7 +58,6 @@ test("services_unittests") { + "//services/viz/public/cpp/compositing:tests", + "//services/viz/public/cpp/gpu:tests", + "//services/viz/public/cpp/hit_test:tests", +- "//services/webnn:tests", + ] + if (is_ios) { + bundle_deps = diff --git a/patches/core/ungoogled-chromium/disable-crash-reporter.patch b/patches/core/ungoogled-chromium/disable-crash-reporter.patch index c40ec847..37baf1cc 100644 --- a/patches/core/ungoogled-chromium/disable-crash-reporter.patch +++ b/patches/core/ungoogled-chromium/disable-crash-reporter.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -2548,24 +2548,6 @@ void ChromeContentBrowserClient::AppendE +@@ -2550,24 +2550,6 @@ void ChromeContentBrowserClient::AppendE command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -44,18 +44,18 @@ const base::FilePath& exe_path, --- a/components/gwp_asan/client/gwp_asan.cc +++ b/components/gwp_asan/client/gwp_asan.cc -@@ -241,6 +241,11 @@ bool IsMutuallyExclusiveFeatureAllowed(c +@@ -321,6 +321,11 @@ GWP_ASAN_EXPORT std::optional GetAllocatorSettings( -+ const base::Feature& a, bool b) { ++ const base::Feature& a, bool b, std::string_view c) { + return std::nullopt; +} +[[maybe_unused]] +std::optional DeadGetAllocatorSettings( const base::Feature& feature, - bool boost_sampling) { - if (!base::FeatureList::IsEnabled(feature)) + bool boost_sampling, + std::string_view process_type) { --- a/third_party/crashpad/crashpad/client/crashpad_client_linux.cc +++ b/third_party/crashpad/crashpad/client/crashpad_client_linux.cc @@ -748,8 +748,6 @@ void CrashpadClient::CrashWithoutDump(co diff --git a/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch b/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch index c5560800..01078ce0 100644 --- a/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch +++ b/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch @@ -2,7 +2,7 @@ --- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc +++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc -@@ -291,7 +291,7 @@ bool DomDistillerViewerSource::ShouldSer +@@ -292,7 +292,7 @@ bool DomDistillerViewerSource::ShouldSer std::string DomDistillerViewerSource::GetContentSecurityPolicy( network::mojom::CSPDirectiveName directive) { if (directive == network::mojom::CSPDirectiveName::StyleSrc) { diff --git a/patches/core/ungoogled-chromium/disable-gcm.patch b/patches/core/ungoogled-chromium/disable-gcm.patch index 872177b8..04efd3c0 100644 --- a/patches/core/ungoogled-chromium/disable-gcm.patch +++ b/patches/core/ungoogled-chromium/disable-gcm.patch @@ -2,7 +2,7 @@ --- a/components/gcm_driver/gcm_client_impl.cc +++ b/components/gcm_driver/gcm_client_impl.cc -@@ -448,6 +448,7 @@ void GCMClientImpl::StartGCM() { +@@ -449,6 +449,7 @@ void GCMClientImpl::StartGCM() { void GCMClientImpl::InitializeMCSClient() { DCHECK(network_connection_tracker_); @@ -10,7 +10,7 @@ std::vector endpoints; endpoints.push_back(gservices_settings_.GetMCSMainEndpoint()); GURL fallback_endpoint = gservices_settings_.GetMCSFallbackEndpoint(); -@@ -652,28 +653,6 @@ void GCMClientImpl::RemoveHeartbeatInter +@@ -653,28 +654,6 @@ void GCMClientImpl::RemoveHeartbeatInter void GCMClientImpl::StartCheckin() { DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); @@ -39,7 +39,7 @@ } void GCMClientImpl::OnCheckinCompleted( -@@ -730,24 +709,6 @@ void GCMClientImpl::SetGServicesSettings +@@ -731,24 +710,6 @@ void GCMClientImpl::SetGServicesSettings void GCMClientImpl::SchedulePeriodicCheckin() { DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); diff --git a/patches/core/ungoogled-chromium/disable-google-host-detection.patch b/patches/core/ungoogled-chromium/disable-google-host-detection.patch index f864c94f..c917dc59 100644 --- a/patches/core/ungoogled-chromium/disable-google-host-detection.patch +++ b/patches/core/ungoogled-chromium/disable-google-host-detection.patch @@ -190,16 +190,16 @@ #if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS) --- a/components/google/core/common/google_util.cc +++ b/components/google/core/common/google_util.cc -@@ -31,110 +31,6 @@ namespace google_util { +@@ -31,111 +31,6 @@ namespace google_util { namespace { --bool IsPathHomePageBase(base::StringPiece path) { +-bool IsPathHomePageBase(std::string_view path) { - return (path == "/") || (path == "/webhp"); -} - -// Removes a single trailing dot if present in |host|. --void StripTrailingDot(base::StringPiece* host) { +-void StripTrailingDot(std::string_view* host) { - if (base::EndsWith(*host, ".")) - host->remove_suffix(1); -} @@ -209,13 +209,14 @@ -// ALLOW_SUBDOMAIN, we check against host "*.." -// instead. -template --bool IsValidHostName(base::StringPiece host, -- base::StringPiece domain_in_lower_case, +-bool IsValidHostName(std::string_view host, +- std::string_view domain_in_lower_case, - SubdomainPermission subdomain_permission, - const Container& allowed_tlds) { - // Fast path to avoid searching the registry set. -- if (host.find(domain_in_lower_case) == base::StringPiece::npos) +- if (host.find(domain_in_lower_case) == std::string_view::npos) { - return false; +- } - - size_t tld_length = - net::registry_controlled_domains::GetCanonicalHostRegistryLength( @@ -225,10 +226,10 @@ - return false; - - // Removes the tld and the preceding dot. -- base::StringPiece host_minus_tld = +- std::string_view host_minus_tld = - host.substr(0, host.length() - tld_length - 1); - -- base::StringPiece tld = host.substr(host.length() - tld_length); +- std::string_view tld = host.substr(host.length() - tld_length); - // Remove the trailing dot from tld if present, as for Google domains it's the - // same page. - StripTrailingDot(&tld); @@ -260,22 +261,22 @@ - (port_permission == ALLOW_NON_STANDARD_PORTS)); -} - --bool IsCanonicalHostGoogleHostname(base::StringPiece canonical_host, +-bool IsCanonicalHostGoogleHostname(std::string_view canonical_host, - SubdomainPermission subdomain_permission) { - const GURL& base_url(CommandLineGoogleBaseURL()); - if (base_url.is_valid() && (canonical_host == base_url.host_piece())) - return true; - - static constexpr auto google_tlds = -- base::MakeFixedFlatSet({GOOGLE_TLD_LIST}); +- base::MakeFixedFlatSet({GOOGLE_TLD_LIST}); - return IsValidHostName(canonical_host, "google", subdomain_permission, - google_tlds); -} - --bool IsCanonicalHostYoutubeHostname(base::StringPiece canonical_host, +-bool IsCanonicalHostYoutubeHostname(std::string_view canonical_host, - SubdomainPermission subdomain_permission) { - static constexpr auto youtube_tlds = -- base::MakeFixedFlatSet({YOUTUBE_TLD_LIST}); +- base::MakeFixedFlatSet({YOUTUBE_TLD_LIST}); - - return IsValidHostName(canonical_host, "youtube", subdomain_permission, - youtube_tlds); @@ -288,11 +289,11 @@ - if (!IsValidURL(url, PortPermission::DISALLOW_NON_STANDARD_PORTS)) - return false; - -- base::StringPiece host(url.host_piece()); +- std::string_view host(url.host_piece()); - StripTrailingDot(&host); - - static constexpr auto google_subdomains = -- base::MakeFixedFlatSet( +- base::MakeFixedFlatSet( - {"ipv4.google.com", "ipv6.google.com"}); - - return google_subdomains.contains(host); @@ -301,20 +302,20 @@ } // namespace // Global functions ----------------------------------------------------------- -@@ -142,12 +38,6 @@ bool IsGoogleSearchSubdomainUrl(const GU +@@ -143,12 +38,6 @@ bool IsGoogleSearchSubdomainUrl(const GU const char kGoogleHomepageURL[] = "trk:113:https://www.google.com/"; - bool HasGoogleSearchQueryParam(base::StringPiece str) { + bool HasGoogleSearchQueryParam(std::string_view str) { - url::Component query(0, static_cast(str.length())), key, value; - while (url::ExtractQueryKeyValue(str, &query, &key, &value)) { -- base::StringPiece key_str = str.substr(key.begin, key.len); +- std::string_view key_str = str.substr(key.begin, key.len); - if (key_str == "q" || key_str == "as_q" || key_str == "imgurl") - return true; - } return false; } -@@ -158,162 +48,53 @@ std::string GetGoogleLocale(const std::s +@@ -159,162 +48,53 @@ std::string GetGoogleLocale(const std::s GURL AppendGoogleLocaleParam(const GURL& url, const std::string& application_locale) { @@ -324,13 +325,13 @@ } std::string GetGoogleCountryCode(const GURL& google_homepage_url) { -- base::StringPiece google_hostname = google_homepage_url.host_piece(); +- std::string_view google_hostname = google_homepage_url.host_piece(); - // TODO(igorcov): This needs a fix for case when the host has a trailing dot, - // like "google.com./". https://crbug.com/720295. - const size_t last_dot = google_hostname.find_last_of('.'); - if (last_dot == std::string::npos) - return std::string(); -- base::StringPiece country_code = google_hostname.substr(last_dot + 1); +- std::string_view country_code = google_hostname.substr(last_dot + 1); - // Assume the com TLD implies the US. - if (country_code == "com") - return "us"; @@ -391,7 +392,7 @@ + return false; } - bool IsGoogleHostname(base::StringPiece host, + bool IsGoogleHostname(std::string_view host, SubdomainPermission subdomain_permission) { - url::CanonHostInfo host_info; - return IsCanonicalHostGoogleHostname(net::CanonicalizeHost(host, &host_info), @@ -408,7 +409,7 @@ - } - - // Make sure the path is a known home page path. -- base::StringPiece path(url.path_piece()); +- std::string_view path(url.path_piece()); - return IsPathHomePageBase(path) || - base::StartsWith(path, "/ig", base::CompareCase::INSENSITIVE_ASCII); + return false; @@ -423,7 +424,7 @@ - } - - // Make sure the path is a known search path. -- base::StringPiece path(url.path_piece()); +- std::string_view path(url.path_piece()); - bool is_home_page_base = IsPathHomePageBase(path); - if (!is_home_page_base && path != "/search" && path != "/imgres") - return false; @@ -489,7 +490,7 @@ --- a/components/page_load_metrics/browser/page_load_metrics_util.cc +++ b/components/page_load_metrics/browser/page_load_metrics_util.cc -@@ -283,9 +283,7 @@ bool DidObserveLoadingBehaviorInAnyFrame +@@ -284,9 +284,7 @@ bool DidObserveLoadingBehaviorInAnyFrame } bool IsGoogleSearchHostname(const GURL& url) { @@ -502,7 +503,7 @@ bool IsGoogleSearchResultUrl(const GURL& url) { --- a/components/page_load_metrics/common/page_load_metrics_util.cc +++ b/components/page_load_metrics/common/page_load_metrics_util.cc -@@ -24,38 +24,7 @@ const int kExtraBufferTimerDelayMillis = +@@ -25,38 +25,7 @@ const int kExtraBufferTimerDelayMillis = } // namespace std::optional GetGoogleHostnamePrefix(const GURL& url) { @@ -518,14 +519,14 @@ - // want to match URLs like www.google.appspot.com. - net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES); - -- const base::StringPiece hostname = url.host_piece(); +- const std::string_view hostname = url.host_piece(); - if (registry_length == 0 || registry_length == std::string::npos || - registry_length >= hostname.length()) { - return std::nullopt; - } - - // Removes the tld and the preceding dot. -- const base::StringPiece hostname_minus_registry = +- const std::string_view hostname_minus_registry = - hostname.substr(0, hostname.length() - (registry_length + 1)); - - if (hostname_minus_registry == "google") @@ -662,7 +663,7 @@ } // namespace variations --- a/net/base/url_util.cc +++ b/net/base/url_util.cc -@@ -489,28 +489,6 @@ bool HasGoogleHost(const GURL& url) { +@@ -495,28 +495,6 @@ bool HasGoogleHost(const GURL& url) { } bool IsGoogleHost(std::string_view host) { diff --git a/patches/core/ungoogled-chromium/disable-mei-preload.patch b/patches/core/ungoogled-chromium/disable-mei-preload.patch index 0ddf5c4d..178e1cab 100644 --- a/patches/core/ungoogled-chromium/disable-mei-preload.patch +++ b/patches/core/ungoogled-chromium/disable-mei-preload.patch @@ -15,7 +15,7 @@ "//third_party/widevine/cdm", ] if (invoker.collect_inputs_only) { -@@ -1218,7 +1217,6 @@ if (is_win) { +@@ -1219,7 +1218,6 @@ if (is_win) { ":optimization_guide_library", ":swiftshader_library", ":widevine_cdm_library", diff --git a/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch index edc5c143..a9c8dd21 100644 --- a/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch +++ b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch @@ -20,7 +20,7 @@ } // static -@@ -757,7 +757,7 @@ void PrivacySandboxSettingsImpl::SetTopi +@@ -774,7 +774,7 @@ void PrivacySandboxSettingsImpl::SetTopi } bool PrivacySandboxSettingsImpl::IsPrivacySandboxRestricted() const { @@ -29,7 +29,7 @@ } bool PrivacySandboxSettingsImpl::IsPrivacySandboxCurrentlyUnrestricted() const { -@@ -826,11 +826,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa +@@ -843,11 +843,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa return Status::kIncognitoProfile; } diff --git a/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch b/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch index 691e4ae3..9ba5e37b 100644 --- a/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch +++ b/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -176,31 +176,13 @@ void WebRtcLogUploader::OnLoggingStopped +@@ -179,31 +179,13 @@ void WebRtcLogUploader::OnLoggingStopped DCHECK(meta_data.get()); DCHECK(!upload_done_data.paths.directory.empty()); @@ -35,7 +35,7 @@ } else { main_task_runner_->PostTask( FROM_HERE, -@@ -217,28 +199,7 @@ void WebRtcLogUploader::PrepareMultipart +@@ -220,28 +202,7 @@ void WebRtcLogUploader::PrepareMultipart DCHECK(!compressed_log.empty()); DCHECK(meta_data.get()); @@ -65,7 +65,7 @@ } void WebRtcLogUploader::UploadStoredLog( -@@ -305,48 +266,6 @@ void WebRtcLogUploader::LoggingStoppedDo +@@ -308,48 +269,6 @@ void WebRtcLogUploader::LoggingStoppedDo DCHECK(log_buffer.get()); DCHECK(!log_paths.directory.empty()); diff --git a/patches/core/ungoogled-chromium/disable-webstore-urls.patch b/patches/core/ungoogled-chromium/disable-webstore-urls.patch index b3b415ac..e8b52083 100644 --- a/patches/core/ungoogled-chromium/disable-webstore-urls.patch +++ b/patches/core/ungoogled-chromium/disable-webstore-urls.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc +++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc -@@ -720,12 +720,6 @@ std::vector ChromeContentBr +@@ -624,12 +624,6 @@ std::vector ChromeContentBr GetOriginsRequiringDedicatedProcess() { std::vector list; diff --git a/patches/core/ungoogled-chromium/doh-changes.patch b/patches/core/ungoogled-chromium/doh-changes.patch index 40ea63cd..64bf4383 100644 --- a/patches/core/ungoogled-chromium/doh-changes.patch +++ b/patches/core/ungoogled-chromium/doh-changes.patch @@ -1,6 +1,6 @@ --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -361,12 +361,7 @@ BASE_FEATURE(kDisruptiveNotificationPerm +@@ -345,12 +345,7 @@ BASE_FEATURE(kDisruptiveNotificationPerm // Enable DNS over HTTPS (DoH). BASE_FEATURE(kDnsOverHttps, "DnsOverHttps", diff --git a/patches/core/ungoogled-chromium/extensions-manifestv2.patch b/patches/core/ungoogled-chromium/extensions-manifestv2.patch new file mode 100644 index 00000000..2e4d4d59 --- /dev/null +++ b/patches/core/ungoogled-chromium/extensions-manifestv2.patch @@ -0,0 +1,93 @@ +--- a/chrome/browser/extensions/chrome_browser_context_keyed_service_factories.cc ++++ b/chrome/browser/extensions/chrome_browser_context_keyed_service_factories.cc +@@ -22,7 +22,6 @@ + #include "chrome/browser/extensions/extension_web_ui_override_registrar.h" + #include "chrome/browser/extensions/install_tracker_factory.h" + #include "chrome/browser/extensions/install_verifier_factory.h" +-#include "chrome/browser/extensions/manifest_v2_experiment_manager.h" + #include "chrome/browser/extensions/menu_manager_factory.h" + #include "chrome/browser/extensions/permissions/permissions_updater.h" + #include "chrome/browser/extensions/plugin_manager.h" +@@ -48,7 +47,6 @@ void EnsureChromeBrowserContextKeyedServ + extensions::IncognitoConnectability::EnsureFactoryBuilt(); + extensions::InstallTrackerFactory::GetInstance(); + extensions::InstallVerifierFactory::GetInstance(); +- extensions::ManifestV2ExperimentManager::GetFactory(); + extensions::MenuManagerFactory::GetInstance(); + extensions::PermissionsUpdater::EnsureAssociatedFactoryBuilt(); + #if BUILDFLAG(ENABLE_PLUGINS) +--- a/chrome/browser/extensions/extension_management.cc ++++ b/chrome/browser/extensions/extension_management.cc +@@ -287,31 +287,7 @@ bool ExtensionManagement::IsAllowedManif + int manifest_version, + const std::string& extension_id, + Manifest::Type manifest_type) { +- bool enabled_by_default = +- !base::FeatureList::IsEnabled( +- extensions_features::kExtensionsManifestV3Only) || +- manifest_version >= 3; +- +- // Manifest version policy only supports normal extensions and Chrome OS login +- // screen extension. +- if (manifest_type != Manifest::Type::TYPE_EXTENSION && +- manifest_type != Manifest::Type::TYPE_LOGIN_SCREEN_EXTENSION) { +- return enabled_by_default; +- } +- switch (global_settings_->manifest_v2_setting) { +- case internal::GlobalSettings::ManifestV2Setting::kDefault: +- return enabled_by_default; +- case internal::GlobalSettings::ManifestV2Setting::kDisabled: +- return manifest_version >= 3; +- case internal::GlobalSettings::ManifestV2Setting::kEnabled: + return true; +- case internal::GlobalSettings::ManifestV2Setting::kEnabledForForceInstalled: +- auto installation_mode = +- GetInstallationMode(extension_id, /*update_url=*/std::string()); +- return manifest_version >= 3 || +- installation_mode == INSTALLATION_FORCED || +- installation_mode == INSTALLATION_RECOMMENDED; +- } + } + + bool ExtensionManagement::IsAllowedManifestVersion(const Extension* extension) { +@@ -332,26 +308,8 @@ bool ExtensionManagement::IsExemptFromMV + return false; + } + +- switch (global_settings_->manifest_v2_setting) { +- case internal::GlobalSettings::ManifestV2Setting::kDefault: +- // Default browser behavior. Not exempt. +- return false; +- case internal::GlobalSettings::ManifestV2Setting::kDisabled: +- // All MV2 extensions are disallowed. Not exempt. +- return false; +- case internal::GlobalSettings::ManifestV2Setting::kEnabled: + // All MV2 extensions are allowed. Exempt. + return true; +- case internal::GlobalSettings::ManifestV2Setting::kEnabledForForceInstalled: +- // Force-installed MV2 extensions are allowed. Exempt if it's a force- +- // installed extension only. +- auto installation_mode = +- GetInstallationMode(extension_id, /*update_url=*/std::string()); +- return installation_mode == INSTALLATION_FORCED || +- installation_mode == INSTALLATION_RECOMMENDED; +- } +- +- return false; + } + + bool ExtensionManagement::IsAllowedByUnpublishedAvailabilityPolicy( +--- a/chrome/browser/extensions/manifest_v2_experiment_manager.cc ++++ b/chrome/browser/extensions/manifest_v2_experiment_manager.cc +@@ -76,11 +76,6 @@ KeyedService* ManifestV2ExperimentManage + } + + MV2ExperimentStage CalculateCurrentExperimentStage() { +- if (base::FeatureList::IsEnabled( +- extensions_features::kExtensionManifestV2DeprecationWarning)) { +- return MV2ExperimentStage::kWarning; +- } +- + return MV2ExperimentStage::kNone; + } + diff --git a/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch b/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch index efe1d891..d5fc94dd 100644 --- a/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch +++ b/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch @@ -14,7 +14,7 @@ # from disk image and Keystone promotion (if so enabled). It --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -853,10 +853,6 @@ static_library("browser") { +@@ -850,10 +850,6 @@ static_library("browser") { "navigation_predictor/navigation_predictor_metrics_document_data.h", "navigation_predictor/navigation_predictor_preconnect_client.cc", "navigation_predictor/navigation_predictor_preconnect_client.h", @@ -25,7 +25,7 @@ "navigation_predictor/search_engine_preconnector.cc", "navigation_predictor/search_engine_preconnector.h", "net/chrome_mojo_proxy_resolver_factory.cc", -@@ -969,10 +965,6 @@ static_library("browser") { +@@ -972,10 +968,6 @@ static_library("browser") { "optimization_guide/chrome_prediction_model_store.h", "optimization_guide/model_execution/chrome_on_device_model_service_controller.cc", "optimization_guide/model_execution/chrome_on_device_model_service_controller.h", @@ -44,10 +44,10 @@ #include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h" -#include "chrome/browser/navigation_predictor/preloading_model_keyed_service.h" -#include "chrome/browser/navigation_predictor/preloading_model_keyed_service_factory.h" - #include "chrome/browser/preloading/prefetch/no_state_prefetch/no_state_prefetch_manager_factory.h" #include "chrome/browser/preloading/preloading_prefs.h" #include "chrome/browser/profiles/profile.h" -@@ -95,11 +93,6 @@ base::TimeDelta MLModelExecutionTimerSta + #include "components/no_state_prefetch/browser/no_state_prefetch_manager.h" +@@ -94,11 +92,6 @@ base::TimeDelta MLModelExecutionTimerSta return base::Milliseconds(timer_start_delay); } @@ -57,9 +57,9 @@ - return base::Milliseconds(timer_interval); -} - bool MaySendTraffic() { - // TODO(b/290223353): Due to concerns about the amount of traffic this feature -@@ -364,71 +357,6 @@ void NavigationPredictor::ProcessPointer + bool MLModelOneExecutionPerHover() { + static bool one_execution_per_hover = +@@ -369,80 +362,6 @@ void NavigationPredictor::ProcessPointer } void NavigationPredictor::OnMLModelExecutionTimerFired() { @@ -122,7 +122,16 @@ - base::BindOnce(&NavigationPredictor::OnPreloadingHeuristicsModelDone, - weak_ptr_factory_.GetWeakPtr(), anchor.target_url)); - -- if (!ml_model_execution_timer_.IsRunning()) { +- // TODO(crbug.com/40278151): In its current form, the model does not seem to +- // ever increase in confidence when dwelling on an anchor, which makes +- // repeated executions wasteful. So we only do one execution per mouse over. +- // As we iterate on the model, multiple executions may become useful, but we +- // need to take care to not produce a large amount of redundant predictions +- // (as seen in crbug.com/338200075 ). Other ideas here could be to only report +- // when the score differs from the previous execution and/or to have a fixed +- // limit on the number of executions while dwelling. +- if (!MLModelOneExecutionPerHover() && +- !ml_model_execution_timer_.IsRunning()) { - ml_model_execution_timer_.Start( - FROM_HERE, MLModelExecutionTimerInterval(), - base::BindOnce(&NavigationPredictor::OnMLModelExecutionTimerFired, @@ -133,7 +142,7 @@ void NavigationPredictor::SetModelScoreCallbackForTesting( --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -93,7 +93,6 @@ +@@ -92,7 +92,6 @@ #include "chrome/browser/media_galleries/media_galleries_preferences_factory.h" #include "chrome/browser/metrics/variations/google_groups_updater_service_factory.h" #include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h" @@ -141,7 +150,7 @@ #include "chrome/browser/net/dns_probe_service_factory.h" #include "chrome/browser/net/profile_network_context_service_factory.h" #include "chrome/browser/notifications/metrics/notification_metrics_logger_factory.h" -@@ -931,7 +930,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -939,7 +938,6 @@ void ChromeBrowserMainExtraPartsProfiles #endif ModelTypeStoreServiceFactory::GetInstance(); NavigationPredictorKeyedServiceFactory::GetInstance(); @@ -149,8 +158,8 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) NearbySharingServiceFactory::GetInstance(); if (base::FeatureList::IsEnabled(ash::features::kNearbyPresence)) { -@@ -978,9 +976,6 @@ void ChromeBrowserMainExtraPartsProfiles - } +@@ -984,9 +982,6 @@ void ChromeBrowserMainExtraPartsProfiles + OneTimePermissionsTrackerFactory::GetInstance(); #endif OpenerHeuristicServiceFactory::GetInstance(); - if (optimization_guide::ShouldStartModelValidator()) { @@ -169,7 +178,7 @@ #include "chrome/browser/permissions/adaptive_quiet_notification_permission_ui_enabler.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/profiles/delete_profile_helper.h" -@@ -1543,9 +1542,6 @@ void ProfileManager::DoFinalInitForServi +@@ -1542,9 +1541,6 @@ void ProfileManager::DoFinalInitForServi // Ensure NavigationPredictorKeyedService is started. NavigationPredictorKeyedServiceFactory::GetForProfile(profile); @@ -311,8 +320,8 @@ } // namespace settings --- a/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_page_handler.cc +++ b/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_page_handler.cc -@@ -15,8 +15,6 @@ - #include "base/values.h" +@@ -17,8 +17,6 @@ + #include "chrome/browser/accessibility/pdf_ocr_controller_factory.h" #include "chrome/browser/browser_features.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/screen_ai/screen_ai_service_router.h" @@ -320,7 +329,7 @@ #include "chrome/browser/translate/chrome_translate_client.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" -@@ -214,15 +212,6 @@ ReadAnythingUntrustedPageHandler::ReadAn +@@ -298,21 +296,6 @@ ReadAnythingUntrustedPageHandler::ReadAn highlightGranularity); } @@ -332,10 +341,65 @@ - base::BindOnce( - &ReadAnythingUntrustedPageHandler::OnScreenAIServiceInitialized, - weak_factory_.GetWeakPtr())); +- } +- if (features::IsPdfOcrEnabled()) { +- screen_ai::ScreenAIServiceRouterFactory::GetForBrowserContext( +- browser_->profile()) +- ->GetServiceStateAsync(screen_ai::ScreenAIServiceRouter::Service::kOCR, +- base::DoNothing()); - } OnActiveWebContentsChanged(); + +@@ -716,10 +699,6 @@ void ReadAnythingUntrustedPageHandler::S + inner_contents[0]->GetPrimaryMainFrame()->GetLastCommittedOrigin())) { + pdf_observer_ = std::make_unique( + weak_factory_.GetSafeRef(), inner_contents[0], kReadAnythingAXMode); +- if (features::IsPdfOcrEnabled()) { +- screen_ai::PdfOcrControllerFactory::GetForProfile(browser_->profile()) +- ->Activate(); +- } + } } + +--- a/chrome/renderer/BUILD.gn ++++ b/chrome/renderer/BUILD.gn +@@ -423,10 +423,6 @@ static_library("renderer") { + sources += [ + "accessibility/ax_tree_distiller.cc", + "accessibility/ax_tree_distiller.h", +- "accessibility/read_anything_app_controller.cc", +- "accessibility/read_anything_app_controller.h", +- "accessibility/read_anything_app_model.cc", +- "accessibility/read_anything_app_model.h", + "media/chrome_speech_recognition_client.cc", + "media/chrome_speech_recognition_client.h", + "searchbox/searchbox.cc", +--- a/chrome/renderer/chrome_render_frame_observer.cc ++++ b/chrome/renderer/chrome_render_frame_observer.cc +@@ -320,22 +320,6 @@ void ChromeRenderFrameObserver::DidCommi + } + + void ChromeRenderFrameObserver::DidClearWindowObject() { +-#if !BUILDFLAG(IS_ANDROID) +- const base::CommandLine& command_line = +- *base::CommandLine::ForCurrentProcess(); +- if (command_line.HasSwitch(switches::kInstantProcess)) +- SearchBoxExtension::Install(render_frame()->GetWebFrame()); +- +- // Install ReadAnythingAppController on render frames with the Read Anything +- // url, which is chrome-untrusted. ReadAnythingAppController installs v8 +- // bindings in the chrome.readingMode namespace which are consumed by +- // read_anything/app.ts, the resource of the Read Anything WebUI. +- if (features::IsReadAnythingEnabled() && +- render_frame()->GetWebFrame()->GetDocument().Url() == +- chrome::kChromeUIUntrustedReadAnythingSidePanelURL) { +- ReadAnythingAppController::Install(render_frame()); +- } +-#endif // !BUILDFLAG(IS_ANDROID) + } + + void ChromeRenderFrameObserver::DidMeaningfulLayout( --- a/chrome/test/chromedriver/BUILD.gn +++ b/chrome/test/chromedriver/BUILD.gn @@ -405,7 +405,7 @@ source_set("lib") { @@ -359,7 +423,7 @@ python_library("fixtures") { --- a/components/omnibox/browser/autocomplete_classifier.cc +++ b/components/omnibox/browser/autocomplete_classifier.cc -@@ -99,8 +99,6 @@ void AutocompleteClassifier::Classify( +@@ -103,8 +103,6 @@ void AutocompleteClassifier::Classify( metrics::OmniboxEventProto::PageClassification page_classification, AutocompleteMatch* match, GURL* alternate_nav_url) { @@ -381,7 +445,7 @@ fuzzer_test("update_client_protocol_serializer_fuzzer") { --- a/content/shell/BUILD.gn +++ b/content/shell/BUILD.gn -@@ -766,10 +766,6 @@ if (is_apple) { +@@ -802,10 +802,6 @@ if (is_apple) { deps = [ "//third_party/icu:icudata" ] } @@ -392,6 +456,26 @@ if (v8_use_external_startup_data) { public_deps += [ "//v8" ] if (use_v8_context_snapshot) { +--- a/services/passage_embeddings/passage_embeddings_service.cc ++++ b/services/passage_embeddings/passage_embeddings_service.cc +@@ -6,7 +6,6 @@ + + #include "base/files/file.h" + #include "components/optimization_guide/machine_learning_tflite_buildflags.h" +-#include "services/passage_embeddings/passage_embedder.h" + + namespace passage_embeddings { + +--- a/services/passage_embeddings/passage_embeddings_service.h ++++ b/services/passage_embeddings/passage_embeddings_service.h +@@ -11,7 +11,6 @@ + + namespace passage_embeddings { + +-class PassageEmbedder; + + // Class implementation of the passage embeddings service mojo interface. + class PassageEmbeddingsService : public mojom::PassageEmbeddingsService { --- a/services/screen_ai/buildflags/features.gni +++ b/services/screen_ai/buildflags/features.gni @@ -7,14 +7,13 @@ import("//build/config/sanitizers/saniti @@ -401,8 +485,8 @@ - enable_screen_ai_service = is_linux || is_mac || is_chromeos || is_win + enable_screen_ai_service = false - # Screen AI library is not yet available for browser tests on ChromeOS. - # TODO(b/40267312): Expand this browser test for all supported targets. + # Screen AI library is not available for browser tests on ChromeOS. Tast tests + # cover library's OCR functionality on ChromeOS. enable_screen_ai_browsertests = - is_linux || (is_mac && (target_cpu == "arm64" || target_cpu == "x64")) || - (is_win && (target_cpu == "x64" || target_cpu == "x86")) @@ -424,7 +508,7 @@ group("devtools_all_files") { --- a/third_party/devtools-frontend/src/front_end/BUILD.gn +++ b/third_party/devtools-frontend/src/front_end/BUILD.gn -@@ -185,7 +185,6 @@ group("unittests") { +@@ -184,7 +184,6 @@ group("unittests") { "panels/sources/components:unittests", "panels/timeline:unittests", "panels/timeline/components:unittests", diff --git a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch index 6df74283..2126f2b0 100644 --- a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch +++ b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -639,8 +639,6 @@ static_library("browser") { +@@ -636,8 +636,6 @@ static_library("browser") { "internal_auth.h", "interstitials/chrome_settings_page_helper.cc", "interstitials/chrome_settings_page_helper.h", @@ -11,17 +11,25 @@ "invalidation/profile_invalidation_provider_factory.cc", "invalidation/profile_invalidation_provider_factory.h", "k_anonymity_service/k_anonymity_service_client.cc", -@@ -3845,9 +3843,6 @@ static_library("browser") { +@@ -3900,8 +3898,6 @@ static_library("browser") { "enterprise/connectors/analysis/analysis_service_settings.h", "enterprise/connectors/analysis/analysis_settings.cc", "enterprise/connectors/analysis/analysis_settings.h", - "enterprise/connectors/analysis/content_analysis_delegate.cc", - "enterprise/connectors/analysis/content_analysis_delegate.h", -- "enterprise/connectors/analysis/content_analysis_delegate_base.h", + "enterprise/connectors/analysis/content_analysis_delegate_base.h", "enterprise/connectors/analysis/content_analysis_dialog.cc", "enterprise/connectors/analysis/content_analysis_dialog.h", - "enterprise/connectors/analysis/content_analysis_downloads_delegate.cc", -@@ -4159,10 +4154,6 @@ static_library("browser") { +@@ -3909,8 +3905,6 @@ static_library("browser") { + "enterprise/connectors/analysis/content_analysis_downloads_delegate.h", + "enterprise/connectors/analysis/files_request_handler.cc", + "enterprise/connectors/analysis/files_request_handler.h", +- "enterprise/connectors/analysis/page_print_analysis_request.cc", +- "enterprise/connectors/analysis/page_print_analysis_request.h", + "enterprise/connectors/analysis/request_handler_base.cc", + "enterprise/connectors/analysis/request_handler_base.h", + "enterprise/connectors/common.cc", +@@ -4208,10 +4202,6 @@ static_library("browser") { "new_tab_page/modules/recipes/recipes_service_factory.h", "new_tab_page/modules/recipes/time_format_util.cc", "new_tab_page/modules/recipes/time_format_util.h", @@ -32,7 +40,7 @@ "new_tab_page/modules/v2/history_clusters/history_clusters_page_handler_v2.cc", "new_tab_page/modules/v2/history_clusters/history_clusters_page_handler_v2.h", "new_tab_page/modules/v2/most_relevant_tab_resumption/most_relevant_tab_resumption_page_handler.cc", -@@ -4644,7 +4635,6 @@ static_library("browser") { +@@ -4695,7 +4685,6 @@ static_library("browser") { "//chrome/browser/new_tab_page/modules/history_clusters/discount:mojo_bindings", "//chrome/browser/new_tab_page/modules/photos:mojo_bindings", "//chrome/browser/new_tab_page/modules/recipes:mojo_bindings", @@ -40,18 +48,21 @@ "//chrome/browser/new_tab_page/modules/v2/history_clusters:mojo_bindings", "//chrome/browser/new_tab_page/modules/v2/most_relevant_tab_resumption:mojo_bindings", "//chrome/browser/new_tab_page/modules/v2/tab_resumption:mojo_bindings", -@@ -6497,10 +6487,6 @@ static_library("browser") { +@@ -7231,13 +7220,6 @@ static_library("browser") { + } + } + +- if (enterprise_content_analysis) { +- sources += [ +- "enterprise/data_protection/print_utils.cc", +- "enterprise/data_protection/print_utils.h", +- ] +- deps += [ "//components/enterprise/connectors" ] +- } + + if (enable_captive_portal_detection) { sources += [ - "enterprise/chrome_browser_main_extra_parts_enterprise.cc", - "enterprise/chrome_browser_main_extra_parts_enterprise.h", -- "enterprise/connectors/analysis/local_binary_upload_service.cc", -- "enterprise/connectors/analysis/local_binary_upload_service.h", -- "enterprise/connectors/analysis/local_binary_upload_service_factory.cc", -- "enterprise/connectors/analysis/local_binary_upload_service_factory.h", - "enterprise/connectors/device_trust/attestation/browser/attestation_switches.cc", - "enterprise/connectors/device_trust/attestation/browser/attestation_switches.h", - "enterprise/connectors/device_trust/attestation/browser/attester.h", -@@ -8006,9 +7992,14 @@ static_library("browser") { +@@ -8088,9 +8070,14 @@ static_library("browser") { "//components/safe_browsing/content/browser:safe_browsing_blocking_page", "//components/safe_browsing/content/browser/download:download_stats", "//components/safe_browsing/content/common:file_type_policies", @@ -69,7 +80,7 @@ sources += [ --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -5202,11 +5202,13 @@ ChromeContentBrowserClient::CreateThrott +@@ -5220,11 +5220,13 @@ ChromeContentBrowserClient::CreateThrott &throttles); #endif @@ -83,7 +94,7 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: -@@ -7030,26 +7032,7 @@ ChromeContentBrowserClient::GetSafeBrows +@@ -7063,26 +7065,7 @@ ChromeContentBrowserClient::GetSafeBrows const std::vector& allowlist_domains) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); @@ -111,7 +122,7 @@ } safe_browsing::RealTimeUrlLookupServiceBase* -@@ -7070,11 +7053,6 @@ ChromeContentBrowserClient::GetUrlLookup +@@ -7103,11 +7086,6 @@ ChromeContentBrowserClient::GetUrlLookup GetForProfile(profile); } #endif @@ -123,7 +134,7 @@ return nullptr; } -@@ -7086,32 +7064,7 @@ ChromeContentBrowserClient::GetAsyncChec +@@ -7119,32 +7097,7 @@ ChromeContentBrowserClient::GetAsyncChec safe_browsing::hash_realtime_utils::HashRealTimeSelection hash_realtime_selection, int frame_tree_node_id) { @@ -158,7 +169,7 @@ void ChromeContentBrowserClient::ReportLegacyTechEvent( --- a/chrome/browser/download/bubble/download_bubble_ui_controller.cc +++ b/chrome/browser/download/bubble/download_bubble_ui_controller.cc -@@ -29,7 +29,6 @@ +@@ -31,7 +31,6 @@ #include "chrome/browser/feature_engagement/tracker_factory.h" #include "chrome/browser/offline_items_collection/offline_content_aggregator_factory.h" #include "chrome/browser/profiles/profile_key.h" @@ -166,7 +177,7 @@ #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" -@@ -44,7 +43,6 @@ +@@ -46,7 +45,6 @@ #include "components/feature_engagement/public/tracker.h" #include "components/offline_items_collection/core/offline_content_aggregator.h" #include "components/safe_browsing/core/common/features.h" @@ -174,10 +185,10 @@ #include "content/public/browser/download_item_utils.h" #include "content/public/browser/download_manager.h" -@@ -255,21 +253,11 @@ void DownloadBubbleUIController::Process +@@ -272,14 +270,6 @@ void DownloadBubbleUIController::Process switch (command) { case DownloadCommands::KEEP: - case DownloadCommands::DISCARD: + case DownloadCommands::DISCARD: { - if (safe_browsing::IsSafeBrowsingSurveysEnabled(*profile_->GetPrefs())) { - TrustSafetySentimentService* trust_safety_sentiment_service = - TrustSafetySentimentServiceFactory::GetForProfile(profile_); @@ -186,17 +197,19 @@ - warning_surface, warning_action); - } - } - DownloadItemWarningData::AddWarningActionEvent( - model->GetDownloadItem(), warning_surface, warning_action); - commands.ExecuteCommand(command); + DownloadItemWarningData::AddWarningActionEvent(item, warning_surface, + warning_action); + // Launch a HaTS survey. Note this needs to come before the command is +@@ -298,8 +288,6 @@ void DownloadBubbleUIController::Process break; + } case DownloadCommands::REVIEW: - model->ReviewScanningVerdict( - browser_->tab_strip_model()->GetActiveWebContents()); break; case DownloadCommands::RETRY: RetryDownload(model.get(), command); -@@ -386,6 +374,4 @@ DownloadBubbleUIController::GetWeakPtr() +@@ -444,6 +432,4 @@ DownloadBubbleUIController::GetWeakPtr() } void DownloadBubbleUIController::SetDeepScanNoticeSeen() { @@ -213,7 +226,7 @@ using ConnectionType = net::NetworkChangeNotifier::ConnectionType; #if BUILDFLAG(FULL_SAFE_BROWSING) -@@ -655,15 +654,6 @@ bool ChromeDownloadManagerDelegate::Shou +@@ -659,15 +658,6 @@ bool ChromeDownloadManagerDelegate::Shou #endif bool should_open = download_prefs_->IsAutoOpenEnabled(url, path); @@ -229,7 +242,7 @@ return should_open; } -@@ -1640,7 +1630,6 @@ void ChromeDownloadManagerDelegate::OnDo +@@ -1647,7 +1637,6 @@ void ChromeDownloadManagerDelegate::OnDo DownloadItemModel model(item); model.DetermineAndSetShouldPreferOpeningInBrowser( target_info.target_path, target_info.is_filetype_handled_safely); @@ -237,7 +250,7 @@ } if (ShouldBlockFile(item, target_info.danger_type)) { MaybeReportDangerousDownloadBlocked( -@@ -1721,53 +1710,6 @@ bool ChromeDownloadManagerDelegate::IsOp +@@ -1728,53 +1717,6 @@ bool ChromeDownloadManagerDelegate::IsOp bool ChromeDownloadManagerDelegate::ShouldBlockFile( download::DownloadItem* item, download::DownloadDangerType danger_type) const { @@ -291,7 +304,7 @@ return false; } -@@ -1782,7 +1724,6 @@ void ChromeDownloadManagerDelegate::Mayb +@@ -1789,7 +1731,6 @@ void ChromeDownloadManagerDelegate::Mayb service->MaybeSendDangerousDownloadOpenedReport(download, show_download_in_folder); } @@ -299,7 +312,7 @@ if (!download->GetAutoOpened()) { download::DownloadContent download_content = download::DownloadContentFromMimeType(download->GetMimeType(), false); -@@ -1790,6 +1731,7 @@ void ChromeDownloadManagerDelegate::Mayb +@@ -1797,6 +1738,7 @@ void ChromeDownloadManagerDelegate::Mayb download->GetDangerType(), download_content, base::Time::Now(), download->GetEndTime(), show_download_in_folder); } @@ -307,7 +320,7 @@ } void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadCanceledReport( -@@ -1880,8 +1822,7 @@ void ChromeDownloadManagerDelegate::Chec +@@ -1887,8 +1829,7 @@ void ChromeDownloadManagerDelegate::Chec DCHECK(download_item); DCHECK(download_item->IsSavePackageDownload()); @@ -319,7 +332,7 @@ --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc -@@ -960,30 +960,6 @@ void DownloadItemModel::ExecuteCommand(D +@@ -961,30 +961,6 @@ void DownloadItemModel::ExecuteCommand(D } TailoredWarningType DownloadItemModel::GetTailoredWarningType() const { @@ -372,7 +385,7 @@ } --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -1003,12 +1003,6 @@ void DownloadTargetDeterminer::CheckVisi +@@ -1002,12 +1002,6 @@ void DownloadTargetDeterminer::CheckVisi bool visited_referrer_before) { DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_); @@ -385,7 +398,7 @@ danger_level_ = GetDangerLevel( visited_referrer_before ? VISITED_REFERRER : NO_VISITS_TO_REFERRER); if (danger_level_ != DownloadFileType::NOT_DANGEROUS && -@@ -1289,14 +1283,7 @@ DownloadFileType::DangerLevel DownloadTa +@@ -1288,14 +1282,7 @@ DownloadFileType::DangerLevel DownloadTa std::optional DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const { @@ -403,7 +416,7 @@ void DownloadTargetDeterminer::OnDownloadDestroyed( --- a/chrome/browser/download/download_ui_safe_browsing_util.cc +++ b/chrome/browser/download/download_ui_safe_browsing_util.cc -@@ -65,12 +65,6 @@ bool CanUserTurnOnSafeBrowsing(Profile* +@@ -68,12 +68,6 @@ bool CanUserTurnOnSafeBrowsing(Profile* void RecordDownloadDangerPromptHistogram( const std::string& proceed_or_shown_suffix, const download::DownloadItem& item) { @@ -416,16 +429,198 @@ } #if BUILDFLAG(FULL_SAFE_BROWSING) +@@ -98,23 +92,5 @@ void SendSafeBrowsingDownloadReport( + + bool ShouldShowDeepScanPromptNotice(Profile* profile, + download::DownloadDangerType danger_type) { +- if (danger_type != download::DOWNLOAD_DANGER_TYPE_PROMPT_FOR_SCANNING) { + return false; +- } +- +- if (!safe_browsing::IsEnhancedProtectionEnabled(*profile->GetPrefs())) { +- return false; +- } +- +- if (profile->GetPrefs()->GetBoolean( +- prefs::kSafeBrowsingAutomaticDeepScanPerformed)) { +- return false; +- } +- +- if (!base::FeatureList::IsEnabled( +- safe_browsing::kDeepScanningPromptRemoval)) { +- return false; +- } +- +- return true; + } +--- a/chrome/browser/download/download_warning_desktop_hats_utils.cc ++++ b/chrome/browser/download/download_warning_desktop_hats_utils.cc +@@ -33,7 +33,6 @@ + #include "components/prefs/pref_service.h" + #include "components/safe_browsing/buildflags.h" + #include "components/safe_browsing/core/common/features.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "content/public/browser/download_item_utils.h" + + namespace { +@@ -111,17 +110,6 @@ std::string ElapsedTimeToSecondsString(b + return base::NumberToString(elapsed_time.InSeconds()); + } + +-std::string SafeBrowsingStateToString( +- safe_browsing::SafeBrowsingState sb_state) { +- switch (sb_state) { +- case safe_browsing::SafeBrowsingState::NO_SAFE_BROWSING: +- return "No Safe Browsing"; +- case safe_browsing::SafeBrowsingState::STANDARD_PROTECTION: +- return "Standard Protection"; +- case safe_browsing::SafeBrowsingState::ENHANCED_PROTECTION: +- return "Enhanced Protection"; +- } +-} + + // Produces a string consisting of comma-separated action events, each of which + // consists of the surface, action, and relative timestamp (ms) separated by +@@ -248,49 +236,21 @@ DownloadWarningHatsProductSpecificData:: + return psd; + } + +- psd.string_data_.insert( +- {Fields::kSafeBrowsingState, +- SafeBrowsingStateToString( +- safe_browsing::GetSafeBrowsingState(*profile->GetPrefs()))}); + + psd.bits_data_.insert({Fields::kPartialViewEnabled, + profile->GetPrefs()->GetBoolean( + prefs::kDownloadBubblePartialViewEnabled)}); + +- // URL and filename logged only for Safe Browsing users. +- if (safe_browsing::IsSafeBrowsingEnabled(*profile->GetPrefs())) { +- psd.string_data_.insert({Fields::kUrlDownload, +- download_item->GetURL().possibly_invalid_spec()}); +- psd.string_data_.insert( +- {Fields::kUrlReferrer, +- download_item->GetReferrerUrl().possibly_invalid_spec()}); +- psd.string_data_.insert( +- {Fields::kFilename, +- base::UTF16ToUTF8( +- download_item->GetFileNameToReportUser().LossyDisplayName())}); +- } else { + psd.string_data_.insert({Fields::kUrlDownload, kNotLoggedNoSafeBrowsing}); + psd.string_data_.insert({Fields::kUrlReferrer, kNotLoggedNoSafeBrowsing}); + psd.string_data_.insert({Fields::kFilename, kNotLoggedNoSafeBrowsing}); +- } + + // Interaction details logged only for ESB users. + std::optional + warning_first_shown_surface = + DownloadItemWarningData::WarningFirstShownSurface(download_item); +- if (warning_first_shown_surface && +- safe_browsing::IsEnhancedProtectionEnabled(*profile->GetPrefs())) { +- std::vector +- warning_action_events = +- DownloadItemWarningData::GetWarningActionEvents(download_item); +- psd.string_data_.insert( +- {Fields::kWarningInteractions, +- SerializeWarningActionEvents(*warning_first_shown_surface, +- warning_action_events)}); +- } else { + psd.string_data_.insert( + {Fields::kWarningInteractions, kNotLoggedNoEnhancedProtection}); +- } + + return psd; + } +@@ -482,40 +442,7 @@ bool CanShowDownloadWarningHatsSurvey(do + + std::optional MaybeGetDownloadWarningHatsTrigger( + DownloadWarningHatsType survey_type) { +- if (!base::FeatureList::IsEnabled(safe_browsing::kDownloadWarningSurvey)) { +- return std::nullopt; +- } +- +- const int eligible_survey_type = +- safe_browsing::kDownloadWarningSurveyType.Get(); +- +- // Configuration error. +- if (eligible_survey_type < 0 || +- eligible_survey_type > +- static_cast(DownloadWarningHatsType::kMaxValue)) { +- return std::nullopt; +- } +- +- // User is not assigned to be eligible for this type. +- if (static_cast(eligible_survey_type) != +- survey_type) { + return std::nullopt; +- } +- +- switch (survey_type) { +- case DownloadWarningHatsType::kDownloadBubbleBypass: +- return kHatsSurveyTriggerDownloadWarningBubbleBypass; +- case DownloadWarningHatsType::kDownloadBubbleHeed: +- return kHatsSurveyTriggerDownloadWarningBubbleHeed; +- case DownloadWarningHatsType::kDownloadBubbleIgnore: +- return kHatsSurveyTriggerDownloadWarningBubbleIgnore; +- case DownloadWarningHatsType::kDownloadsPageBypass: +- return kHatsSurveyTriggerDownloadWarningPageBypass; +- case DownloadWarningHatsType::kDownloadsPageHeed: +- return kHatsSurveyTriggerDownloadWarningPageHeed; +- case DownloadWarningHatsType::kDownloadsPageIgnore: +- return kHatsSurveyTriggerDownloadWarningPageIgnore; +- } + } + + base::TimeDelta GetIgnoreDownloadBubbleWarningDelay() { +--- a/chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc ++++ b/chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc +@@ -201,8 +201,6 @@ AnalysisSettings AnalysisServiceSettings + settings.block_large_files = block_large_files_; + if (is_cloud_analysis()) { + CloudAnalysisSettings cloud_settings; +- cloud_settings.analysis_url = +- GetRegionalizedEndpoint(analysis_config_->region_urls, data_region); + // We assume all support_tags structs have the same max file size. + cloud_settings.max_file_size = + analysis_config_->supported_tags[0].max_file_size; --- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc +++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc -@@ -38,7 +38,6 @@ +@@ -37,8 +37,6 @@ + #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.h" #include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h" - #include "chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request.h" +-#include "chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request.h" -#include "chrome/browser/safe_browsing/download_protection/check_client_download_request.h" #include "chrome/grit/generated_resources.h" #include "components/enterprise/buildflags/buildflags.h" #include "components/enterprise/common/files_scan_data.h" +@@ -1099,15 +1097,6 @@ void ContentAnalysisDelegate::AckAllRequ + void ContentAnalysisDelegate::FinishLargeDataRequestEarly( + std::unique_ptr request, + safe_browsing::BinaryUploadService::Result result) { +- // We add the request here in case we never actually uploaded anything, so +- // it wasn't added in OnGetRequestData +- safe_browsing::WebUIInfoSingleton::GetInstance()->AddToDeepScanRequests( +- request->per_profile_request(), /*access_token*/ "", /*upload_info*/ +- "Skipped - Large data blocked", request->content_analysis_request()); +- safe_browsing::WebUIInfoSingleton::GetInstance()->AddToDeepScanResponses( +- /*token=*/"", safe_browsing::BinaryUploadService::ResultToString(result), +- enterprise_connectors::ContentAnalysisResponse()); +- + request->FinishRequest(result, + enterprise_connectors::ContentAnalysisResponse()); + } +--- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.h ++++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.h +@@ -94,7 +94,7 @@ class ContentAnalysisDelegate : public C + Data(); + Data(Data&& other); + Data& operator=(Data&& other); +- ~Data(); ++ ~Data() = default; + + // Helper function to populate `text` and `image` with the data in a + // `content::ClipboardPasteData` object. --- a/chrome/browser/enterprise/connectors/analysis/content_analysis_downloads_delegate.cc +++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_downloads_delegate.cc @@ -119,7 +119,7 @@ ContentAnalysisDownloadsDelegate::GetCus @@ -492,7 +687,7 @@ void FilesRequestHandler::OnGotFileInfo( std::unique_ptr request, size_t index, -@@ -262,15 +222,6 @@ void FilesRequestHandler::OnGotFileInfo( +@@ -268,15 +228,6 @@ void FilesRequestHandler::OnGotFileInfo( void FilesRequestHandler::FinishRequestEarly( std::unique_ptr request, safe_browsing::BinaryUploadService::Result result) { @@ -521,6 +716,34 @@ // Called when the file info for `path` has been fetched. Also begins the // upload process. void OnGotFileInfo( +--- a/chrome/browser/enterprise/connectors/common.cc ++++ b/chrome/browser/enterprise/connectors/common.cc +@@ -574,7 +574,7 @@ void ShowDownloadReviewDialog(const std: + bool IsResumableUpload(const BinaryUploadService::Request& request) { + // Currently resumable upload doesn't support paste or LBUS. If one day we do, + // we should update the logic here as well. +- return !safe_browsing::IsConsumerScanRequest(request) && ++ return + request.cloud_or_local_settings().is_cloud_analysis() && + request.content_analysis_request().analysis_connector() != + enterprise_connectors::AnalysisConnector::BULK_DATA_ENTRY && +--- a/chrome/browser/enterprise/connectors/connectors_manager.cc ++++ b/chrome/browser/enterprise/connectors/connectors_manager.cc +@@ -396,13 +396,7 @@ std::vector Conne + } + + safe_browsing::DataRegion ConnectorsManager::GetDataRegion() const { +- bool apply_data_region = +- prefs()->HasPrefPath(prefs::kChromeDataRegionSetting) && +- base::FeatureList::IsEnabled(safe_browsing::kDlpRegionalizedEndpoints); +- return apply_data_region +- ? safe_browsing::ChromeDataRegionSettingToEnum( +- prefs()->GetInteger(prefs::kChromeDataRegionSetting)) +- : safe_browsing::DataRegion::NO_PREFERENCE; ++ return safe_browsing::DataRegion::NO_PREFERENCE; + } + + void ConnectorsManager::StartObservingPrefs(PrefService* pref_service) { --- a/chrome/browser/enterprise/connectors/connectors_service.cc +++ b/chrome/browser/enterprise/connectors/connectors_service.cc @@ -453,37 +453,8 @@ std::optional ConnectorsSer @@ -652,9 +875,188 @@ } const base::Value::List* enabled_opt_in_events_value = +--- a/chrome/browser/enterprise/data_controls/reporting_service.cc ++++ b/chrome/browser/enterprise/data_controls/reporting_service.cc +@@ -76,10 +76,6 @@ void ReportingService::ReportPaste( + const content::ClipboardEndpoint& destination, + const content::ClipboardMetadata& metadata, + const Verdict& verdict) { +- ReportPaste( +- source, destination, metadata, verdict, +- extensions::SafeBrowsingPrivateEventRouter::kTriggerWebContentUpload, +- GetEventResult(verdict.level())); + } + + void ReportingService::ReportPasteWarningBypass( +@@ -87,10 +83,6 @@ void ReportingService::ReportPasteWarnin + const content::ClipboardEndpoint& destination, + const content::ClipboardMetadata& metadata, + const Verdict& verdict) { +- ReportPaste( +- source, destination, metadata, verdict, +- extensions::SafeBrowsingPrivateEventRouter::kTriggerWebContentUpload, +- safe_browsing::EventResult::BYPASSED); + } + + void ReportingService::ReportPaste( +@@ -100,28 +92,6 @@ void ReportingService::ReportPaste( + const Verdict& verdict, + const std::string& trigger, + safe_browsing::EventResult event_result) { +- auto* router = +- extensions::SafeBrowsingPrivateEventRouterFactory::GetForProfile( +- &profile_.get()); +- +- if (!router || verdict.triggered_rules().empty()) { +- return; +- } +- +- GURL source_url = +- IncludeSourceInformation(source, destination) ? GetURL(source) : GURL(); +- GURL paste_url = GetURL(destination); +- +- router->OnDataControlsSensitiveDataEvent( +- /*url=*/paste_url, +- /*tab_url=*/paste_url, +- /*source=*/source_url.spec(), +- /*destination=*/paste_url.spec(), +- /*mime_type=*/GetMimeType(metadata.format_type), +- /*trigger=*/trigger, +- /*triggered_rules=*/verdict.triggered_rules(), +- /*event_result=*/event_result, +- /*content_size=*/metadata.size.value_or(-1)); + } + + bool ReportingService::IncludeSourceInformation( +@@ -168,7 +138,6 @@ ReportingServiceFactory::ReportingServic + .WithSystem(ProfileSelection::kNone) + .WithAshInternals(ProfileSelection::kNone) + .Build()) { +- DependsOn(extensions::SafeBrowsingPrivateEventRouterFactory::GetInstance()); + } + + ReportingServiceFactory::~ReportingServiceFactory() = default; +--- a/chrome/browser/enterprise/data_protection/data_protection_clipboard_utils.cc ++++ b/chrome/browser/enterprise/data_protection/data_protection_clipboard_utils.cc +@@ -93,77 +93,6 @@ class ClipboardObserver : public ui::Cli + content::ClipboardPasteData pending_seqno_data_; + }; + +-void HandleFileData( +- content::WebContents* web_contents, +- enterprise_connectors::ContentAnalysisDelegate::Data dialog_data, +- content::ContentBrowserClient::IsClipboardPasteAllowedCallback callback) { +- enterprise_connectors::ContentAnalysisDelegate::CreateForFilesInWebContents( +- web_contents, std::move(dialog_data), +- base::BindOnce( +- [](content::ContentBrowserClient::IsClipboardPasteAllowedCallback +- callback, +- std::vector paths, std::vector results) { +- std::optional clipboard_paste_data; +- bool all_blocked = +- std::all_of(results.begin(), results.end(), +- [](bool allowed) { return !allowed; }); +- if (!all_blocked) { +- std::vector allowed_paths; +- allowed_paths.reserve(paths.size()); +- for (size_t i = 0; i < paths.size(); ++i) { +- if (results[i]) { +- allowed_paths.emplace_back(std::move(paths[i])); +- } +- } +- clipboard_paste_data = content::ClipboardPasteData(); +- clipboard_paste_data->file_paths = std::move(allowed_paths); +- } +- std::move(callback).Run(std::move(clipboard_paste_data)); +- }, +- std::move(callback)), +- safe_browsing::DeepScanAccessPoint::PASTE); +-} +- +-void HandleStringData( +- content::WebContents* web_contents, +- content::ClipboardPasteData clipboard_paste_data, +- enterprise_connectors::ContentAnalysisDelegate::Data dialog_data, +- content::ContentBrowserClient::IsClipboardPasteAllowedCallback callback) { +- enterprise_connectors::ContentAnalysisDelegate::CreateForWebContents( +- web_contents, std::move(dialog_data), +- base::BindOnce( +- [](content::ClipboardPasteData clipboard_paste_data, +- content::ContentBrowserClient::IsClipboardPasteAllowedCallback +- callback, +- const enterprise_connectors::ContentAnalysisDelegate::Data& data, +- enterprise_connectors::ContentAnalysisDelegate::Result& result) { +- // TODO(b/318664590): Since the `data` argument is forwarded to +- // `callback`, changing the type from `const Data&` to just `Data` +- // would avoid a copy. +- +- bool text_blocked = +- result.text_results.empty() || !result.text_results[0]; +- if (text_blocked && !result.image_result) { +- std::move(callback).Run(std::nullopt); +- return; +- } +- +- if (text_blocked) { +- clipboard_paste_data.text.clear(); +- clipboard_paste_data.html.clear(); +- clipboard_paste_data.svg.clear(); +- clipboard_paste_data.rtf.clear(); +- clipboard_paste_data.custom_data.clear(); +- } +- if (!result.image_result) { +- clipboard_paste_data.png.clear(); +- } +- +- std::move(callback).Run(std::move(clipboard_paste_data)); +- }, +- std::move(clipboard_paste_data), std::move(callback)), +- safe_browsing::DeepScanAccessPoint::PASTE); +-} + + bool SkipDataControlOrContentAnalysisChecks( + const content::ClipboardEndpoint& main_endpoint) { +@@ -194,37 +123,7 @@ void PasteIfAllowedByContentAnalysis( + DCHECK(web_contents); + DCHECK(!SkipDataControlOrContentAnalysisChecks(destination)); + +- Profile* profile = Profile::FromBrowserContext(destination.browser_context()); +- if (!profile) { + std::move(callback).Run(std::move(clipboard_paste_data)); +- return; +- } +- +- bool is_files = +- metadata.format_type == ui::ClipboardFormatType::FilenamesType(); +- enterprise_connectors::AnalysisConnector connector = +- is_files ? enterprise_connectors::AnalysisConnector::FILE_ATTACHED +- : enterprise_connectors::AnalysisConnector::BULK_DATA_ENTRY; +- enterprise_connectors::ContentAnalysisDelegate::Data dialog_data; +- +- if (!enterprise_connectors::ContentAnalysisDelegate::IsEnabled( +- profile, *destination.data_transfer_endpoint()->GetURL(), +- &dialog_data, connector)) { +- std::move(callback).Run(std::move(clipboard_paste_data)); +- return; +- } +- +- dialog_data.reason = +- enterprise_connectors::ContentAnalysisRequest::CLIPBOARD_PASTE; +- +- if (is_files) { +- dialog_data.paths = std::move(clipboard_paste_data.file_paths); +- HandleFileData(web_contents, std::move(dialog_data), std::move(callback)); +- } else { +- dialog_data.AddClipboardData(clipboard_paste_data); +- HandleStringData(web_contents, std::move(clipboard_paste_data), +- std::move(dialog_data), std::move(callback)); +- } + } + + bool DataControlsAppliedToMachineScope( --- a/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc +++ b/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc -@@ -65,12 +65,6 @@ void RunPendingNavigationCallback( +@@ -66,12 +66,6 @@ void RunPendingNavigationCallback( auto* user_data = GetUserData(web_contents); DCHECK(user_data); @@ -667,44 +1069,44 @@ std::move(callback).Run(user_data->settings()); } -@@ -161,9 +155,7 @@ void LogVerdictSource( +@@ -177,9 +171,7 @@ void LogVerdictSource( bool IsScreenshotAllowedByDataControls(content::BrowserContext* context, const GURL& url) { - auto* rules = -- data_controls::RulesServiceFactory::GetForBrowserContext(context); +- data_controls::ChromeRulesServiceFactory::GetForBrowserContext(context); - return rules ? !rules->BlockScreenshots(url) : true; + return true; } } // namespace -@@ -186,16 +178,6 @@ void DataProtectionNavigationObserver::C +@@ -202,16 +194,6 @@ void DataProtectionNavigationObserver::C std::move(callback).Run(UrlSettings::None()); return; } - -- // GetForProfile() return nullptr if enterprise policies are not set. -- auto* lookup_service = safe_browsing:: -- ChromeEnterpriseRealTimeUrlLookupServiceFactory::GetForProfile(profile); -- if (lookup_service) { -- enterprise_data_protection::DataProtectionNavigationObserver:: -- CreateForNavigationHandle(*navigation_handle, lookup_service, -- navigation_handle->GetWebContents(), -- std::move(callback)); -- } +- // ChromeEnterpriseRealTimeUrlLookupServiceFactory::GetForProfile() return +- // nullptr if enterprise policies are not set. In this case data protections +- // will be based on data controls alone, +- enterprise_data_protection::DataProtectionNavigationObserver:: +- CreateForNavigationHandle( +- *navigation_handle, +- safe_browsing::ChromeEnterpriseRealTimeUrlLookupServiceFactory:: +- GetForProfile(profile), +- navigation_handle->GetWebContents(), std::move(callback)); } // static -@@ -228,35 +210,9 @@ void DataProtectionNavigationObserver::G - GetPageFromWebContents(web_contents), identifier, - IsScreenshotAllowedByDataControls(profile, url)); +@@ -246,35 +228,9 @@ void DataProtectionNavigationObserver::G + web_contents->GetLastCommittedURL())); + } - auto* lookup_service = - g_lookup_service - ? g_lookup_service - : safe_browsing::ChromeEnterpriseRealTimeUrlLookupServiceFactory:: - GetForProfile(profile); -- if (lookup_service) { +- if (lookup_service && IsEnterpriseLookupEnabled(profile)) { - auto lookup_callback = base::BindOnce( - [](const std::string& identifier, - DataProtectionNavigationObserver::Callback callback, @@ -839,7 +1241,7 @@ } // namespace utils --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -315,10 +315,6 @@ static_library("extensions") { +@@ -317,10 +317,6 @@ static_library("extensions") { "api/runtime/chrome_runtime_api_delegate.h", "api/safe_browsing_private/safe_browsing_private_api.cc", "api/safe_browsing_private/safe_browsing_private_api.h", @@ -850,8 +1252,8 @@ "api/safe_browsing_private/safe_browsing_util.cc", "api/safe_browsing_private/safe_browsing_util.h", "api/search/search_api.cc", -@@ -657,8 +653,6 @@ static_library("extensions") { - "menu_manager_factory.h", +@@ -664,8 +660,6 @@ static_library("extensions") { + "mv2_experiment_stage.h", "navigation_extension_enabler.cc", "navigation_extension_enabler.h", - "omaha_attributes_handler.cc", @@ -937,7 +1339,7 @@ info.enterprise_profile_id = signals.enterprise_profile_id; --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -343,8 +343,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -338,8 +338,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil settings_api::PrefType::kBoolean; (*s_allowlist)[::kGeneratedHttpsFirstModePref] = settings_api::PrefType::kNumber; @@ -1003,7 +1405,7 @@ void Blocklist::GetMalwareIDs(const std::set& ids, --- a/chrome/browser/extensions/chrome_extensions_browser_client.cc +++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc -@@ -794,81 +794,23 @@ void ChromeExtensionsBrowserClient::Noti +@@ -797,44 +797,17 @@ void ChromeExtensionsBrowserClient::Noti content::BrowserContext* context, const ExtensionId& extension_id, const std::string& code) const { @@ -1048,6 +1450,29 @@ - telemetry_service->AddSignal(std::move(signal)); } + void ChromeExtensionsBrowserClient:: +@@ -843,59 +816,12 @@ void ChromeExtensionsBrowserClient:: + const ExtensionId& extension_id, + const GURL& request_url, + const GURL& redirect_url) const { +- auto* telemetry_service = +- safe_browsing::ExtensionTelemetryServiceFactory::GetForProfile( +- Profile::FromBrowserContext(context)); +- if (!telemetry_service || !telemetry_service->enabled() || +- !base::FeatureList::IsEnabled( +- safe_browsing:: +- kExtensionTelemetryDeclarativeNetRequestActionSignal)) { +- return; +- } +- +- // The telemetry service will consume and release the signal object inside the +- // `AddSignal()` call. +- auto signal = safe_browsing::DeclarativeNetRequestActionSignal:: +- CreateDeclarativeNetRequestRedirectActionSignal(extension_id, request_url, +- redirect_url); +- telemetry_service->AddSignal(std::move(signal)); + } + void ChromeExtensionsBrowserClient::NotifyExtensionRemoteHostContacted( content::BrowserContext* context, const ExtensionId& extension_id, @@ -1086,7 +1511,7 @@ } // static -@@ -1037,7 +979,6 @@ void ChromeExtensionsBrowserClient::GetW +@@ -1064,7 +990,6 @@ void ChromeExtensionsBrowserClient::GetW void ChromeExtensionsBrowserClient::CreatePasswordReuseDetectionManager( content::WebContents* web_contents) const { @@ -1130,7 +1555,7 @@ extension_telemetry_service_verdict_handler_( extension_prefs, ExtensionRegistry::Get(profile), -@@ -940,17 +934,6 @@ bool ExtensionService::IsExtensionEnable +@@ -941,17 +935,6 @@ bool ExtensionService::IsExtensionEnable return extension_registrar_.IsExtensionEnabled(extension_id); } @@ -1148,7 +1573,7 @@ void ExtensionService::PerformActionBasedOnExtensionTelemetryServiceVerdicts( const Blocklist::BlocklistStateMap& blocklist_state_map) { DCHECK_CURRENTLY_ON(BrowserThread::UI); -@@ -960,89 +943,6 @@ void ExtensionService::PerformActionBase +@@ -961,89 +944,6 @@ void ExtensionService::PerformActionBase error_controller_->ShowErrorIfNeeded(); } @@ -1300,7 +1725,7 @@ --- a/chrome/browser/extensions/extension_system_impl.cc +++ b/chrome/browser/extensions/extension_system_impl.cc -@@ -447,8 +447,6 @@ void ExtensionSystemImpl::InstallUpdate( +@@ -448,8 +448,6 @@ void ExtensionSystemImpl::InstallUpdate( void ExtensionSystemImpl::PerformActionBasedOnOmahaAttributes( const std::string& extension_id, const base::Value::Dict& attributes) { @@ -1360,6 +1785,37 @@ UMA_HISTOGRAM_ENUMERATION("Extensions.Greylist.Disabled", extension->location()); } +--- a/chrome/browser/file_select_helper.cc ++++ b/chrome/browser/file_select_helper.cc +@@ -329,7 +329,7 @@ void FileSelectHelper::PerformContentAna + if (AbortIfWebContentsDestroyed()) + return; + +-#if BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS) ++#if false + enterprise_connectors::ContentAnalysisDelegate::Data data; + if (enterprise_connectors::ContentAnalysisDelegate::IsEnabled( + profile_, web_contents_->GetLastCommittedURL(), &data, +@@ -359,7 +359,7 @@ void FileSelectHelper::PerformContentAna + #endif // BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS) + } + +-#if BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS) ++#if false + void FileSelectHelper::ContentAnalysisCompletionCallback( + std::vector list, + const enterprise_connectors::ContentAnalysisDelegate::Data& data, +--- a/chrome/browser/file_select_helper.h ++++ b/chrome/browser/file_select_helper.h +@@ -227,7 +227,7 @@ class FileSelectHelper : public base::Re + void PerformContentAnalysisIfNeeded( + std::vector list); + +-#if BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS) ++#if false + // Callback used to receive the results of a content analysis scan. + void ContentAnalysisCompletionCallback( + std::vector list, --- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc +++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc @@ -36,7 +36,6 @@ @@ -1370,7 +1826,7 @@ #include "chrome/browser/ui/file_system_access_dialogs.h" #include "chrome/common/chrome_paths.h" #include "chrome/grit/generated_resources.h" -@@ -426,89 +425,6 @@ bool ShouldBlockAccessToPath(const base: +@@ -424,89 +423,6 @@ bool ShouldBlockAccessToPath(const base: return true; } @@ -1460,7 +1916,7 @@ std::string GenerateLastPickedDirectoryKey(const std::string& id) { return id.empty() ? kDefaultLastPickedDirectoryKey : base::StrCat({kCustomLastPickedDirectoryKey, "-", id}); -@@ -528,13 +444,7 @@ std::string_view GetGrantKeyFromGrantTyp +@@ -526,13 +442,7 @@ std::string_view GetGrantKeyFromGrantTyp bool FileHasDangerousExtension(const url::Origin& origin, const base::FilePath& path, Profile* profile) { @@ -1475,7 +1931,16 @@ } } // namespace -@@ -1701,29 +1611,6 @@ void ChromeFileSystemAccessPermissionCon +@@ -1590,7 +1500,7 @@ void ChromeFileSystemAccessPermissionCon + std::vector entries, + content::GlobalRenderFrameHostId frame_id, + EntriesAllowedByEnterprisePolicyCallback callback) { +-#if BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS) ++#if false + // Get WebContents pointer in order to perform enterprise content analysis. + content::WebContents* web_contents = nullptr; + if (!entries.empty()) { +@@ -1698,29 +1608,6 @@ void ChromeFileSystemAccessPermissionCon std::move(callback)); } @@ -1570,7 +2035,7 @@ #include "chrome/browser/safe_browsing/user_interaction_observer.h" #include "chrome/browser/signin/identity_manager_factory.h" #include "chrome/browser/sync/sync_service_factory.h" -@@ -910,6 +909,7 @@ autofill::LanguageCode ChromePasswordMan +@@ -919,6 +918,7 @@ autofill::LanguageCode ChromePasswordMan return autofill::LanguageCode(); } @@ -1578,7 +2043,7 @@ safe_browsing::PasswordProtectionService* ChromePasswordManagerClient::GetPasswordProtectionService() const { return safe_browsing::ChromePasswordProtectionService:: -@@ -929,6 +929,7 @@ void ChromePasswordManagerClient::CheckS +@@ -938,6 +938,7 @@ void ChromePasswordManagerClient::CheckS } } #endif // defined(ON_FOCUS_PING_ENABLED) @@ -1586,7 +2051,7 @@ #if !BUILDFLAG(IS_ANDROID) void ChromePasswordManagerClient::MaybeReportEnterpriseLoginEvent( -@@ -936,28 +937,10 @@ void ChromePasswordManagerClient::MaybeR +@@ -945,28 +946,10 @@ void ChromePasswordManagerClient::MaybeR bool is_federated, const url::Origin& federated_origin, const std::u16string& login_user_name) const { @@ -1615,7 +2080,7 @@ } #endif -@@ -1605,6 +1588,7 @@ bool ChromePasswordManagerClient::IsPass +@@ -1614,6 +1597,7 @@ bool ChromePasswordManagerClient::IsPass is_enabled = false; } @@ -1623,7 +2088,7 @@ // SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing // warnings until user interaction. If the current page has a delayed warning, // it'll have a user interaction observer attached. Disable password -@@ -1615,6 +1599,7 @@ bool ChromePasswordManagerClient::IsPass +@@ -1624,6 +1608,7 @@ bool ChromePasswordManagerClient::IsPass observer->OnPasswordSaveOrAutofillDenied(); is_enabled = false; } @@ -1651,7 +2116,7 @@ #if !BUILDFLAG(IS_ANDROID) --- a/chrome/browser/permissions/chrome_permissions_client.cc +++ b/chrome/browser/permissions/chrome_permissions_client.cc -@@ -394,16 +394,6 @@ void ChromePermissionsClient::OnPromptRe +@@ -402,16 +402,6 @@ void ChromePermissionsClient::OnPromptRe PermissionRevocationRequest::ExemptOriginFromFutureRevocations(profile, origin); } @@ -1836,7 +2301,7 @@ } --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -107,6 +107,7 @@ +@@ -108,6 +108,7 @@ #include "components/privacy_sandbox/privacy_sandbox_prefs.h" #include "components/privacy_sandbox/tracking_protection_prefs.h" #include "components/proxy_config/proxy_policy_handler.h" @@ -1844,7 +2309,7 @@ #include "components/safe_browsing/content/common/file_type_policies_prefs.h" #include "components/safe_browsing/core/common/safe_browsing_policy_handler.h" #include "components/safe_browsing/core/common/safe_browsing_prefs.h" -@@ -2240,8 +2241,6 @@ std::unique_ptrAddHandler( std::make_unique( chrome_schema)); @@ -1853,7 +2318,7 @@ handlers->AddHandler(std::make_unique()); handlers->AddHandler( std::make_unique(key::kURLBlocklist)); -@@ -2338,20 +2337,6 @@ std::unique_ptr + scanning_data = enterprise_data_protection::GetPrintAnalysisData( + web_contents(), enterprise_data_protection::PrintScanningContext:: +@@ -1358,17 +1358,6 @@ void PrintViewManagerBase::ContentAnalys + const gfx::Size& page_size, + const gfx::Rect& content_area, + const gfx::Point& offsets) { +- scanning_data.printer_name = +- base::UTF16ToUTF8(print_job_->document()->settings().device_name()); +- +- auto on_verdict = base::BindOnce( +- &PrintViewManagerBase::CompletePrintDocumentAfterContentAnalysis, +- weak_ptr_factory_.GetWeakPtr(), print_data, page_size, content_area, +- offsets); +- +- enterprise_data_protection::PrintIfAllowedByPolicy( +- print_data, web_contents()->GetOutermostWebContents(), +- std::move(scanning_data), std::move(on_verdict)); + } + + void PrintViewManagerBase::set_analyzing_content(bool analyzing) { --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -782,9 +782,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -788,9 +788,6 @@ void ChromeBrowserMainExtraPartsProfiles enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance(); enterprise_connectors::DeviceTrustServiceFactory::GetInstance(); #endif @@ -1904,7 +2407,7 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ BUILDFLAG(IS_ANDROID) enterprise_idle::IdleServiceFactory::GetInstance(); -@@ -1099,23 +1096,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -1105,23 +1102,6 @@ void ChromeBrowserMainExtraPartsProfiles #if !BUILDFLAG(IS_ANDROID) ResetReportUploaderFactory::GetInstance(); #endif @@ -2012,7 +2515,7 @@ scoped_refptr --- a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc +++ b/chrome/browser/ssl/chrome_security_blocking_page_factory.cc -@@ -146,15 +146,6 @@ CreateSettingsPageHelper() { +@@ -145,15 +145,6 @@ CreateSettingsPageHelper() { CreateChromeSettingsPageHelper(); } @@ -2028,7 +2531,7 @@ } // namespace std::unique_ptr -@@ -177,10 +168,6 @@ ChromeSecurityBlockingPageFactory::Creat +@@ -176,10 +167,6 @@ ChromeSecurityBlockingPageFactory::Creat Profile::FromBrowserContext(web_contents->GetBrowserContext())); state->DidDisplayErrorPage(cert_error); @@ -2039,7 +2542,7 @@ auto controller_client = std::make_unique( web_contents, ssl_info, cert_error, request_url, std::move(metrics_helper), CreateSettingsPageHelper()); -@@ -243,10 +230,6 @@ ChromeSecurityBlockingPageFactory::Creat +@@ -242,10 +229,6 @@ ChromeSecurityBlockingPageFactory::Creat const GURL& request_url, const net::SSLInfo& ssl_info, const std::string& mitm_software_name) { @@ -2050,7 +2553,7 @@ auto page = std::make_unique( web_contents, cert_error, request_url, /*can_show_enhanced_protection_message=*/true, ssl_info, -@@ -266,10 +249,6 @@ ChromeSecurityBlockingPageFactory::Creat +@@ -265,10 +248,6 @@ ChromeSecurityBlockingPageFactory::Creat int cert_error, const GURL& request_url, const net::SSLInfo& ssl_info) { @@ -2115,7 +2618,7 @@ } // namespace --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -611,7 +611,6 @@ static_library("ui") { +@@ -618,7 +618,6 @@ static_library("ui") { "//components/renderer_context_menu", "//components/resources", "//components/safe_browsing/content/browser", @@ -2123,16 +2626,16 @@ "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/web_ui", "//components/safe_browsing/core/browser/db:database_manager", -@@ -4182,8 +4181,6 @@ static_library("ui") { +@@ -4234,8 +4233,6 @@ static_library("ui") { "startup/web_app_startup_utils.h", "tab_contents/chrome_web_contents_menu_helper.cc", "tab_contents/chrome_web_contents_menu_helper.h", - "tab_contents/chrome_web_contents_view_handle_drop.cc", - "tab_contents/chrome_web_contents_view_handle_drop.h", - "views/autofill/payments/virtual_card_selection_dialog_view.cc", - "views/autofill/payments/virtual_card_selection_dialog_view.h", "views/autofill/payments/webauthn_dialog_view.cc", -@@ -5874,8 +5871,6 @@ static_library("ui") { + "views/autofill/payments/webauthn_dialog_view.h", + "views/close_bubble_on_tab_activation_helper.cc", +@@ -5946,8 +5943,6 @@ static_library("ui") { "views/safe_browsing/prompt_for_scanning_modal_dialog.h", "views/safe_browsing/tailored_security_desktop_dialog_manager.cc", "views/safe_browsing/tailored_security_desktop_dialog_manager.h", @@ -2151,17 +2654,12 @@ #include "chrome/browser/ui/color/chrome_color_id.h" #include "chrome/browser/ui/download/download_item_mode.h" #include "chrome/grit/generated_resources.h" -@@ -366,11 +365,5 @@ void DownloadBubbleRowViewInfo::Reset() +@@ -367,6 +366,5 @@ void DownloadBubbleRowViewInfo::Reset() } bool DownloadBubbleRowViewInfo::ShouldShowDeepScanNotice() const { -- return model_->GetDangerType() == -- download::DOWNLOAD_DANGER_TYPE_PROMPT_FOR_SCANNING && -- safe_browsing::IsEnhancedProtectionEnabled( -- *model_->profile()->GetPrefs()) && -- base::FeatureList::IsEnabled( -- safe_browsing::kDeepScanningPromptRemoval); -- ; +- return ShouldShowDeepScanPromptNotice(model_->profile(), +- model_->GetDangerType()); + return false; } --- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc @@ -2215,7 +2713,7 @@ void JavaScriptTabModalDialogManagerDelegateDesktop::DidCloseDialog() { --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -375,7 +375,6 @@ void TabHelpers::AttachTabHelpers(WebCon +@@ -383,7 +383,6 @@ void TabHelpers::AttachTabHelpers(WebCon if (!autofill_client_provider.uses_platform_autofill()) { ChromePasswordManagerClient::CreateForWebContents(web_contents); } @@ -2335,7 +2833,7 @@ #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/color/chrome_color_id.h" -@@ -824,9 +823,7 @@ void DownloadItemView::UpdateLabels() { +@@ -819,9 +818,7 @@ void DownloadItemView::UpdateLabels() { deep_scanning_label_->SetVisible(mode_ == download::DownloadItemMode::kDeepScanning); if (deep_scanning_label_->GetVisible()) { @@ -2346,7 +2844,7 @@ ? IDS_PROMPT_DEEP_SCANNING_DOWNLOAD : IDS_PROMPT_DEEP_SCANNING_APP_DOWNLOAD; const std::u16string filename = ElidedFilename(*deep_scanning_label_); -@@ -852,11 +849,15 @@ void DownloadItemView::UpdateButtons() { +@@ -847,11 +844,15 @@ void DownloadItemView::UpdateButtons() { } const bool allow_open_during_deep_scan = @@ -2362,7 +2860,7 @@ open_button_->SetEnabled((mode_ == download::DownloadItemMode::kNormal) || prompt_to_scan || allow_open_during_deep_scan); -@@ -1280,7 +1281,9 @@ void DownloadItemView::ShowContextMenuIm +@@ -1275,7 +1276,9 @@ void DownloadItemView::ShowContextMenuIm } void DownloadItemView::OpenDownloadDuringAsyncScanning() { @@ -2374,7 +2872,7 @@ --- a/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc +++ b/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc -@@ -171,7 +171,6 @@ void PresentationReceiverWindowView::Ini +@@ -169,7 +169,6 @@ void PresentationReceiverWindowView::Ini ChromeTranslateClient::CreateForWebContents(web_contents); autofill::ChromeAutofillClient::CreateForWebContents(web_contents); ChromePasswordManagerClient::CreateForWebContents(web_contents); @@ -2418,7 +2916,7 @@ std::unique_ptr --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -470,9 +470,6 @@ WebUIFactoryFunction GetWebUIFactoryFunc +@@ -451,9 +451,6 @@ WebUIFactoryFunction GetWebUIFactoryFunc } if (url.host_piece() == chrome::kChromeUIPredictorsHost) return &NewWebUI; @@ -2430,7 +2928,7 @@ if (url.host_piece() == chrome::kChromeUISignInInternalsHost) --- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc -@@ -156,10 +156,6 @@ void MaybeReportBypassAction(download::D +@@ -160,10 +160,6 @@ void MaybeReportBypassAction(download::D if (action != WarningAction::PROCEED && action != WarningAction::DISCARD) { return; } @@ -2441,7 +2939,7 @@ } // Triggers a Trust and Safety sentiment survey (if enabled). Should be called -@@ -168,21 +164,6 @@ void MaybeReportBypassAction(download::D +@@ -172,21 +168,6 @@ void MaybeReportBypassAction(download::D void MaybeTriggerTrustSafetySurvey(download::DownloadItem* file, WarningSurface surface, WarningAction action) { @@ -2463,7 +2961,7 @@ } void RecordDownloadsPageValidatedHistogram(download::DownloadItem* item) { -@@ -292,100 +273,17 @@ void DownloadsDOMHandler::SaveDangerousR +@@ -297,104 +278,17 @@ void DownloadsDOMHandler::SaveDangerousR // downloads of certain danger types. void DownloadsDOMHandler::SaveSuspiciousRequiringGesture( const std::string& id) { @@ -2493,6 +2991,8 @@ - } else if (file->IsDangerous()) { - MaybeReportBypassAction(file, WarningSurface::DOWNLOADS_PAGE, - WarningAction::PROCEED); +- MaybeTriggerDownloadWarningHatsSurvey( +- file, DownloadWarningHatsType::kDownloadsPageBypass); - MaybeTriggerTrustSafetySurvey(file, WarningSurface::DOWNLOADS_PAGE, - WarningAction::PROCEED); - @@ -2539,6 +3039,8 @@ - - MaybeReportBypassAction(file, WarningSurface::DOWNLOAD_PROMPT, - WarningAction::PROCEED); +- MaybeTriggerDownloadWarningHatsSurvey( +- file, DownloadWarningHatsType::kDownloadsPageBypass); - MaybeTriggerTrustSafetySurvey(file, WarningSurface::DOWNLOAD_PROMPT, - WarningAction::PROCEED); - @@ -2564,7 +3066,7 @@ } void DownloadsDOMHandler::DiscardDangerous(const std::string& id) { -@@ -609,15 +507,6 @@ void DownloadsDOMHandler::DeepScan(const +@@ -620,15 +514,6 @@ void DownloadsDOMHandler::DeepScan(const return; } @@ -2580,7 +3082,7 @@ DownloadItemModel model(download); DownloadCommands commands(model.GetWeakPtr()); commands.ExecuteCommand(DownloadCommands::DEEP_SCAN); -@@ -640,10 +529,7 @@ void DownloadsDOMHandler::BypassDeepScan +@@ -655,10 +540,7 @@ void DownloadsDOMHandler::BypassDeepScan // file" which does not imply opening the file. In the old behavior, the // button says "Open anyway" so we should open the file. commands.ExecuteCommand( @@ -2592,7 +3094,7 @@ } } -@@ -654,12 +540,6 @@ void DownloadsDOMHandler::ReviewDangerou +@@ -669,12 +551,6 @@ void DownloadsDOMHandler::ReviewDangerou return; } @@ -2604,25 +3106,43 @@ - } } - void DownloadsDOMHandler::OpenEsbSettings() { -@@ -674,14 +554,7 @@ void DownloadsDOMHandler::OpenEsbSetting + // This function will be called when a user clicks on the ESB +@@ -703,32 +579,7 @@ void DownloadsDOMHandler::OpenEsbSetting void DownloadsDOMHandler::IsEligibleForEsbPromo( IsEligibleForEsbPromoCallback callback) { - content::DownloadManager* manager = GetMainNotifierManager(); -- if (manager) { -- std::move(callback).Run( -- safe_browsing::SafeBrowsingService::IsUserEligibleForESBPromo( -- Profile::FromBrowserContext(manager->GetBrowserContext()))); -- } else { +- if (!manager) { std::move(callback).Run(false); +- return; - } +- +- content::BrowserContext* browser_context = manager->GetBrowserContext(); +- +- if (!safe_browsing::SafeBrowsingService::IsUserEligibleForESBPromo( +- Profile::FromBrowserContext(browser_context))) { +- std::move(callback).Run(false); +- return; +- } +- +- bool should_show_esb_promo = false; +- if (feature_engagement::Tracker* tracker = +- feature_engagement::TrackerFactory::GetForBrowserContext( +- browser_context); +- tracker && tracker->ShouldTriggerHelpUI( +- feature_engagement::kEsbDownloadRowPromoFeature)) { +- should_show_esb_promo = true; +- // since the promotion row is not an IPH, it never calls dismissed, so we +- // need to do it artificially here or we can trigger a DCHECK. +- tracker->Dismissed(feature_engagement::kEsbDownloadRowPromoFeature); +- } +- std::move(callback).Run(should_show_esb_promo); } - // DownloadsDOMHandler, private: -------------------------------------------- + void DownloadsDOMHandler::LogEsbPromotionRowViewed() { --- a/chrome/browser/ui/webui/management/management_ui_handler.cc +++ b/chrome/browser/ui/webui/management/management_ui_handler.cc -@@ -1101,12 +1101,6 @@ base::Value::Dict ManagementUIHandler::G +@@ -442,12 +442,6 @@ base::Value::Dict ManagementUIHandler::G &info); } @@ -2632,12 +3152,23 @@ - kManagementOnPageVisitedVisibleData, &info); - } - - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) - if (capture_policy::IsGetAllScreensMediaAllowedForAnySite(profile)) { + #if BUILDFLAG(IS_CHROMEOS) + if (is_get_all_screens_media_allowed_for_any_origin_) { AddThreatProtectionPermission(kManagementScreenCaptureEvent, +--- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc ++++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc +@@ -746,7 +746,7 @@ void PrintPreviewHandler::HandleDoPrint( + } + ReportUserActionHistogram(user_action); + +-#if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS) ++#if false + std::string device_name = *settings.FindString(kSettingDeviceName); + + using enterprise_data_protection::PrintScanningContext; --- a/chrome/browser/ui/webui/settings/hats_handler.cc +++ b/chrome/browser/ui/webui/settings/hats_handler.cc -@@ -82,60 +82,6 @@ void HatsHandler::RegisterMessages() { +@@ -83,60 +83,6 @@ void HatsHandler::RegisterMessages() { */ void HatsHandler::HandleSecurityPageHatsRequest(const base::Value::List& args) { AllowJavascript(); @@ -2698,7 +3229,7 @@ } /** -@@ -202,17 +148,7 @@ SurveyStringData HatsHandler::GetSecurit +@@ -203,17 +149,7 @@ SurveyStringData HatsHandler::GetSecurit } } @@ -2760,7 +3291,7 @@ std::move(callback), --- a/chrome/common/webui_url_constants.cc +++ b/chrome/common/webui_url_constants.cc -@@ -725,7 +725,6 @@ const char* const kChromeHostURLs[] = { +@@ -726,7 +726,6 @@ const char* const kChromeHostURLs[] = { kChromeUISuggestInternalsHost, #endif kChromeUINTPTilesInternalsHost, @@ -2770,7 +3301,7 @@ kChromeUITabSearchHost, --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -1924,9 +1924,6 @@ if (!is_android) { +@@ -1948,9 +1948,6 @@ if (!is_android) { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -2780,7 +3311,7 @@ "//components/safe_browsing/content/browser:safe_browsing_service", "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/password_protection:test_support", -@@ -6986,9 +6983,6 @@ test("unit_tests") { +@@ -7058,9 +7055,6 @@ test("unit_tests") { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -2790,38 +3321,9 @@ "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/password_protection:mock_password_protection", "//components/safe_browsing/content/browser/web_ui", ---- a/components/enterprise/buildflags/buildflags.gni -+++ b/components/enterprise/buildflags/buildflags.gni -@@ -12,14 +12,14 @@ declare_args() { - # Indicates support for content analysis against a cloud agent for Enterprise - # Connector policies. - enterprise_cloud_content_analysis = -- is_win || is_mac || is_linux || is_chromeos -+ false - - # Indicates support for content analysis against a cloud agent for Enterprise - # Connector policies. -- enterprise_local_content_analysis = is_win || is_mac || is_linux -+ enterprise_local_content_analysis = false - - # Indicates support for Data Control rules. -- enterprise_data_controls = is_win || is_mac || is_linux || is_chromeos -+ enterprise_data_controls = false - - # Indicates support for client certificates provisioning. - enterprise_client_certificates = is_win || is_mac || is_linux -@@ -35,7 +35,7 @@ declare_args() { - # the fact that `enterprise_cloud_content_analysis` is a superset of - # `enterprise_local_content_analysis`. - enterprise_content_analysis = -- enterprise_cloud_content_analysis || enterprise_local_content_analysis -+ false - } - - # These two flags are equivalent, but `enable_print_content_analysis` still --- a/components/password_manager/content/browser/content_password_manager_driver.cc +++ b/components/password_manager/content/browser/content_password_manager_driver.cc -@@ -558,7 +558,7 @@ void ContentPasswordManagerDriver::Check +@@ -565,7 +565,7 @@ void ContentPasswordManagerDriver::Check if (!password_manager::bad_message::CheckFrameNotPrerendering( render_frame_host_)) return; @@ -2832,7 +3334,7 @@ } --- a/components/password_manager/core/browser/password_manager_client.h +++ b/components/password_manager/core/browser/password_manager_client.h -@@ -405,11 +405,14 @@ class PasswordManagerClient { +@@ -406,11 +406,14 @@ class PasswordManagerClient { // Returns the current best guess as to the page's display language. virtual autofill::LanguageCode GetPageLanguage() const; @@ -2888,7 +3390,7 @@ configs += [ "//build/config/compiler:wexit_time_destructors" ] --- a/components/safe_browsing/core/browser/db/hash_prefix_map.h +++ b/components/safe_browsing/core/browser/db/hash_prefix_map.h -@@ -10,6 +10,7 @@ +@@ -11,6 +11,7 @@ #include #include "base/files/memory_mapped_file.h" @@ -2916,26 +3418,22 @@ #include "components/safe_browsing/core/common/utils.h" #include "google_apis/google_api_keys.h" #include "net/base/net_errors.h" -@@ -110,17 +109,7 @@ constexpr net::NetworkTrafficAnnotationT +@@ -110,13 +109,7 @@ constexpr net::NetworkTrafficAnnotationT )"); - bool IsEnabled(PrefService* pref_service) { + bool IsEnabled(PrefService* pref_service, std::optional country) { - // If this class has been created, it is already known that the session is not -- // off-the-record and that the user's location is eligible, so -- // |is_off_the_record| is passed through as false and -- // |stored_permanent_country| as nullopt. |latest_country| is passed through -- // as null because it is not used. +- // off-the-record, so |is_off_the_record| is passed through as false. - return safe_browsing::hash_realtime_utils::DetermineHashRealTimeSelection( - /*is_off_the_record=*/false, pref_service, -- /*stored_permanent_country=*/std::nullopt, -- /*latest_country=*/std::nullopt) == +- /*latest_country=*/country) == - safe_browsing::hash_realtime_utils::HashRealTimeSelection:: - kHashRealTimeService; + return false; } GURL GetKeyFetchingUrl() { -@@ -369,25 +358,9 @@ void OhttpKeyService::MaybeStartServerTr +@@ -380,25 +373,9 @@ void OhttpKeyService::MaybeStartServerTr } void OhttpKeyService::PopulateKeyFromPref() { @@ -3005,7 +3503,7 @@ void TailoredSecurityService::TailoredSecurityTimestampUpdateCallback() { - if (base::FeatureList::IsEnabled( - safe_browsing::kTailoredSecurityRetryForSyncUsers)) { -- // TODO(crbug.com/1469133): remove sync flow last user interaction pref. +- // TODO(crbug.com/40925236): remove sync flow last user interaction pref. - prefs_->SetInteger(prefs::kTailoredSecuritySyncFlowLastUserInteractionState, - TailoredSecurityRetryState::UNKNOWN); - prefs_->SetTime(prefs::kTailoredSecuritySyncFlowLastRunTime, @@ -3053,7 +3551,7 @@ raw_ptr identity_manager_; --- a/components/safe_browsing/core/browser/verdict_cache_manager.cc +++ b/components/safe_browsing/core/browser/verdict_cache_manager.cc -@@ -442,16 +442,6 @@ VerdictCacheManager::VerdictCacheManager +@@ -443,16 +443,6 @@ VerdictCacheManager::VerdictCacheManager // pref_service can be null in tests. if (pref_service) { pref_change_registrar_.Init(pref_service); @@ -3284,14 +3782,3 @@ } UpdateService::UpdateService( ---- a/printing/buildflags/buildflags.gni -+++ b/printing/buildflags/buildflags.gni -@@ -48,7 +48,7 @@ declare_args() { - - # Enable snapshotting a page when printing for its content to be analyzed for - # sensitive content by enterprise users. -- enable_print_content_analysis = is_chromeos || is_win || is_linux || is_mac -+ enable_print_content_analysis = false - } - - declare_args() { diff --git a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch index 7e8012b3..7edeb5ed 100644 --- a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch +++ b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch @@ -23,7 +23,7 @@ // TODO(amalova): Make sure NetworkContextParams is configured correctly when --- a/chrome/browser/android/signin/signin_manager_android.cc +++ b/chrome/browser/android/signin/signin_manager_android.cc -@@ -32,7 +32,6 @@ +@@ -34,7 +34,6 @@ #include "components/policy/core/common/policy_switches.h" #include "components/prefs/pref_service.h" #include "components/signin/internal/identity_manager/account_tracker_service.h" @@ -31,17 +31,19 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_managed_status_finder.h" #include "components/signin/public/identity_manager/accounts_cookie_mutator.h" -@@ -111,9 +110,6 @@ class ProfileDataRemover : public conten +@@ -119,11 +118,6 @@ class ProfileDataRemover : public conten // All the Profile data has been wiped. Clear the last signed in username // as well, so that the next signin doesn't trigger the account // change dialog. - profile_->GetPrefs()->ClearPref(prefs::kGoogleServicesLastSyncingGaiaId); - profile_->GetPrefs()->ClearPref( - prefs::kGoogleServicesLastSyncingUsername); +- profile_->GetPrefs()->ClearPref( +- prefs::kGoogleServicesLastSignedInUsername); } origin_runner_->PostTask(FROM_HERE, std::move(callback_)); -@@ -151,11 +147,6 @@ SigninManagerAndroid::SigninManagerAndro +@@ -161,11 +155,6 @@ SigninManagerAndroid::SigninManagerAndro DCHECK(user_cloud_policy_manager_); DCHECK(user_policy_signin_service_); @@ -53,7 +55,7 @@ force_browser_signin_.Init(prefs::kForceBrowserSignin, g_browser_process->local_state()); -@@ -191,7 +182,7 @@ SigninManagerAndroid::ManagementCredenti +@@ -201,7 +190,7 @@ SigninManagerAndroid::ManagementCredenti SigninManagerAndroid::ManagementCredentials::~ManagementCredentials() = default; bool SigninManagerAndroid::IsSigninAllowed() const { @@ -64,7 +66,7 @@ jboolean SigninManagerAndroid::IsSigninAllowedByPolicy(JNIEnv* env) const { --- a/chrome/browser/android/signin/signin_manager_android.h +++ b/chrome/browser/android/signin/signin_manager_android.h -@@ -125,9 +125,6 @@ class SigninManagerAndroid : public Keye +@@ -144,9 +144,6 @@ class SigninManagerAndroid : public Keye const raw_ptr profile_ = nullptr; @@ -182,7 +184,7 @@ } --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -292,7 +292,6 @@ +@@ -294,7 +294,6 @@ #include "components/safe_browsing/core/browser/url_checker_delegate.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/hashprefix_realtime/hash_realtime_utils.h" @@ -202,7 +204,7 @@ #include "content/public/browser/browser_task_traits.h" --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc -@@ -866,8 +866,6 @@ void DownloadItemModel::ExecuteCommand(D +@@ -867,8 +867,6 @@ void DownloadItemModel::ExecuteCommand(D #if BUILDFLAG(FULL_SAFE_BROWSING) CompleteSafeBrowsingScan(); #endif @@ -211,7 +213,7 @@ [[fallthrough]]; case DownloadCommands::KEEP: #if BUILDFLAG(FULL_SAFE_BROWSING) -@@ -936,24 +934,9 @@ void DownloadItemModel::ExecuteCommand(D +@@ -937,24 +935,9 @@ void DownloadItemModel::ExecuteCommand(D DownloadUIModel::ExecuteCommand(download_commands, command); break; case DownloadCommands::DEEP_SCAN: { @@ -248,10 +250,10 @@ #include "net/base/mime_util.h" --- a/chrome/browser/download/download_ui_safe_browsing_util.cc +++ b/chrome/browser/download/download_ui_safe_browsing_util.cc -@@ -8,7 +8,6 @@ - #include "base/strings/stringprintf.h" - #include "components/download/public/common/download_item.h" +@@ -11,7 +11,6 @@ + #include "components/prefs/pref_service.h" #include "components/safe_browsing/content/common/file_type_policies.h" + #include "components/safe_browsing/core/common/features.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #if BUILDFLAG(FULL_SAFE_BROWSING) @@ -259,8 +261,8 @@ --- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc +++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc @@ -45,7 +45,6 @@ - #include "components/policy/core/common/chrome_schema.h" #include "components/prefs/pref_service.h" + #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" #include "components/safe_browsing/core/common/features.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/url_matcher/url_matcher.h" @@ -412,15 +414,15 @@ --- a/chrome/browser/enterprise/signin/oidc_managed_profile_creation_delegate.cc +++ b/chrome/browser/enterprise/signin/oidc_managed_profile_creation_delegate.cc -@@ -7,7 +7,6 @@ - #include "base/check.h" +@@ -8,7 +8,6 @@ + #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #include "chrome/browser/profiles/profile_attributes_storage.h" #include "components/prefs/pref_service.h" -#include "components/signin/public/base/signin_pref_names.h" OidcManagedProfileCreationDelegate::OidcManagedProfileCreationDelegate() = default; -@@ -35,8 +34,6 @@ void OidcManagedProfileCreationDelegate: +@@ -54,8 +53,6 @@ void OidcManagedProfileCreationDelegate: void OidcManagedProfileCreationDelegate::CheckManagedProfileStatus( Profile* new_profile) { @@ -526,15 +528,15 @@ std::string_view GetOAuth2MintTokenFlowVersion() { --- a/chrome/browser/extensions/api/preference/preference_api.cc +++ b/chrome/browser/extensions/api/preference/preference_api.cc -@@ -24,7 +24,6 @@ - #include "chrome/common/pref_names.h" - #include "components/autofill/core/common/autofill_prefs.h" +@@ -26,7 +26,6 @@ + #include "components/content_settings/core/common/pref_names.h" #include "components/prefs/pref_service.h" + #include "components/privacy_sandbox/tracking_protection_prefs.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "extensions/browser/api/content_settings/content_settings_service.h" #include "extensions/browser/extension_pref_value_map.h" #include "extensions/browser/extension_pref_value_map_factory.h" -@@ -695,17 +694,6 @@ ExtensionFunction::ResponseAction SetPre +@@ -697,17 +696,6 @@ ExtensionFunction::ResponseAction SetPre base::Value(browser_pref_value->GetBool())); } @@ -542,7 +544,7 @@ - // preference, it must also set |kSafeBrowsingEnhanced| to false. - // See crbug.com/1064722 for more background. - // -- // TODO(crbug.com/1064722): Consider extending +- // TODO(crbug.com/40681445): Consider extending - // chrome.privacy.services.safeBrowsingEnabled to a three-state enum. - if (prefs::kSafeBrowsingEnabled == browser_pref) { - prefs_helper->SetExtensionControlledPref(extension_id(), @@ -550,9 +552,9 @@ - scope, base::Value(false)); - } - prefs_helper->SetExtensionControlledPref(extension_id(), browser_pref, scope, - browser_pref_value->Clone()); -@@ -793,16 +781,6 @@ ExtensionFunction::ResponseAction ClearP + // TODO(https://b/333527273): Remove this logic & + // CookieControlsModeTransformer and replace with a transformer for this pref. +@@ -803,16 +791,6 @@ ExtensionFunction::ResponseAction ClearP prefs_helper->RemoveExtensionControlledPref(extension_id(), browser_pref, scope); @@ -560,7 +562,7 @@ - // it must also clear |kSafeBrowsingEnhanced|. See crbug.com/1064722 for - // more background. - // -- // TODO(crbug.com/1064722): Consider extending +- // TODO(crbug.com/40681445): Consider extending - // chrome.privacy.services.safeBrowsingEnabled to a three-state enum. - if (prefs::kSafeBrowsingEnabled == browser_pref) { - prefs_helper->RemoveExtensionControlledPref( @@ -571,15 +573,15 @@ did_just_control_pref) { --- a/chrome/browser/extensions/api/preference/preference_apitest.cc +++ b/chrome/browser/extensions/api/preference/preference_apitest.cc -@@ -30,7 +30,6 @@ - #include "components/password_manager/core/common/password_manager_pref_names.h" +@@ -31,7 +31,6 @@ #include "components/prefs/pref_service.h" #include "components/privacy_sandbox/privacy_sandbox_prefs.h" + #include "components/privacy_sandbox/tracking_protection_prefs.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/translate/core/browser/translate_pref_names.h" #include "content/public/test/browser_test.h" #include "content/public/test/test_devtools_protocol_client.h" -@@ -86,7 +85,6 @@ class ExtensionPreferenceApiTest +@@ -87,7 +86,6 @@ class ExtensionPreferenceApiTest prefs->GetInteger(prefetch::prefs::kNetworkPredictionOptions)); EXPECT_TRUE( prefs->GetBoolean(password_manager::prefs::kCredentialsEnableService)); @@ -587,7 +589,7 @@ EXPECT_TRUE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); VerifyPrefValueAndControlledState(prefs::kPrivacySandboxM1TopicsEnabled, base::Value(false), -@@ -124,7 +122,6 @@ class ExtensionPreferenceApiTest +@@ -125,7 +123,6 @@ class ExtensionPreferenceApiTest prefs->GetInteger(prefetch::prefs::kNetworkPredictionOptions)); EXPECT_FALSE( prefs->GetBoolean(password_manager::prefs::kCredentialsEnableService)); @@ -595,7 +597,7 @@ EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); VerifyPrefValueAndControlledState(prefs::kPrivacySandboxM1TopicsEnabled, base::Value(true), -@@ -209,7 +206,6 @@ IN_PROC_BROWSER_TEST_P(ExtensionPreferen +@@ -210,7 +207,6 @@ IN_PROC_BROWSER_TEST_P(ExtensionPreferen prefetch::prefs::kNetworkPredictionOptions, static_cast(prefetch::NetworkPredictionOptions::kDisabled)); prefs->SetBoolean(password_manager::prefs::kCredentialsEnableService, false); @@ -635,7 +637,7 @@ #include "components/spellcheck/browser/pref_names.h" #include "components/supervised_user/core/common/pref_names.h" #include "components/translate/core/browser/translate_pref_names.h" -@@ -305,8 +303,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -300,8 +298,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil #endif // Privacy page @@ -644,7 +646,7 @@ (*s_allowlist)[::prefs::kDnsOverHttpsMode] = settings_api::PrefType::kString; (*s_allowlist)[::prefs::kDnsOverHttpsTemplates] = settings_api::PrefType::kString; -@@ -329,16 +325,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -324,16 +320,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil settings_api::PrefType::kBoolean; // Security page @@ -663,7 +665,7 @@ (*s_allowlist)[::kGeneratedHttpsFirstModePref] = --- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc -@@ -727,9 +727,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore +@@ -732,9 +732,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateGetReferrerChainApiTest, GetReferrerChainForNonSafeBrowsingUser) { PrefService* pref_service = browser()->profile()->GetPrefs(); @@ -758,7 +760,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/common/url_constants.h" #include "extensions/browser/allowlist_state.h" -@@ -1130,19 +1129,6 @@ void InstalledLoader::RecordExtensionsMe +@@ -1128,19 +1127,6 @@ void InstalledLoader::RecordExtensionsMe base::UmaHistogramCounts100("Extensions.NotAllowlistedDisabled2", disabled_not_allowlisted_count); } @@ -780,7 +782,7 @@ int InstalledLoader::GetCreationFlags(const ExtensionInfo* info) { --- a/chrome/browser/extensions/pref_mapping.cc +++ b/chrome/browser/extensions/pref_mapping.cc -@@ -19,7 +19,6 @@ +@@ -20,7 +20,6 @@ #include "components/privacy_sandbox/privacy_sandbox_prefs.h" #include "components/privacy_sandbox/tracking_protection_prefs.h" #include "components/proxy_config/proxy_config_pref_names.h" @@ -788,7 +790,7 @@ #include "components/spellcheck/browser/pref_names.h" #include "components/translate/core/browser/translate_pref_names.h" -@@ -66,11 +65,6 @@ const PrefMappingEntry kMappings[] = { +@@ -67,11 +66,6 @@ const PrefMappingEntry kMappings[] = { APIPermissionID::kPrivacy}, {"doNotTrackEnabled", prefs::kEnableDoNotTrack, APIPermissionID::kPrivacy, APIPermissionID::kPrivacy}, @@ -810,7 +812,7 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/first_party_sets_handler.h" -@@ -1167,15 +1166,8 @@ void ProfileNetworkContextService::Confi +@@ -1124,15 +1123,8 @@ void ProfileNetworkContextService::Confi network_context_params->enable_certificate_reporting = true; @@ -985,7 +987,7 @@ } // namespace policy --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -109,14 +109,11 @@ +@@ -110,14 +110,11 @@ #include "components/proxy_config/proxy_policy_handler.h" #include "components/safe_browsing/buildflags.h" #include "components/safe_browsing/content/common/file_type_policies_prefs.h" @@ -1049,7 +1051,7 @@ #if BUILDFLAG(ENABLE_PDF) { key::kPdfLocalFileAccessAllowedForDomains, prefs::kPdfLocalFileAccessAllowedForDomains, -@@ -701,9 +677,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -704,9 +680,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kRestoreOnStartupURLs, prefs::kURLsToRestoreOnStartup, base::Value::Type::LIST }, @@ -1059,7 +1061,7 @@ { key::kSameOriginTabCaptureAllowedByOrigins, prefs::kSameOriginTabCaptureAllowedByOrigins, base::Value::Type::LIST }, -@@ -815,9 +788,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -818,9 +791,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kAdditionalDnsQueryTypesEnabled, prefs::kAdditionalDnsQueryTypesEnabled, base::Value::Type::BOOLEAN }, @@ -1069,7 +1071,7 @@ { key::kForceGoogleSafeSearch, policy_prefs::kForceGoogleSafeSearch, base::Value::Type::BOOLEAN }, -@@ -873,9 +843,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -876,9 +846,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kRequireOnlineRevocationChecksForLocalAnchors, prefs::kCertRevocationCheckingRequiredLocalAnchors, base::Value::Type::BOOLEAN }, @@ -1077,9 +1079,9 @@ - prefs::kSafeBrowsingSurveysEnabled, - base::Value::Type::BOOLEAN }, #endif // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) - // || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC) - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ -@@ -1749,9 +1716,6 @@ const PolicyToPreferenceMapEntry kSimple + // || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +@@ -1751,9 +1718,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kUnmanagedDeviceSignalsConsentFlowEnabled, device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, base::Value::Type::BOOLEAN }, @@ -1087,8 +1089,8 @@ - prefs::kProfileSeparationDomainExceptionList, - base::Value::Type::LIST }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ - || BUILDFLAG(IS_FUCHSIA) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + { key::kDefaultBrowserSettingEnabled, @@ -1812,9 +1776,6 @@ const PolicyToPreferenceMapEntry kSimple prefs::kImportDialogAutofillFormData, base::Value::Type::BOOLEAN }, @@ -1099,17 +1101,17 @@ { key::kHardwareAccelerationModeEnabled, prefs::kHardwareAccelerationModeEnabled, base::Value::Type::BOOLEAN }, -@@ -2096,9 +2057,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -2094,9 +2055,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kGoogleSearchSidePanelEnabled, prefs::kGoogleSearchSidePanelEnabled, base::Value::Type::BOOLEAN }, - { key::kSafeBrowsingDeepScanningEnabled, - prefs::kSafeBrowsingDeepScanningEnabled, - base::Value::Type::BOOLEAN }, - #endif // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA) + #endif // BUILDFLAG(IS_ANDROID) { key::kAllowBackForwardCacheForCacheControlNoStorePageEnabled, policy_prefs::kAllowBackForwardCacheForCacheControlNoStorePageEnabled, -@@ -2330,12 +2288,6 @@ std::unique_ptrAddHandler( std::make_unique()); -@@ -2526,21 +2478,7 @@ std::unique_ptrAddHandler(std::make_unique( key::kProfileReauthPrompt, enterprise_signin::prefs::kProfileReauthPrompt, static_cast(enterprise_signin::ProfileReauthPrompt::kDoNotPrompt), -@@ -2629,24 +2567,6 @@ std::unique_ptr> signin_legacy_policies; @@ -1171,22 +1173,23 @@ std::make_unique(chrome_schema))); --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -158,14 +158,12 @@ +@@ -158,7 +158,6 @@ #include "components/privacy_sandbox/privacy_sandbox_prefs.h" #include "components/proxy_config/pref_proxy_config_tracker_impl.h" #include "components/safe_browsing/content/common/file_type_policies_prefs.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/saved_tab_groups/pref_names.h" #include "components/search_engines/template_url_prepopulate_data.h" #include "components/security_interstitials/content/insecure_form_blocking_page.h" - #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" +@@ -166,7 +165,6 @@ #include "components/segmentation_platform/embedder/default_model/device_switcher_result_dispatcher.h" #include "components/segmentation_platform/public/segmentation_platform_service.h" #include "components/sessions/core/session_id_generator.h" -#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/site_engagement/content/site_engagement_service.h" - #include "components/subresource_filter/content/shared/browser/ruleset_service.h" -@@ -1549,7 +1547,6 @@ void RegisterLocalState(PrefRegistrySimp +@@ -1632,7 +1630,6 @@ void RegisterLocalState(PrefRegistrySimp PushMessagingServiceImpl::RegisterPrefs(registry); #endif RegisterScreenshotPrefs(registry); @@ -1194,7 +1197,7 @@ secure_origin_allowlist::RegisterPrefs(registry); segmentation_platform::SegmentationPlatformService::RegisterLocalStatePrefs( registry); -@@ -1851,8 +1848,6 @@ void RegisterProfilePrefs(user_prefs::Pr +@@ -1942,8 +1939,6 @@ void RegisterProfilePrefs(user_prefs::Pr QuietNotificationPermissionUiState::RegisterProfilePrefs(registry); RegisterBrowserUserPrefs(registry); RegisterPrefersDefaultScrollbarStylesPrefs(registry); @@ -1203,7 +1206,7 @@ SearchPrefetchService::RegisterProfilePrefs(registry); blocked_content::SafeBrowsingTriggeredPopupBlocker::RegisterProfilePrefs( registry); -@@ -2396,20 +2391,6 @@ void MigrateObsoleteProfilePrefs(PrefSer +@@ -2524,20 +2519,6 @@ void MigrateObsoleteProfilePrefs(PrefSer chrome_browser_net::secure_dns::MigrateProbesSettingToOrFromBackup( profile_prefs); @@ -1224,7 +1227,7 @@ // TODO(326079444): After experiment is over, update the deprecated date and // allow this to be cleaned up. -@@ -2668,9 +2649,6 @@ void MigrateObsoleteProfilePrefs(PrefSer +@@ -2796,9 +2777,6 @@ void MigrateObsoleteProfilePrefs(PrefSer // If the sync (old) pref still exists, copy it to signin (new), // and clear the sync part of the pref. if (profile_prefs->HasPrefPath(kSync_ExplicitBrowserSignin)) { @@ -1234,7 +1237,7 @@ profile_prefs->ClearPref(kSync_ExplicitBrowserSignin); } -@@ -2762,10 +2740,6 @@ void MigrateObsoleteProfilePrefs(PrefSer +@@ -2890,10 +2868,6 @@ void MigrateObsoleteProfilePrefs(PrefSer // Added 03/2024. profile_prefs->ClearPref(kDefaultSearchProviderChoicePendingDeprecated); @@ -1304,6 +1307,16 @@ {29, prefs::kMediaStorageIdSalt, EnforcementLevel::ENFORCE_ON_LOAD, PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, #if BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING) +@@ -173,9 +158,6 @@ const prefs::TrackedPreferenceMetadata k + {32, prefs::kMediaCdmOriginData, EnforcementLevel::ENFORCE_ON_LOAD, + PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, + #endif // BUILDFLAG(IS_WIN) +- {33, prefs::kGoogleServicesLastSignedInUsername, +- EnforcementLevel::ENFORCE_ON_LOAD, PrefTrackingStrategy::ATOMIC, +- ValueType::PERSONAL}, + + // See note at top, new items added here also need to be added to + // histograms.xml's TrackedPreference enum. --- a/chrome/browser/prefs/pref_functional_browsertest.cc +++ b/chrome/browser/prefs/pref_functional_browsertest.cc @@ -24,7 +24,6 @@ @@ -1334,24 +1347,24 @@ EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); --- a/chrome/browser/profiles/gaia_info_update_service.cc +++ b/chrome/browser/profiles/gaia_info_update_service.cc -@@ -18,7 +18,6 @@ +@@ -19,7 +19,6 @@ #include "components/prefs/pref_service.h" #include "components/signin/public/base/avatar_icon_util.h" #include "components/signin/public/base/consent_level.h" -#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" - #include "content/public/browser/storage_partition.h" --- a/chrome/browser/profiles/gaia_info_update_service_unittest.cc +++ b/chrome/browser/profiles/gaia_info_update_service_unittest.cc -@@ -28,7 +28,6 @@ - #include "chrome/test/base/testing_profile_manager.h" +@@ -29,7 +29,6 @@ #include "components/prefs/pref_service.h" #include "components/profile_metrics/state.h" + #include "components/signin/public/base/consent_level.h" -#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/sync_preferences/pref_service_syncable.h" - #include "content/public/test/browser_task_environment.h" --- a/chrome/browser/profiles/profile_attributes_entry.cc +++ b/chrome/browser/profiles/profile_attributes_entry.cc @@ -28,7 +28,6 @@ @@ -1381,14 +1394,14 @@ void ProfileAttributesEntry::SetDasherlessManagement(bool value) { --- a/chrome/browser/profiles/profile_attributes_storage.cc +++ b/chrome/browser/profiles/profile_attributes_storage.cc -@@ -42,7 +42,6 @@ +@@ -41,7 +41,6 @@ #include "components/prefs/scoped_user_pref_update.h" #include "components/profile_metrics/state.h" #include "components/signin/public/base/persistent_repeating_timer.h" -#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_managed_status_finder.h" #include "content/public/browser/browser_task_traits.h" - #include "content/public/browser/browser_thread.h" @@ -405,9 +404,7 @@ void ProfileAttributesStorage::AddProfil params.profile_name, /*include_check_for_legacy_profile_name*/ false)) @@ -1402,7 +1415,7 @@ info.Set(ProfileAttributesEntry::kAccountIdKey, --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -149,7 +149,6 @@ +@@ -148,7 +148,6 @@ #include "components/profile_metrics/browser_profile_type.h" #include "components/safe_search_api/safe_search_util.h" #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" @@ -1412,7 +1425,7 @@ #include "components/spellcheck/spellcheck_buildflags.h" --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -90,7 +90,6 @@ +@@ -89,7 +89,6 @@ #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_metrics.h" @@ -1420,7 +1433,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" #include "components/supervised_user/core/browser/child_account_service.h" -@@ -1976,8 +1975,7 @@ void ProfileManager::AddProfileToStorage +@@ -1975,8 +1974,7 @@ void ProfileManager::AddProfileToStorage entry->SetAuthInfo(account_info.gaia, username, is_consented_primary_account); @@ -1430,7 +1443,7 @@ #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) // Sign out if force-sign-in policy is enabled and profile is not signed -@@ -2026,14 +2024,13 @@ void ProfileManager::AddProfileToStorage +@@ -2025,14 +2023,13 @@ void ProfileManager::AddProfileToStorage init_params.is_ephemeral = IsForceEphemeralProfilesEnabled(profile); init_params.is_signed_in_with_credential_provider = @@ -1969,7 +1982,7 @@ #include "content/public/browser/browser_task_traits.h" --- a/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc +++ b/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc -@@ -96,7 +96,6 @@ +@@ -97,7 +97,6 @@ #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" @@ -2241,7 +2254,7 @@ // Record the current enhanced protection pref state for regular profiles only if (profiles::IsRegularUserProfile(profile)) { -@@ -505,18 +490,6 @@ void SafeBrowsingService::RefreshState() +@@ -519,18 +504,6 @@ void SafeBrowsingService::RefreshState() // Check if any profile requires the service to be active. enabled_by_prefs_ = false; @@ -2286,7 +2299,7 @@ // Get current enabled status. Must be called on IO thread. bool enabled() const { DCHECK_CURRENTLY_ON(content::BrowserThread::IO); -@@ -326,10 +316,6 @@ class SafeBrowsingService : public SafeB +@@ -333,10 +323,6 @@ class SafeBrowsingService : public SafeB std::unique_ptr proxy_config_monitor_; @@ -2415,7 +2428,7 @@ --- a/chrome/browser/signin/bound_session_credentials/bound_session_cookie_refresh_service_factory.cc +++ b/chrome/browser/signin/bound_session_credentials/bound_session_cookie_refresh_service_factory.cc @@ -18,7 +18,6 @@ - #include "chrome/browser/signin/signin_features.h" + #include "chrome/browser/signin/bound_session_credentials/unexportable_key_service_factory.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/signin/public/base/account_consistency_method.h" -#include "components/signin/public/base/signin_pref_names.h" @@ -2432,15 +2445,15 @@ } --- a/chrome/browser/signin/chrome_device_id_helper.cc +++ b/chrome/browser/signin/chrome_device_id_helper.cc -@@ -19,7 +19,6 @@ +@@ -18,7 +18,6 @@ + #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/browser_process.h" - #include "chrome/browser/signin/signin_features.h" #include "components/prefs/pref_service.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/base/signin_switches.h" #include "components/user_manager/known_user.h" #include "components/user_manager/user_manager.h" -@@ -88,21 +87,11 @@ void MigrateSigninScopedDeviceId(Profile +@@ -87,21 +86,11 @@ void MigrateSigninScopedDeviceId(Profile user_manager::KnownUser known_user(g_browser_process->local_state()); const AccountId account_id = user->GetAccountId(); if (known_user.GetDeviceId(account_id).empty()) { @@ -2468,7 +2481,7 @@ #endif --- a/chrome/browser/signin/chrome_signin_client.cc +++ b/chrome/browser/signin/chrome_signin_client.cc -@@ -46,7 +46,6 @@ +@@ -45,7 +45,6 @@ #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_client.h" #include "components/signin/public/base/signin_metrics.h" @@ -2488,7 +2501,7 @@ #include "components/user_manager/user.h" --- a/chrome/browser/signin/dice_browsertest.cc +++ b/chrome/browser/signin/dice_browsertest.cc -@@ -66,7 +66,6 @@ +@@ -69,7 +69,6 @@ #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_client.h" #include "components/signin/public/base/signin_metrics.h" @@ -2508,7 +2521,7 @@ #include "content/public/browser/storage_partition.h" --- a/chrome/browser/signin/dice_web_signin_interceptor.cc +++ b/chrome/browser/signin/dice_web_signin_interceptor.cc -@@ -71,7 +71,6 @@ +@@ -72,7 +72,6 @@ #include "components/search_engines/template_url_service.h" #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_metrics.h" @@ -2516,7 +2529,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/account_managed_status_finder.h" -@@ -330,16 +329,8 @@ void DiceWebSigninInterceptor::RegisterP +@@ -315,16 +314,8 @@ void DiceWebSigninInterceptor::RegisterP registry->RegisterBooleanPref(prefs::kSigninInterceptionEnabled, true); registry->RegisterStringPref(prefs::kManagedAccountsSigninRestriction, std::string()); @@ -2530,10 +2543,10 @@ - registry->RegisterListPref(prefs::kProfileSeparationDomainExceptionList); - registry->RegisterStringPref( - prefs::kUserCloudSigninPolicyResponseFromPolicyTestPage, std::string()); - // TODO(b/314079566): Consider merging the different similar pref counts into - // a single pref where the email hash maps to multiple values, includes the - // following two prefs and `kProfileCreationInterceptionDeclinedPref` above. -@@ -1397,16 +1388,6 @@ void DiceWebSigninInterceptor:: + } + + std::optional +@@ -1319,16 +1310,6 @@ void DiceWebSigninInterceptor:: g_browser_process->browser_policy_connector(), g_browser_process->system_network_context_manager() ->GetSharedURLLoaderFactory()); @@ -2560,7 +2573,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/identity_manager.h" -@@ -139,7 +138,7 @@ void HeaderModificationDelegateImpl::Pro +@@ -151,7 +150,7 @@ void HeaderModificationDelegateImpl::Pro #endif #if BUILDFLAG(ENABLE_DICE_SUPPORT) sync_service && sync_service->IsSyncFeatureEnabled(), @@ -2687,18 +2700,18 @@ IsValidUnconsentedPrimaryAccount(current_primary_account); --- a/chrome/browser/signin/signin_promo_util.cc +++ b/chrome/browser/signin/signin_promo_util.cc -@@ -9,7 +9,6 @@ - #include "chrome/browser/signin/identity_manager_factory.h" +@@ -10,7 +10,6 @@ + #include "chrome/browser/signin/reauth_result.h" #include "components/prefs/pref_service.h" #include "components/signin/public/base/consent_level.h" -#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" - #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" -@@ -18,47 +17,7 @@ - namespace signin { - - bool ShouldShowPromo(Profile& profile, ConsentLevel promo_type) { +@@ -39,41 +38,7 @@ namespace { + // ShouldShowSyncPromo and ShouldShowSignInPromo). |profile| is the profile of + // the tab the promo would be shown on. + bool ShouldShowPromoCommon(Profile& profile) { -#if BUILDFLAG(IS_CHROMEOS_ASH) - // There's no need to show the sign in promo on cros since cros users are - // already logged in. @@ -2722,30 +2735,24 @@ - if (!original_profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed)) return false; - -- IdentityManager* identity_manager = +- signin::IdentityManager* identity_manager = - IdentityManagerFactory::GetForProfile(original_profile); - - // No promo if the user is already syncing. -- if (identity_manager->HasPrimaryAccount(ConsentLevel::kSync)) { +- if (identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync)) { - return false; - } - -- // Sync Promos are always shown when the user is not syncing. -- if (promo_type == ConsentLevel::kSync) { -- return true; -- } -- -- // Signin promo is shown if the user is not signed in or needs to reauth. -- return !identity_manager->HasPrimaryAccount(ConsentLevel::kSignin) || -- identity_manager->HasAccountWithRefreshTokenInPersistentErrorState( -- identity_manager->GetPrimaryAccountId(ConsentLevel::kSignin)); +- // Verified the base checks. Depending on whether the promo should be for sync +- // or signin, additional checks are necessary. +- return true; -#endif } - bool ShouldShowSignInPromo(Profile& profile, + } // namespace --- a/chrome/browser/signin/signin_ui_util.cc +++ b/chrome/browser/signin/signin_ui_util.cc -@@ -41,7 +41,6 @@ +@@ -40,7 +40,6 @@ #include "components/prefs/pref_service.h" #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_metrics.h" @@ -2755,15 +2762,15 @@ #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" --- a/chrome/browser/signin/signin_util.cc +++ b/chrome/browser/signin/signin_util.cc -@@ -29,7 +29,6 @@ - #include "components/google/core/common/google_util.h" +@@ -32,7 +32,6 @@ #include "components/policy/core/browser/signin/profile_separation_policies.h" #include "components/prefs/pref_service.h" + #include "components/signin/core/browser/account_reconcilor.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/identity_manager/account_managed_status_finder.h" + #include "components/signin/public/identity_manager/accounts_mutator.h" #include "content/public/browser/storage_partition.h" - #include "google_apis/gaia/gaia_auth_util.h" -@@ -64,8 +63,7 @@ ScopedForceSigninSetterForTesting::~Scop +@@ -69,8 +68,7 @@ ScopedForceSigninSetterForTesting::~Scop CookiesMover::CookiesMover(base::WeakPtr source_profile, base::WeakPtr destination_profile, base::OnceCallback callback) @@ -2773,7 +2780,7 @@ source_profile_(std::move(source_profile)), destination_profile_(std::move(destination_profile)), callback_(std::move(callback)) { -@@ -75,25 +73,7 @@ CookiesMover::CookiesMover(base::WeakPtr +@@ -80,25 +78,7 @@ CookiesMover::CookiesMover(base::WeakPtr CookiesMover::~CookiesMover() = default; void CookiesMover::StartMovingCookies() { @@ -2799,7 +2806,7 @@ } void CookiesMover::OnCookiesReceived( -@@ -235,16 +215,7 @@ bool ProfileSeparationAllowsKeepingUnman +@@ -240,16 +220,7 @@ bool ProfileSeparationAllowsKeepingUnman bool IsAccountExemptedFromEnterpriseProfileSeparation( Profile* profile, const std::string& email) { @@ -2898,7 +2905,7 @@ --- a/chrome/browser/ssl/ssl_browsertest.cc +++ b/chrome/browser/ssl/ssl_browsertest.cc -@@ -94,7 +94,6 @@ +@@ -95,7 +95,6 @@ #include "components/policy/policy_constants.h" #include "components/prefs/testing_pref_service.h" #include "components/safe_browsing/core/common/features.h" @@ -2918,7 +2925,7 @@ #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" --- a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc +++ b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc -@@ -45,7 +45,6 @@ +@@ -44,7 +44,6 @@ #include "components/autofill/core/common/autofill_features.h" #include "components/autofill/core/common/autofill_payments_features.h" #include "components/signin/public/base/signin_buildflags.h" @@ -2928,7 +2935,7 @@ #include "components/sync/service/sync_service.h" --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc -@@ -81,7 +81,6 @@ +@@ -84,7 +84,6 @@ #include "components/sessions/core/tab_restore_service.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_metrics.h" @@ -2948,7 +2955,7 @@ #include "ui/events/keycodes/dom/dom_code.h" --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc -@@ -80,7 +80,6 @@ +@@ -82,7 +82,6 @@ #if !BUILDFLAG(IS_ANDROID) #include "base/metrics/histogram_functions.h" #include "chrome/browser/signin/identity_manager_factory.h" @@ -2958,7 +2965,7 @@ --- a/chrome/browser/ui/hats/trust_safety_sentiment_service.cc +++ b/chrome/browser/ui/hats/trust_safety_sentiment_service.cc -@@ -27,8 +27,6 @@ +@@ -31,8 +31,6 @@ #include "components/privacy_sandbox/privacy_sandbox_prefs.h" #include "components/privacy_sandbox/tracking_protection_prefs.h" #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h" @@ -2967,7 +2974,7 @@ #include "components/unified_consent/pref_names.h" #include "components/version_info/channel.h" -@@ -74,9 +72,6 @@ bool HasNonDefaultPrivacySetting(Profile +@@ -78,9 +76,6 @@ bool HasNonDefaultPrivacySetting(Profile auto* prefs = profile->GetPrefs(); std::vector prefs_to_check = { @@ -2977,7 +2984,7 @@ prefs::kEnableDoNotTrack, password_manager::prefs::kPasswordLeakDetectionEnabled, prefs::kCookieControlsMode, -@@ -94,13 +89,9 @@ bool HasNonDefaultPrivacySetting(Profile +@@ -98,13 +93,9 @@ bool HasNonDefaultPrivacySetting(Profile // Users consenting to sync automatically enable UKM collection auto* ukm_pref = prefs->FindPreference( unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled); @@ -2992,7 +2999,7 @@ // Check the default value for each user facing content setting. Note that // this will not include content setting exceptions set via permission -@@ -175,8 +166,6 @@ std::map BuildProduct +@@ -177,8 +168,6 @@ std::map BuildProduct PasswordProtectionUIType ui_type, PasswordProtectionUIAction action) { std::map product_specific_data; @@ -3001,7 +3008,7 @@ product_specific_data["Is page info UI"] = false; product_specific_data["Is modal dialog UI"] = false; product_specific_data["Is interstitial UI"] = false; -@@ -433,31 +422,12 @@ void TrustSafetySentimentService::Intera +@@ -437,31 +426,12 @@ void TrustSafetySentimentService::Intera void TrustSafetySentimentService::InteractedWithSafeBrowsingInterstitial( bool did_proceed, safe_browsing::SBThreatType threat_type) { @@ -3033,6 +3040,36 @@ product_specific_data["Is mainpage UI"] = false; product_specific_data["Is downloads page UI"] = false; product_specific_data["Is download prompt UI"] = false; +--- a/chrome/browser/ui/safety_hub/card_data_helper.cc ++++ b/chrome/browser/ui/safety_hub/card_data_helper.cc +@@ -28,7 +28,6 @@ + #include "chrome/browser/upgrade_detector/build_state.h" + #include "chrome/grit/branded_strings.h" + #include "chrome/grit/generated_resources.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/signin/public/identity_manager/identity_manager.h" + #include "ui/base/l10n/l10n_util.h" + +@@ -50,19 +49,6 @@ base::Value::Dict CardDataToValue(int he + + // Returns the state of Safe Browsing setting. + SafeBrowsingState GetSafeBrowsingState(PrefService* pref_service) { +- // TODO(crbug.com/40267370): Use SafeBrowsingResult from Safety Hub instead. +- if (safe_browsing::IsEnhancedProtectionEnabled(*pref_service)) { +- return SafeBrowsingState::kEnabledEnhanced; +- } +- if (safe_browsing::IsSafeBrowsingEnabled(*pref_service)) { +- return SafeBrowsingState::kEnabledStandard; +- } +- if (safe_browsing::IsSafeBrowsingPolicyManaged(*pref_service)) { +- return SafeBrowsingState::kDisabledByAdmin; +- } +- if (safe_browsing::IsSafeBrowsingExtensionControlled(*pref_service)) { +- return SafeBrowsingState::kDisabledByExtension; +- } + return SafeBrowsingState::kDisabledByUser; + } + --- a/chrome/browser/ui/safety_hub/menu_notification_service.cc +++ b/chrome/browser/ui/safety_hub/menu_notification_service.cc @@ -20,7 +20,6 @@ @@ -3043,10 +3080,10 @@ namespace { SafetyHubModuleInfoElement::SafetyHubModuleInfoElement() = default; -@@ -83,15 +82,6 @@ SafetyHubMenuNotificationService::Safety - base::BindRepeating(&PasswordStatusCheckService::GetCachedResult, - base::Unretained(password_check_service)), - stored_notifications); +@@ -102,15 +101,6 @@ SafetyHubMenuNotificationService::Safety + base::Unretained(password_check_service)), + stored_notifications); + } - - // Listen for changes to the Safe Browsing pref to accommodate the trigger - // logic. @@ -3092,6 +3129,47 @@ return std::make_unique( SafeBrowsingState::kDisabledByUser); } +--- a/chrome/browser/ui/signin/cookie_clear_on_exit_migration_notice.cc ++++ b/chrome/browser/ui/signin/cookie_clear_on_exit_migration_notice.cc +@@ -23,7 +23,6 @@ + #include "components/prefs/pref_service.h" + #include "components/signin/public/base/consent_level.h" + #include "components/signin/public/base/signin_buildflags.h" +-#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/identity_manager/identity_manager.h" + #include "components/strings/grit/components_strings.h" + #include "ui/base/l10n/l10n_util.h" +@@ -67,7 +66,6 @@ void OpenCookieSettingsAndCloseDialog(Br + } + + bool SetCookieClearOnExitMigrationComplete(PrefService& prefs, bool can_close) { +- prefs.SetBoolean(prefs::kCookieClearOnExitMigrationNoticeComplete, true); + return can_close; + } + +@@ -78,11 +76,6 @@ bool SetCookieClearOnExitMigrationComple + bool CanShowCookieClearOnExitMigrationNotice(const Browser& browser) { + #if BUILDFLAG(ENABLE_DICE_SUPPORT) + Profile* profile = browser.profile(); +- PrefService* prefs = profile->GetPrefs(); +- +- if (prefs->GetBoolean(prefs::kCookieClearOnExitMigrationNoticeComplete)) { +- return false; +- } + + if (CookieClearOnExitMigrationNoticeShowingUserData::HasForProfile( + *profile)) { +@@ -96,10 +89,6 @@ bool CanShowCookieClearOnExitMigrationNo + // User has to be signed in with UNO (non-syncing). + signin::IdentityManager* identity_manager = + IdentityManagerFactory::GetForProfile(profile); +- if (!prefs->GetBoolean(prefs::kExplicitBrowserSignin)) { +- return false; +- } +- + if (identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync)) { + return false; + } --- a/chrome/browser/ui/signin/signin_view_controller.cc +++ b/chrome/browser/ui/signin/signin_view_controller.cc @@ -26,7 +26,6 @@ @@ -3102,15 +3180,13 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" -@@ -235,17 +234,6 @@ void SigninViewController::SignoutOrReau +@@ -234,15 +233,6 @@ void SigninViewController::SignoutOrReau &SigninViewController::SignoutOrReauthWithPromptWithUnsyncedDataTypes, weak_ptr_factory_.GetWeakPtr(), reauth_access_point, profile_signout_source, token_signout_source); - // Fetch the unsynced datatypes, as this is required to decide whether the - // confirmation prompt is needed. - if (sync_service && -- switches::IsExplicitBrowserSigninUIOnDesktopEnabled( -- switches::ExplicitBrowserSigninPhase::kFull) && - profile->GetPrefs()->GetBoolean(prefs::kExplicitBrowserSignin)) { - sync_service->GetTypesWithUnsyncedData( - syncer::TypesRequiringUnsyncedDataCheckOnSignout(), @@ -3122,15 +3198,15 @@ } --- a/chrome/browser/ui/startup/first_run_service.cc +++ b/chrome/browser/ui/startup/first_run_service.cc -@@ -33,7 +33,6 @@ +@@ -29,7 +29,6 @@ #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" #include "components/signin/public/base/consent_level.h" -#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/identity_manager.h" - #include "content/public/browser/browser_context.h" -@@ -110,47 +109,7 @@ enum class PolicyEffect { +@@ -107,47 +106,7 @@ enum class PolicyEffect { }; PolicyEffect ComputeDevicePolicyEffect(Profile& profile) { @@ -3181,15 +3257,15 @@ void SetFirstRunFinished(FirstRunService::FinishedReason reason) { --- a/chrome/browser/ui/toolbar/app_menu_model.cc +++ b/chrome/browser/ui/toolbar/app_menu_model.cc -@@ -96,7 +96,6 @@ - #include "components/prefs/pref_service.h" +@@ -99,7 +99,6 @@ #include "components/profile_metrics/browser_profile_type.h" + #include "components/saved_tab_groups/features.h" #include "components/signin/public/base/signin_metrics.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/strings/grit/components_strings.h" #include "components/vector_icons/vector_icons.h" -@@ -531,62 +530,7 @@ int ProfileSubMenuModel::GetAndIncrement +@@ -571,56 +570,7 @@ int ProfileSubMenuModel::GetAndIncrement } bool ProfileSubMenuModel::BuildSyncSection() { @@ -3222,31 +3298,25 @@ - if (error.has_value()) { - if (error == AvatarSyncErrorType::kSyncPaused) { - // If sync is paused the menu item will be specific to the paused error. -- AddItemWithStringIdAndIcon(IDC_SHOW_SIGNIN_WHEN_PAUSED, -- IDS_PROFILE_ROW_SIGN_IN_AGAIN, -- ui::ImageModel::FromVectorIcon( -- vector_icons::kSyncOffChromeRefreshIcon, -- ui::kColorMenuIcon, kDefaultIconSize)); +- AddItemWithStringIdAndVectorIcon(this, IDC_SHOW_SIGNIN_WHEN_PAUSED, +- IDS_PROFILE_ROW_SIGN_IN_AGAIN, +- vector_icons::kSyncOffChromeRefreshIcon); - } else { - // All remaining errors will have the same menu item. -- AddItemWithStringIdAndIcon( -- IDC_SHOW_SYNC_SETTINGS, IDS_PROFILE_ROW_SYNC_ERROR_MESSAGE, -- ui::ImageModel::FromVectorIcon( -- vector_icons::kSyncProblemChromeRefreshIcon, ui::kColorMenuIcon, -- kDefaultIconSize)); +- AddItemWithStringIdAndVectorIcon( +- this, IDC_SHOW_SYNC_SETTINGS, IDS_PROFILE_ROW_SYNC_ERROR_MESSAGE, +- vector_icons::kSyncProblemChromeRefreshIcon); - } - return true; - } - if (is_sync_feature_enabled) { -- AddItemWithStringIdAndIcon( -- IDC_SHOW_SYNC_SETTINGS, IDS_PROFILE_ROW_SYNC_IS_ON, -- ui::ImageModel::FromVectorIcon(vector_icons::kSyncChromeRefreshIcon, -- ui::kColorMenuIcon, kDefaultIconSize)); +- AddItemWithStringIdAndVectorIcon(this, IDC_SHOW_SYNC_SETTINGS, +- IDS_PROFILE_ROW_SYNC_IS_ON, +- vector_icons::kSyncChromeRefreshIcon); - } else { -- AddItemWithStringIdAndIcon( -- IDC_TURN_ON_SYNC, IDS_PROFILE_ROW_TURN_ON_SYNC, -- ui::ImageModel::FromVectorIcon(vector_icons::kSyncOffChromeRefreshIcon, -- ui::kColorMenuIcon, kDefaultIconSize)); +- AddItemWithStringIdAndVectorIcon(this, IDC_TURN_ON_SYNC, +- IDS_PROFILE_ROW_TURN_ON_SYNC, +- vector_icons::kSyncOffChromeRefreshIcon); - } - return true; } @@ -3272,9 +3342,38 @@ #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/identity_test_utils.h" +--- a/chrome/browser/ui/views/profiles/avatar_toolbar_button_delegate.cc ++++ b/chrome/browser/ui/views/profiles/avatar_toolbar_button_delegate.cc +@@ -50,7 +50,6 @@ + #include "components/prefs/pref_service.h" + #include "components/signin/public/base/consent_level.h" + #include "components/signin/public/base/signin_metrics.h" +-#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_switches.h" + #include "components/signin/public/identity_manager/identity_manager.h" + #include "components/signin/public/identity_manager/primary_account_change_event.h" +@@ -1422,18 +1421,6 @@ void AvatarToolbarButtonDelegate::OnErro + const CoreAccountInfo& account_info, + const GoogleServiceAuthError& error, + signin_metrics::SourceForRefreshTokenOperation token_operation_source) { +- if (base::FeatureList::IsEnabled( +- syncer::kReplaceSyncPromosWithSignInPromos) && +- profile_->GetPrefs()->GetBoolean(prefs::kExplicitBrowserSignin) && +- account_info == identity_manager_->GetPrimaryAccountInfo( +- signin::ConsentLevel::kSignin) && +- !identity_manager_->HasPrimaryAccount(signin::ConsentLevel::kSync) && +- error.state() == +- GoogleServiceAuthError::State::INVALID_GAIA_CREDENTIALS && +- token_operation_source == signin_metrics::SourceForRefreshTokenOperation:: +- kDiceResponseHandler_Signout) { +- avatar_toolbar_button_->MaybeShowWebSignoutIPH(account_info.gaia); +- } + } + + // static --- a/chrome/browser/ui/views/profiles/profile_menu_view.cc +++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc -@@ -66,7 +66,6 @@ +@@ -64,7 +64,6 @@ #include "components/signin/core/browser/signin_error_controller.h" #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_metrics.h" @@ -3282,7 +3381,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" -@@ -656,7 +655,6 @@ void ProfileMenuView::BuildAutofillButto +@@ -669,7 +668,6 @@ void ProfileMenuView::BuildAutofillButto void ProfileMenuView::BuildSyncInfo() { Profile* profile = browser()->profile(); @@ -3292,7 +3391,7 @@ if (!SyncServiceFactory::IsSyncAllowed(profile)) { --- a/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc +++ b/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc -@@ -74,7 +74,6 @@ +@@ -76,7 +76,6 @@ #include "components/password_manager/core/common/password_manager_features.h" #include "components/prefs/pref_service.h" #include "components/signin/public/base/consent_level.h" @@ -3345,7 +3444,7 @@ --- a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h +++ b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h -@@ -63,7 +63,6 @@ class PasswordReuseModalWarningDialog +@@ -64,7 +64,6 @@ class PasswordReuseModalWarningDialog private: OnWarningDone done_callback_; @@ -3365,15 +3464,15 @@ #include "content/public/browser/render_process_host.h" --- a/chrome/browser/ui/views/toolbar/app_menu.cc +++ b/chrome/browser/ui/views/toolbar/app_menu.cc -@@ -52,7 +52,6 @@ - #include "chrome/grit/generated_resources.h" +@@ -54,7 +54,6 @@ #include "chrome/grit/theme_resources.h" #include "components/bookmarks/browser/bookmark_model.h" + #include "components/saved_tab_groups/features.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/zoom/page_zoom.h" #include "components/zoom/zoom_controller.h" -@@ -347,67 +346,6 @@ void AddSignedInChipToProfileMenuItem( +@@ -365,67 +364,6 @@ void AddSignedInChipToProfileMenuItem( const int horizontal_padding, std::vector& profile_menu_subscription_list) { @@ -3467,7 +3566,7 @@ break; --- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc -@@ -50,7 +50,6 @@ +@@ -54,7 +54,6 @@ #include "components/history/core/common/pref_names.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/core/common/features.h" @@ -3477,7 +3576,7 @@ #include "content/public/browser/download_item_utils.h" --- a/chrome/browser/ui/webui/history/history_ui.cc +++ b/chrome/browser/ui/webui/history/history_ui.cc -@@ -49,7 +49,6 @@ +@@ -56,7 +56,6 @@ #include "components/page_image_service/image_service.h" #include "components/page_image_service/image_service_handler.h" #include "components/prefs/pref_service.h" @@ -3485,7 +3584,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/strings/grit/components_strings.h" -@@ -155,8 +154,6 @@ content::WebUIDataSource* CreateAndAddHi +@@ -163,8 +162,6 @@ content::WebUIDataSource* CreateAndAddHi source->AddBoolean("allowDeletingHistory", allow_deleting_history); source->AddBoolean("isGuestSession", profile->IsGuestSession()); @@ -3496,14 +3595,14 @@ --- a/chrome/browser/ui/webui/management/management_ui_handler.cc +++ b/chrome/browser/ui/webui/management/management_ui_handler.cc -@@ -45,7 +45,6 @@ - #include "components/content_settings/core/common/content_settings_pattern.h" +@@ -46,7 +46,6 @@ #include "components/enterprise/browser/reporting/common_pref_names.h" + #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #include "components/policy/core/common/management/management_service.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/strings/grit/components_strings.h" #include "components/supervised_user/core/common/pref_names.h" - #include "content/public/browser/storage_partition.h" + #include "content/public/browser/web_contents.h" --- a/chrome/browser/ui/webui/policy/policy_ui_handler.cc +++ b/chrome/browser/ui/webui/policy/policy_ui_handler.cc @@ -76,7 +76,6 @@ @@ -3514,7 +3613,7 @@ #include "components/strings/grit/components_strings.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" -@@ -324,15 +323,6 @@ void PolicyUIHandler::HandleSetLocalTest +@@ -326,15 +325,6 @@ void PolicyUIHandler::HandleSetLocalTest CHECK(local_test_provider); @@ -3530,7 +3629,7 @@ Profile::FromWebUI(web_ui()) ->GetProfilePolicyConnector() ->UseLocalTestPolicyProvider(); -@@ -344,13 +334,6 @@ void PolicyUIHandler::HandleSetLocalTest +@@ -346,13 +336,6 @@ void PolicyUIHandler::HandleSetLocalTest void PolicyUIHandler::HandleRevertLocalTestPolicies( const base::Value::List& args) { @@ -3593,10 +3692,10 @@ #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_metrics.h" -#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" - #include "components/signin/public/identity_manager/accounts_mutator.h" -@@ -340,10 +339,6 @@ void PeopleHandler::OnJavascriptAllowed( +@@ -420,10 +419,6 @@ void PeopleHandler::OnJavascriptAllowed( PrefService* prefs = profile_->GetPrefs(); profile_pref_registrar_ = std::make_unique(); profile_pref_registrar_->Init(prefs); @@ -3605,8 +3704,8 @@ - base::BindRepeating(&PeopleHandler::UpdateSyncStatus, - base::Unretained(this))); #if BUILDFLAG(ENABLE_DICE_SUPPORT) - profile_pref_registrar_->Add( - prefs::kChromeSigninInterceptionUserChoice, + SigninPrefs::ObserveSigninPrefsChanges( + *profile_pref_registrar_, --- a/chrome/browser/ui/webui/settings/safety_check_handler.cc +++ b/chrome/browser/ui/webui/settings/safety_check_handler.cc @@ -30,7 +30,6 @@ @@ -3619,7 +3718,7 @@ #include "content/public/browser/storage_partition.h" --- a/chrome/browser/ui/webui/settings/safety_hub_handler.cc +++ b/chrome/browser/ui/webui/settings/safety_hub_handler.cc -@@ -41,7 +41,6 @@ +@@ -46,7 +46,6 @@ #include "components/content_settings/core/common/features.h" #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/permissions/constants.h" @@ -3627,22 +3726,6 @@ #include "components/signin/public/base/consent_level.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/site_engagement/content/site_engagement_service.h" -@@ -119,15 +118,6 @@ SafetyHubHandler::PermissionsData GetUnu - - // Returns the state of Safe Browsing setting. - SafeBrowsingState GetSafeBrowsingState(PrefService* pref_service) { -- // TODO(crbug.com/1443466): Use SafeBrowsingResult from Safety Hub instead. -- if (safe_browsing::IsEnhancedProtectionEnabled(*pref_service)) -- return SafeBrowsingState::kEnabledEnhanced; -- if (safe_browsing::IsSafeBrowsingEnabled(*pref_service)) -- return SafeBrowsingState::kEnabledStandard; -- if (safe_browsing::IsSafeBrowsingPolicyManaged(*pref_service)) -- return SafeBrowsingState::kDisabledByAdmin; -- if (safe_browsing::IsSafeBrowsingExtensionControlled(*pref_service)) -- return SafeBrowsingState::kDisabledByExtension; - return SafeBrowsingState::kDisabledByUser; - } - --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc @@ -79,7 +79,6 @@ @@ -3650,10 +3733,10 @@ #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/hashprefix_realtime/hash_realtime_utils.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/saved_tab_groups/features.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_switches.h" - #include "components/strings/grit/components_branded_strings.h" -@@ -3227,11 +3226,6 @@ void AddSiteSettingsStrings(content::Web +@@ -3320,11 +3319,6 @@ void AddSiteSettingsStrings(content::Web html_source->AddLocalizedStrings(kSensorsLocalizedStrings); html_source->AddBoolean( @@ -3667,14 +3750,14 @@ --- a/chrome/browser/ui/webui/settings/settings_ui.cc +++ b/chrome/browser/ui/webui/settings/settings_ui.cc -@@ -100,7 +100,6 @@ +@@ -99,7 +99,6 @@ #include "components/safe_browsing/core/common/hashprefix_realtime/hash_realtime_utils.h" #include "components/search_engines/search_engine_choice/search_engine_choice_service.h" #include "components/search_engines/search_engine_choice/search_engine_choice_utils.h" -#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_switches.h" #include "components/sync/base/features.h" #include "content/public/browser/url_data_source.h" - #include "content/public/browser/web_contents.h" @@ -314,9 +313,7 @@ SettingsUI::SettingsUI(content::WebUI* w } #endif // BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING) @@ -3836,7 +3919,7 @@ } --- a/chrome/browser/ui/webui/signin/turn_sync_on_helper.cc +++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper.cc -@@ -48,7 +48,6 @@ +@@ -47,7 +47,6 @@ #include "components/search_engines/search_engine_choice/search_engine_choice_utils.h" #include "components/signin/core/browser/account_reconcilor.h" #include "components/signin/public/base/signin_metrics.h" @@ -3844,7 +3927,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_managed_status_finder.h" #include "components/signin/public/identity_manager/accounts_mutator.h" -@@ -270,8 +269,7 @@ void TurnSyncOnHelper::TurnSyncOnInterna +@@ -269,8 +268,7 @@ void TurnSyncOnHelper::TurnSyncOnInterna // last authenticated account of the current profile, then Chrome will show a // confirmation dialog before starting sync. // TODO(skym): Warn for high risk upgrade scenario (https://crbug.com/572754). @@ -3962,7 +4045,7 @@ "value": ["searchSuggestEnabled", {"type":"boolean"}], --- a/components/autofill/core/browser/address_data_manager.cc +++ b/components/autofill/core/browser/address_data_manager.cc -@@ -22,7 +22,6 @@ +@@ -25,7 +25,6 @@ #include "components/autofill/core/common/autofill_clock.h" #include "components/autofill/core/common/autofill_prefs.h" #include "components/prefs/pref_service.h" @@ -3970,7 +4053,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/sync/base/features.h" #include "components/sync/base/model_type.h" -@@ -276,23 +275,7 @@ void AddressDataManager::RemoveProfile(c +@@ -302,13 +301,7 @@ void AddressDataManager::RemoveProfile(c } bool AddressDataManager::IsEligibleForAddressAccountStorage() const { @@ -3978,40 +4061,48 @@ return false; - } - -- if (::switches::IsExplicitBrowserSigninUIOnDesktopEnabled( -- ::switches::ExplicitBrowserSigninPhase::kFull)) { -- return contact_info_precondition_checker_ && -- contact_info_precondition_checker_->GetPreconditionState() == -- syncer::ModelTypeController::PreconditionState:: -- kPreconditionsMet && -- sync_service_->GetUserSettings()->GetSelectedTypes().Has( -- syncer::UserSelectableType::kAutofill); -- } -- - // The CONTACT_INFO data type is only running for eligible users. See - // ContactInfoModelTypeController. - return sync_service_->GetActiveDataTypes().Has(syncer::CONTACT_INFO); } bool AddressDataManager::IsCountryEligibleForAccountStorage( -@@ -563,19 +546,7 @@ bool AddressDataManager::IsAutofillUserS +@@ -595,38 +588,7 @@ bool AddressDataManager::IsAutofillUserS } bool AddressDataManager::IsAutofillSyncToggleAvailable() const { -- return sync_service_ && !sync_service_->GetAccountInfo().IsEmpty() && -- !sync_service_->HasSyncConsent() && -- !sync_service_->GetUserSettings()->IsTypeManagedByPolicy( -- syncer::UserSelectableType::kAutofill) && -- contact_info_precondition_checker_ && +- // These checks should be removed once the feature is fully launched. +- if (!base::FeatureList::IsEnabled( +- syncer::kSyncEnableContactInfoDataTypeInTransportMode) || +- !pref_service_->GetBoolean(::prefs::kExplicitBrowserSignin)) { +- return false; +- } +- +- if (!sync_service_) { +- return false; +- } +- +- // Do not show the toggle if Sync is disabled on in error. +- if (sync_service_->GetTransportState() == +- syncer::SyncService::TransportState::PAUSED || +- sync_service_->GetTransportState() == +- syncer::SyncService::TransportState::DISABLED) { + return false; +- } +- +- // Do not show the toggle for syncing users. +- if (sync_service_->HasSyncConsent()) { +- return false; +- } +- +- if (sync_service_->GetUserSettings()->IsTypeManagedByPolicy( +- syncer::UserSelectableType::kAutofill)) { +- return false; +- } +- +- return contact_info_precondition_checker_ && - contact_info_precondition_checker_->GetPreconditionState() == -- syncer::ModelTypeController::PreconditionState:: -- kPreconditionsMet && -- base::FeatureList::IsEnabled( -- syncer::kSyncEnableContactInfoDataTypeInTransportMode) && -- ::switches::IsExplicitBrowserSigninUIOnDesktopEnabled( -- ::switches::ExplicitBrowserSigninPhase::kFull) && -- pref_service_->GetBoolean(::prefs::kExplicitBrowserSignin); -+ return false; +- syncer::ModelTypeController::PreconditionState::kPreconditionsMet; } void AddressDataManager::SetAutofillSelectableTypeEnabled(bool enabled) { @@ -4028,7 +4119,7 @@ public_deps = [ --- a/components/feed/core/v2/feed_stream.cc +++ b/components/feed/core/v2/feed_stream.cc -@@ -65,7 +65,6 @@ +@@ -66,7 +66,6 @@ #include "components/feed/feed_feature_list.h" #include "components/offline_pages/task/closure_task.h" #include "components/prefs/pref_service.h" @@ -4036,7 +4127,7 @@ namespace feed { namespace { -@@ -172,9 +171,6 @@ FeedStream::FeedStream(RefreshTaskSchedu +@@ -173,9 +172,6 @@ FeedStream::FeedStream(RefreshTaskSchedu snippets_enabled_by_dse_.Init(prefs::kEnableSnippetsByDse, profile_prefs, preference_change_callback); has_stored_data_.Init(feed::prefs::kHasStoredData, profile_prefs); @@ -4048,15 +4139,15 @@ --- a/components/feed/core/v2/public/feed_service.cc +++ b/components/feed/core/v2/public/feed_service.cc -@@ -32,7 +32,6 @@ +@@ -33,7 +33,6 @@ #include "components/history/core/browser/history_types.h" #include "components/prefs/pref_service.h" #include "components/signin/public/base/consent_level.h" -#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "net/base/network_change_notifier.h" - #include "services/network/public/cpp/shared_url_loader_factory.h" -@@ -172,7 +171,7 @@ class FeedService::StreamDelegateImpl : +@@ -192,7 +191,7 @@ class FeedService::StreamDelegateImpl : // Returns if signin is allowed on Android. Return true on other platform so // behavior is unchanged there. bool IsSigninAllowed() override { @@ -4082,23 +4173,9 @@ #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/prefs/pref_service.h" -#include "components/signin/public/base/signin_pref_names.h" - #include "components/signin/public/base/signin_switches.h" #include "components/sync/base/features.h" #include "components/sync/service/sync_service.h" -@@ -81,13 +80,6 @@ bool IsUserEligibleForAccountStorage(con - case syncer::SyncService::TransportState::DISABLED: - return false; - case syncer::SyncService::TransportState::PAUSED: -- if (switches::IsExplicitBrowserSigninUIOnDesktopEnabled( -- switches::ExplicitBrowserSigninPhase::kFull) && -- // `prefs::kExplicitBrowserSignin` is false for users who signed in -- // implicitly through the Dice web signin in a previous run. -- pref_service->GetBoolean(::prefs::kExplicitBrowserSignin)) { -- break; -- } - return false; - case syncer::SyncService::TransportState::START_DEFERRED: - case syncer::SyncService::TransportState::INITIALIZING: + #include "components/sync/service/sync_user_settings.h" --- a/components/password_manager/core/browser/features/password_manager_features_util_desktop.cc +++ b/components/password_manager/core/browser/features/password_manager_features_util_desktop.cc @@ -15,7 +15,6 @@ @@ -4109,7 +4186,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/sync/base/pref_names.h" -@@ -402,16 +401,7 @@ bool ShouldShowAccountStorageSettingTogg +@@ -398,15 +397,7 @@ bool ShouldShowAccountStorageSettingTogg } bool AreAccountStorageOptInPromosAllowed() { @@ -4121,8 +4198,7 @@ - // sign-in in the future, at which point the above applies. In the meantime, - // it's not worth keeping the promos UI. Most users in this group have seen - // the promo by now and have accepted *if* they want the feature. -- return !switches::IsExplicitBrowserSigninUIOnDesktopEnabled( -- switches::ExplicitBrowserSigninPhase::kFull); +- return !switches::IsExplicitBrowserSigninUIOnDesktopEnabled(); + return false; } @@ -4201,7 +4277,7 @@ --- a/components/password_manager/core/browser/password_reuse_manager_impl.cc +++ b/components/password_manager/core/browser/password_reuse_manager_impl.cc -@@ -24,7 +24,6 @@ +@@ -23,7 +23,6 @@ #include "components/password_manager/core/browser/password_store_signin_notifier.h" #include "components/password_manager/core/common/password_manager_features.h" #include "components/prefs/pref_service.h" @@ -4209,7 +4285,7 @@ #include "components/signin/public/base/consent_level.h" #include "google_apis/gaia/gaia_auth_util.h" -@@ -375,21 +374,6 @@ void PasswordReuseManagerImpl::ScheduleP +@@ -374,21 +373,6 @@ void PasswordReuseManagerImpl::ScheduleP } void PasswordReuseManagerImpl::ScheduleEnterprisePasswordURLUpdate() { @@ -4265,7 +4341,7 @@ --- a/components/password_manager/core/browser/store_metrics_reporter.cc +++ b/components/password_manager/core/browser/store_metrics_reporter.cc -@@ -26,7 +26,6 @@ +@@ -28,7 +28,6 @@ #include "components/password_manager/core/browser/password_sync_util.h" #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/safe_browsing/core/common/features.h" @@ -4273,7 +4349,7 @@ #include "google_apis/gaia/gaia_auth_util.h" #include "google_apis/gaia/gaia_urls.h" -@@ -681,7 +680,7 @@ StoreMetricsReporter::StoreMetricsReport +@@ -683,7 +682,7 @@ StoreMetricsReporter::StoreMetricsReport is_opted_in_account_storage_ = features_util::IsOptedInForAccountStorage(prefs, sync_service); @@ -4343,7 +4419,7 @@ bool SyncCredentialsFilter::ShouldSaveGaiaPasswordHash( --- a/components/password_manager/core/browser/sync_credentials_filter_unittest.cc +++ b/components/password_manager/core/browser/sync_credentials_filter_unittest.cc -@@ -32,7 +32,6 @@ +@@ -33,7 +33,6 @@ #include "components/password_manager/core/common/password_manager_features.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/testing_pref_service.h" @@ -4584,7 +4660,7 @@ --- a/components/safe_browsing/core/browser/db/v4_local_database_manager.cc +++ b/components/safe_browsing/core/browser/db/v4_local_database_manager.cc -@@ -327,12 +327,9 @@ const V4LocalDatabaseManager* +@@ -296,12 +296,9 @@ const V4LocalDatabaseManager* scoped_refptr V4LocalDatabaseManager::Create( const base::FilePath& base_path, scoped_refptr ui_task_runner, @@ -4599,7 +4675,7 @@ std::move(io_task_runner), nullptr)); } -@@ -355,17 +352,12 @@ void V4LocalDatabaseManager::CollectData +@@ -324,17 +321,12 @@ void V4LocalDatabaseManager::CollectData V4LocalDatabaseManager::V4LocalDatabaseManager( const base::FilePath& base_path, @@ -4617,7 +4693,7 @@ list_infos_(GetListInfos()), task_runner_(task_runner_for_tests ? task_runner_for_tests -@@ -706,12 +698,6 @@ void V4LocalDatabaseManager::DatabaseRea +@@ -673,12 +665,6 @@ void V4LocalDatabaseManager::DatabaseRea v4_database_ = std::move(v4_database); v4_database_->RecordFileSizeHistograms(); @@ -4630,7 +4706,7 @@ PopulateArtificialDatabase(); -@@ -1285,8 +1271,7 @@ void V4LocalDatabaseManager::SetupUpdate +@@ -1252,8 +1238,7 @@ void V4LocalDatabaseManager::SetupUpdate weak_factory_.GetWeakPtr()); v4_update_protocol_manager_ = V4UpdateProtocolManager::Create( @@ -4662,7 +4738,7 @@ scoped_refptr ui_task_runner, scoped_refptr io_task_runner, scoped_refptr task_runner_for_tests); -@@ -431,13 +427,6 @@ class V4LocalDatabaseManager : public Sa +@@ -428,13 +424,6 @@ class V4LocalDatabaseManager : public Sa // ready to process next update. DatabaseUpdatedCallback db_updated_callback_; @@ -4678,7 +4754,7 @@ // information in the full hash request. --- a/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc +++ b/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc -@@ -89,7 +89,6 @@ void SetSbV4UrlPrefixForTesting(const ch +@@ -91,7 +91,6 @@ void SetSbV4UrlPrefixForTesting(const ch std::string GetReportUrl(const V4ProtocolConfig& config, const std::string& method, @@ -4686,7 +4762,7 @@ const bool is_enhanced_protection) { std::string url = base::StringPrintf( "%s/%s?client=%s&appver=%s&pver=4.0", kSbReportsURLPrefix, method.c_str(), -@@ -99,8 +98,6 @@ std::string GetReportUrl(const V4Protoco +@@ -101,8 +100,6 @@ std::string GetReportUrl(const V4Protoco base::StringAppendF(&url, "&key=%s", base::EscapeQueryParamValue(api_key, true).c_str()); } @@ -4697,13 +4773,12 @@ return url; --- a/components/safe_browsing/core/browser/db/v4_protocol_manager_util.h +++ b/components/safe_browsing/core/browser/db/v4_protocol_manager_util.h -@@ -18,10 +18,11 @@ +@@ -19,9 +19,10 @@ #include #include "base/containers/flat_set.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" - #include "base/strings/string_piece.h" +#include "base/time/time.h" #include "components/safe_browsing/core/browser/db/safebrowsing.pb.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" @@ -5419,10 +5494,10 @@ #include "components/safe_browsing/core/common/features.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/safe_browsing/core/common/utils.h" + #include "components/variations/pref_names.h" #include "components/variations/service/variations_service.h" - -@@ -106,60 +105,11 @@ HashRealTimeSelection DetermineHashRealT - std::optional stored_permanent_country, +@@ -100,58 +99,13 @@ HashRealTimeSelection DetermineHashRealT + PrefService* prefs, std::optional latest_country, bool log_usage_histograms) { - // All prefs used in this method must match the ones returned by @@ -5434,7 +5509,7 @@ - } requirements[] = { - {"IneligibleForSessionOrLocation", - hash_realtime_utils::IsHashRealTimeLookupEligibleInSessionAndLocation( -- stored_permanent_country)}, +- latest_country)}, - {"OffTheRecord", !is_off_the_record}, - {"NotStandardProtection", safe_browsing::GetSafeBrowsingState(*prefs) == - SafeBrowsingState::STANDARD_PROTECTION}, @@ -5454,10 +5529,6 @@ - } - if (log_usage_histograms) { - base::UmaHistogramBoolean( -- "SafeBrowsing.HPRT.WouldBeIneligibleForSessionOrLatestCountry", -- !hash_realtime_utils::IsHashRealTimeLookupEligibleInSessionAndLocation( -- latest_country)); -- base::UmaHistogramBoolean( - "SafeBrowsing.HPRT.Ineligible.NoGoogleChromeBranding", - !HasGoogleChromeBranding()); - base::UmaHistogramBoolean( @@ -5465,7 +5536,7 @@ - !base::FeatureList::IsEnabled(kHashPrefixRealTimeLookups)); - base::UmaHistogramBoolean( - "SafeBrowsing.HPRT.Ineligible.IneligibleForLocation", -- !IsHashRealTimeLookupEligibleInLocation(stored_permanent_country)); +- !IsHashRealTimeLookupEligibleInLocation(latest_country)); - } - return can_do_lookup ? -#if BUILDFLAG(IS_ANDROID) @@ -5477,13 +5548,15 @@ + return HashRealTimeSelection::kNone; } - std::vector GetHashRealTimeSelectionConfiguringPrefs() { -- return {prefs::kSafeBrowsingEnabled, prefs::kSafeBrowsingEnhanced, -- prefs::kHashPrefixRealTimeChecksAllowedByPolicy}; -+ return {}; - } - - GoogleChromeBrandingPretenderForTesting:: + HashRealTimeSelectionConfiguringPrefs + GetHashRealTimeSelectionConfiguringPrefs() { + std::vector profile_prefs = { +- prefs::kSafeBrowsingEnabled, prefs::kSafeBrowsingEnhanced, +- prefs::kHashPrefixRealTimeChecksAllowedByPolicy}; ++ }; + // |kVariationsCountry| is used by |VariationsService::GetLatestCountry|. + std::vector local_state_prefs = { + variations::prefs::kVariationsCountry}; --- a/components/safe_browsing/core/common/safe_browsing_policy_handler.cc +++ b/components/safe_browsing/core/common/safe_browsing_policy_handler.cc @@ -13,7 +13,6 @@ @@ -5832,9 +5905,63 @@ #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" #include "components/signin/public/identity_manager/identity_test_environment.h" #include "components/sync_preferences/testing_pref_service_syncable.h" +--- a/components/signin/core/browser/account_reconcilor.cc ++++ b/components/signin/core/browser/account_reconcilor.cc +@@ -30,7 +30,6 @@ + #include "components/signin/public/base/account_consistency_method.h" + #include "components/signin/public/base/signin_client.h" + #include "components/signin/public/base/signin_metrics.h" +-#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_switches.h" + #include "components/signin/public/identity_manager/accounts_cookie_mutator.h" + #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" +@@ -184,10 +183,6 @@ AccountReconcilor::~AccountReconcilor() + + // static + void AccountReconcilor::RegisterProfilePrefs(PrefRegistrySimple* registry) { +-#if BUILDFLAG(ENABLE_DICE_SUPPORT) +- registry->RegisterBooleanPref( +- prefs::kCookieClearOnExitMigrationNoticeComplete, false); +-#endif + } + + void AccountReconcilor::RegisterWithAllDependencies() { +@@ -212,16 +207,6 @@ void AccountReconcilor::Initialize(bool + delegate_->set_reconcilor(this); + timeout_ = delegate_->GetReconcileTimeout(); + +-#if BUILDFLAG(ENABLE_DICE_SUPPORT) +- // If Uno is enabled and there is no "clear on exit" setting affecting Gaia, +- // consider the migration done. +- PrefService* prefs = client_->GetPrefs(); +- if (!client_->AreSigninCookiesDeletedOnExit() && +- signin::AreGoogleCookiesRebuiltAfterClearingWhenSignedIn( +- *identity_manager_, *client_->GetPrefs())) { +- prefs->SetBoolean(prefs::kCookieClearOnExitMigrationNoticeComplete, true); +- } +-#endif // BUILDFLAG(ENABLE_DICE_SUPPORT) + + if (delegate_->IsReconcileEnabled()) { + SetState(AccountReconcilorState::kScheduled); +@@ -346,15 +331,6 @@ void AccountReconcilor::OnContentSetting + if (!content_type_set.Contains(ContentSettingsType::COOKIES)) + return; + +-#if BUILDFLAG(ENABLE_DICE_SUPPORT) +- // Any change in cookie setting after Uno has been enabled count as a +- // migration. +- if (signin::AreGoogleCookiesRebuiltAfterClearingWhenSignedIn( +- *identity_manager_, *client_->GetPrefs())) { +- client_->GetPrefs()->SetBoolean( +- prefs::kCookieClearOnExitMigrationNoticeComplete, true); +- } +-#endif // BUILDFLAG(ENABLE_DICE_SUPPORT) + + // If this does not affect GAIA, just ignore. The secondary pattern is not + // needed. --- a/components/signin/core/browser/account_reconcilor_unittest.cc +++ b/components/signin/core/browser/account_reconcilor_unittest.cc -@@ -34,7 +34,6 @@ +@@ -35,7 +35,6 @@ #include "components/signin/public/base/list_accounts_test_utils.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_metrics.h" @@ -5854,7 +5981,7 @@ #include "components/signin/public/identity_manager/accounts_mutator.h" --- a/components/signin/internal/identity_manager/account_tracker_service.cc +++ b/components/signin/internal/identity_manager/account_tracker_service.cc -@@ -36,7 +36,6 @@ +@@ -37,7 +37,6 @@ #include "components/prefs/scoped_user_pref_update.h" #include "components/signin/internal/identity_manager/account_capabilities_constants.h" #include "components/signin/internal/identity_manager/account_info_util.h" @@ -5862,7 +5989,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_capabilities.h" #include "components/signin/public/identity_manager/account_info.h" -@@ -203,11 +202,6 @@ AccountTrackerService::~AccountTrackerSe +@@ -204,11 +203,6 @@ AccountTrackerService::~AccountTrackerSe // static void AccountTrackerService::RegisterPrefs(PrefRegistrySimple* registry) { @@ -5874,7 +6001,7 @@ } void AccountTrackerService::Initialize(PrefService* pref_service, -@@ -529,14 +523,12 @@ AccountTrackerService::ComputeNewMigrati +@@ -530,14 +524,12 @@ AccountTrackerService::ComputeNewMigrati void AccountTrackerService::SetMigrationState(AccountIdMigrationState state) { DCHECK(state != MIGRATION_DONE || AreAllAccountsMigrated()) << "state: " << state << ", accounts = " << AccountsToString(accounts_); @@ -5890,7 +6017,7 @@ } #endif // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -594,26 +586,6 @@ void AccountTrackerService::OnAccountIma +@@ -595,26 +587,6 @@ void AccountTrackerService::OnAccountIma const CoreAccountId& account_id, const std::string& image_url_with_size, bool success) { @@ -5917,7 +6044,7 @@ } void AccountTrackerService::RemoveAccountImageFromDisk( -@@ -625,191 +597,16 @@ void AccountTrackerService::RemoveAccoun +@@ -626,191 +598,16 @@ void AccountTrackerService::RemoveAccoun } void AccountTrackerService::LoadFromPrefs() { @@ -6206,7 +6333,23 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" #include "google_apis/gaia/core_account_id.h" -@@ -213,63 +212,13 @@ PrimaryAccountManager::~PrimaryAccountMa +@@ -214,15 +213,6 @@ PrimaryAccountManager::PrimaryAccountMan + account_tracker_service_(account_tracker_service) { + DCHECK(client_); + DCHECK(account_tracker_service_); +- +- // Clear the pref it is was set and the feature is now off. +- if (!switches::IsExplicitBrowserSigninUIOnDesktopEnabled()) { +- ScopedPrefCommit scoped_pref_commit(client_->GetPrefs(), +- /*commit_on_destroy=*/false); +- scoped_pref_commit.ClearPref(prefs::kExplicitBrowserSignin); +- scoped_pref_commit.ClearPref( +- prefs::kCookieClearOnExitMigrationNoticeComplete); +- } + } + + PrimaryAccountManager::~PrimaryAccountManager() { +@@ -231,82 +221,13 @@ PrimaryAccountManager::~PrimaryAccountMa // static void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) { @@ -6216,6 +6359,8 @@ - std::string()); - registry->RegisterStringPref(prefs::kGoogleServicesLastSyncingUsername, - std::string()); +- registry->RegisterStringPref(prefs::kGoogleServicesLastSignedInUsername, +- std::string()); - registry->RegisterStringPref(prefs::kGoogleServicesAccountId, std::string()); - registry->RegisterBooleanPref(prefs::kGoogleServicesConsentedToSync, false); - registry->RegisterStringPref( @@ -6226,6 +6371,8 @@ - registry->RegisterListPref(prefs::kReverseAutologinRejectedEmailList); - registry->RegisterBooleanPref(prefs::kSigninAllowed, true); - registry->RegisterBooleanPref(prefs::kSignedInWithCredentialProvider, false); +- registry->RegisterBooleanPref(kExplicitBrowserSigninWithoutFeatureEnabled, +- false); - registry->RegisterBooleanPref(prefs::kExplicitBrowserSignin, false); } @@ -6241,6 +6388,21 @@ - - PrefService* prefs = client_->GetPrefs(); - +- // kGoogleServicesLastSignedInUsername was introduced much later than its +- // "Syncing" counterpart, so backfill. Note that having different values for +- // the 2 prefs is possible (user enabled sync, disabled, then signed-in with +- // a different account) and we should not overwrite the "SignedIn" pref in +- // that case. +- // TODO(crbug.com/337112658): Remove migration after 04/25. +- std::string last_syncing_username = +- prefs->GetString(prefs::kGoogleServicesLastSyncingUsername); +- std::string last_signed_in_username = +- prefs->GetString(prefs::kGoogleServicesLastSignedInUsername); +- if (!last_syncing_username.empty() && last_signed_in_username.empty()) { +- prefs->SetString(prefs::kGoogleServicesLastSignedInUsername, +- last_syncing_username); +- } +- - // If the user is clearing the token service from the command line, then - // clear their login info also (not valid to be logged in without any - // tokens). @@ -6270,7 +6432,7 @@ } std::pair -@@ -297,46 +246,10 @@ PrimaryAccountManager::GetOrRestorePrima +@@ -334,46 +255,10 @@ PrimaryAccountManager::GetOrRestorePrima kEmptyAccountInfo_RestoreFailedNotSyncConsented); } @@ -6317,7 +6479,7 @@ } void PrimaryAccountManager::Initialize() { -@@ -346,11 +259,9 @@ void PrimaryAccountManager::Initialize() +@@ -383,11 +268,9 @@ void PrimaryAccountManager::Initialize() // Prepare prefs before loading them. PrepareToLoadPrefs(); @@ -6331,13 +6493,14 @@ LogPrimaryAccountPrefsOnInitialize(pref_account_id, pref_consented_to_sync); ScopedPrefCommit scoped_pref_commit(client_->GetPrefs(), -@@ -368,13 +279,6 @@ void PrimaryAccountManager::Initialize() +@@ -405,14 +288,6 @@ void PrimaryAccountManager::Initialize() if (pref_consented_to_sync && !account_info.IsEmpty()) { SetPrimaryAccountInternal(account_info, /*consented_to_sync=*/true, scoped_pref_commit); - - // Ensure that the last syncing account data is consistent with the -- // primary account. +- // primary account. The last signed-in account data is written inside +- // SetPrimaryAccountInternal(). - scoped_pref_commit.SetString(prefs::kGoogleServicesLastSyncingGaiaId, - account_info.gaia); - scoped_pref_commit.SetString(prefs::kGoogleServicesLastSyncingUsername, @@ -6345,7 +6508,7 @@ } else { SetPrimaryAccountInternal(account_info, /*consented_to_sync=*/false, scoped_pref_commit); -@@ -501,10 +405,6 @@ void PrimaryAccountManager::SetSyncPrima +@@ -539,10 +414,6 @@ void PrimaryAccountManager::SetSyncPrima // Go ahead and update the last signed in account info here as well. Once a // user is signed in the corresponding preferences should match. Doing it here // as opposed to on signin allows us to catch the upgrade scenario. @@ -6356,7 +6519,7 @@ } void PrimaryAccountManager::SetPrimaryAccountInternal( -@@ -516,19 +416,6 @@ void PrimaryAccountManager::SetPrimaryAc +@@ -554,22 +425,6 @@ void PrimaryAccountManager::SetPrimaryAc // 'account_info' might be a reference to the contents of `primary_account_`. // Create a PrimaryAccount object before calling emplace to avoid crashes. primary_account_.emplace(PrimaryAccount(account_info, consented_to_sync)); @@ -6372,11 +6535,14 @@ - prefs::kGoogleServicesSyncingGaiaIdMigratedToSignedIn); - scoped_pref_commit.ClearPref( - prefs::kGoogleServicesSyncingUsernameMigratedToSignedIn); +- } else { +- scoped_pref_commit.SetString(prefs::kGoogleServicesLastSignedInUsername, +- account_info.email); - } } void PrimaryAccountManager::RecordHadPreviousSyncAccount() const { -@@ -538,7 +425,7 @@ void PrimaryAccountManager::RecordHadPre +@@ -579,7 +434,7 @@ void PrimaryAccountManager::RecordHadPre } const std::string& last_gaia_id_with_sync_enabled = @@ -6385,7 +6551,7 @@ const bool existed_primary_account_with_sync = !last_gaia_id_with_sync_enabled.empty(); -@@ -688,27 +575,6 @@ PrimaryAccountChangeEvent::State Primary +@@ -729,38 +584,6 @@ PrimaryAccountChangeEvent::State Primary void PrimaryAccountManager::ComputeExplicitBrowserSignin( const PrimaryAccountChangeEvent& event_details, ScopedPrefCommit& scoped_pref_commit) { @@ -6393,7 +6559,10 @@ - case PrimaryAccountChangeEvent::Type::kNone: - return; - case PrimaryAccountChangeEvent::Type::kCleared: -- scoped_pref_commit.ClearPref(prefs::kExplicitBrowserSignin); +- scoped_pref_commit.ClearPref(kExplicitBrowserSigninWithoutFeatureEnabled); +- if (switches::IsExplicitBrowserSigninUIOnDesktopEnabled()) { +- scoped_pref_commit.ClearPref(prefs::kExplicitBrowserSignin); +- } - return; - case PrimaryAccountChangeEvent::Type::kSet: - CHECK(event_details.GetAccessPoint().has_value()); @@ -6403,11 +6572,19 @@ - if (access_point == signin_metrics::AccessPoint::ACCESS_POINT_UNKNOWN || - access_point == - signin_metrics::AccessPoint::ACCESS_POINT_WEB_SIGNIN) { -- scoped_pref_commit.ClearPref(prefs::kExplicitBrowserSignin); +- scoped_pref_commit.ClearPref( +- kExplicitBrowserSigninWithoutFeatureEnabled); +- if (switches::IsExplicitBrowserSigninUIOnDesktopEnabled()) { +- scoped_pref_commit.ClearPref(prefs::kExplicitBrowserSignin); +- } - } else { - // All others access points are explicit sign ins except the Web - // Signin event. -- scoped_pref_commit.SetBoolean(prefs::kExplicitBrowserSignin, true); +- scoped_pref_commit.SetBoolean( +- kExplicitBrowserSigninWithoutFeatureEnabled, true); +- if (switches::IsExplicitBrowserSigninUIOnDesktopEnabled()) { +- scoped_pref_commit.SetBoolean(prefs::kExplicitBrowserSignin, true); +- } - } - } } @@ -6473,7 +6650,7 @@ #include "components/sync_preferences/testing_pref_service_syncable.h" --- a/components/signin/public/base/BUILD.gn +++ b/components/signin/public/base/BUILD.gn -@@ -164,8 +164,6 @@ component("signin_switches") { +@@ -167,8 +167,6 @@ component("signin_switches") { defines = [ "IS_SIGNIN_SWITCHES_IMPL" ] sources = [ @@ -6567,15 +6744,15 @@ #endif --- a/components/signin/public/base/signin_switches.cc +++ b/components/signin/public/base/signin_switches.cc -@@ -7,7 +7,6 @@ +@@ -6,7 +6,6 @@ + #include "base/feature_list.h" - #include "base/metrics/field_trial_params.h" #include "components/prefs/pref_service.h" -#include "components/signin/public/base/signin_pref_names.h" namespace switches { -@@ -49,11 +48,6 @@ BASE_FEATURE(kEnableBoundSessionCredenti +@@ -57,11 +56,6 @@ BASE_FEATURE(kEnableBoundSessionCredenti base::FEATURE_DISABLED_BY_DEFAULT); bool IsBoundSessionCredentialsEnabled(const PrefService* profile_prefs) { @@ -6597,7 +6774,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "third_party/icu/source/i18n/unicode/regex.h" -@@ -58,22 +57,13 @@ bool IsUsernameAllowedByPattern(base::St +@@ -58,21 +57,13 @@ bool IsUsernameAllowedByPattern(std::str bool IsUsernameAllowedByPatternFromPrefs(const PrefService* prefs, const std::string& username) { @@ -6609,8 +6786,7 @@ bool IsImplicitBrowserSigninOrExplicitDisabled( IdentityManager* identity_manager, PrefService* prefs) { -- if (!switches::IsExplicitBrowserSigninUIOnDesktopEnabled( -- switches::ExplicitBrowserSigninPhase::kFull)) { +- if (!switches::IsExplicitBrowserSigninUIOnDesktopEnabled()) { - return true; - } - @@ -6621,7 +6797,7 @@ + return false; } - } // namespace signin + bool AreGoogleCookiesRebuiltAfterClearingWhenSignedIn( --- a/components/signin/public/identity_manager/identity_utils_unittest.cc +++ b/components/signin/public/identity_manager/identity_utils_unittest.cc @@ -11,7 +11,6 @@ @@ -6669,59 +6845,51 @@ }, --- a/components/sync/service/sync_prefs.cc +++ b/components/sync/service/sync_prefs.cc -@@ -21,7 +21,6 @@ +@@ -22,7 +22,6 @@ #include "components/prefs/pref_value_map.h" #include "components/prefs/scoped_user_pref_update.h" #include "components/signin/public/base/gaia_id_hash.h" -#include "components/signin/public/base/signin_pref_names.h" - #include "components/signin/public/base/signin_switches.h" #include "components/sync/base/features.h" #include "components/sync/base/passphrase_enums.h" -@@ -222,9 +221,7 @@ bool SyncPrefs::IsInitialSyncFeatureSetu + #include "components/sync/base/pref_names.h" +@@ -248,7 +247,7 @@ bool SyncPrefs::IsInitialSyncFeatureSetu } bool SyncPrefs::IsExplicitBrowserSignin() const { -- return switches::IsExplicitBrowserSigninUIOnDesktopEnabled( -- switches::ExplicitBrowserSigninPhase::kFull) && -- pref_service_->GetBoolean(::prefs::kExplicitBrowserSignin); +- return pref_service_->GetBoolean(::prefs::kExplicitBrowserSignin); + return false; } #if !BUILDFLAG(IS_CHROMEOS_ASH) -@@ -278,22 +275,6 @@ UserSelectableTypeSet SyncPrefs::GetSele +@@ -302,16 +301,6 @@ UserSelectableTypeSet SyncPrefs::GetSele type == UserSelectableType::kAutofill) { #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) type_enabled = true; -#else - // kPasswords and kAutofill are only on by default if there was an -- // explicit sign in recorded and -- // `IsExplicitBrowserSigninUIOnDesktopEnabled()` is true. +- // explicit sign in recorded. - // Otherwise: - // - kPasswords requires a dedicated opt-in. - // - kAutofill cannot be enabled. - // Note: If this changes, also update the migration logic in - // MigrateGlobalDataTypePrefsToAccount(). -- switches::ExplicitBrowserSigninPhase phase = -- type == UserSelectableType::kPasswords -- ? switches::ExplicitBrowserSigninPhase::kExperimental -- : switches::ExplicitBrowserSigninPhase::kFull; - type_enabled = -- switches::IsExplicitBrowserSigninUIOnDesktopEnabled(phase) && - pref_service_->GetBoolean(::prefs::kExplicitBrowserSignin); #endif } else if (type == UserSelectableType::kBookmarks || type == UserSelectableType::kReadingList) { --- a/components/sync_preferences/common_syncable_prefs_database.cc +++ b/components/sync_preferences/common_syncable_prefs_database.cc -@@ -20,7 +20,6 @@ +@@ -21,7 +21,6 @@ #include "components/omnibox/browser/omnibox_prefs.h" #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/payments/core/payment_prefs.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/saved_tab_groups/pref_names.h" #include "components/search_engines/search_engines_pref_names.h" #include "components/translate/core/browser/translate_pref_names.h" - #include "components/translate/core/browser/translate_prefs.h" -@@ -84,9 +83,7 @@ enum { +@@ -87,9 +86,7 @@ enum { // kSyncedLastTimePasswordCheckCompleted = 43, (deprecated) kWasAutoSignInFirstRunExperienceShown = 44, kCanMakePaymentEnabled = 45, @@ -6731,7 +6899,7 @@ kSyncedDefaultSearchProviderGUID = 49, kPrefForceTriggerTranslateCount = 50, // kPrefNeverPromptSitesDeprecated = 51, (deprecated) -@@ -201,16 +198,9 @@ constexpr auto kCommonSyncablePrefsAllow +@@ -207,16 +204,9 @@ constexpr auto kCommonSyncablePrefsAllow {payments::kCanMakePaymentEnabled, {syncable_prefs_ids::kCanMakePaymentEnabled, syncer::PREFERENCES, PrefSensitivity::kNone, MergeBehavior::kNone}}, @@ -6750,7 +6918,7 @@ #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) --- a/content/browser/webid/federated_auth_request_impl.cc +++ b/content/browser/webid/federated_auth_request_impl.cc -@@ -579,31 +579,6 @@ FederatedAuthRequestImpl::~FederatedAuth +@@ -573,31 +573,6 @@ FederatedAuthRequestImpl::~FederatedAuth void FederatedAuthRequestImpl::Create( RenderFrameHost* host, mojo::PendingReceiver receiver) { diff --git a/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch b/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch index 49937dd8..b6c18a7d 100644 --- a/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch +++ b/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch @@ -9,7 +9,7 @@ #include "components/translate/core/browser/translate_download_manager.h" #include "components/translate/core/browser/translate_manager.h" #include "components/translate/core/browser/translate_prefs.h" -@@ -2206,6 +2207,7 @@ void RenderViewContextMenu::AppendPageIt +@@ -2223,6 +2224,7 @@ void RenderViewContextMenu::AppendPageIt menu_model_.AddSeparator(ui::NORMAL_SEPARATOR); if (CanTranslate(/*menu_logging=*/true)) { @@ -19,15 +19,15 @@ } --- a/components/translate/core/browser/translate_language_list.cc +++ b/components/translate/core/browser/translate_language_list.cc -@@ -10,6 +10,7 @@ - #include +@@ -11,6 +11,7 @@ + #include #include "base/check.h" +#include "base/command_line.h" #include "base/debug/dump_without_crashing.h" #include "base/functional/bind.h" #include "base/json/json_reader.h" -@@ -25,6 +26,7 @@ +@@ -26,6 +27,7 @@ #include "components/translate/core/browser/translate_event_details.h" #include "components/translate/core/browser/translate_url_fetcher.h" #include "components/translate/core/browser/translate_url_util.h" @@ -35,7 +35,7 @@ #include "components/translate/core/common/translate_util.h" #include "net/base/url_util.h" #include "ui/base/l10n/l10n_util.h" -@@ -392,6 +394,9 @@ GURL TranslateLanguageList::TranslateLan +@@ -393,6 +395,9 @@ GURL TranslateLanguageList::TranslateLan } void TranslateLanguageList::RequestLanguageList() { diff --git a/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch b/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch index 4c4efce2..a6d17087 100644 --- a/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch +++ b/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch @@ -9,7 +9,7 @@ --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2615,6 +2615,7 @@ static_library("browser") { +@@ -2626,6 +2626,7 @@ static_library("browser") { "//third_party/libyuv", "//third_party/metrics_proto", "//third_party/re2", @@ -19,7 +19,7 @@ "//third_party/widevine/cdm:headers", --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -170,6 +170,7 @@ +@@ -172,6 +172,7 @@ #include "components/translate/core/common/translate_util.h" #include "components/trusted_vault/features.h" #include "components/ui_devtools/switches.h" @@ -44,7 +44,7 @@ #endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_ --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -252,6 +252,7 @@ source_set("browser") { +@@ -253,6 +253,7 @@ source_set("browser") { "//third_party/libyuv", "//third_party/re2", "//third_party/sqlite", @@ -62,7 +62,7 @@ #include "components/viz/common/switches.h" #include "components/viz/host/gpu_client.h" #include "content/browser/bad_message.h" -@@ -3449,6 +3450,8 @@ void RenderProcessHostImpl::PropagateBro +@@ -3465,6 +3466,8 @@ void RenderProcessHostImpl::PropagateBro switches::kEnableWebGLImageChromium, switches::kEnableWebGPUDeveloperFeatures, switches::kFileUrlPathAlias, @@ -91,7 +91,7 @@ #include "ui/accessibility/accessibility_features.h" #include "ui/base/ui_base_features.h" #include "ui/events/blink/blink_features.h" -@@ -498,6 +499,10 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -488,6 +489,10 @@ void SetRuntimeFeaturesFromCommandLine(c switches::kEnableWebGPUDeveloperFeatures, true}, {wrf::EnableWebGPUExperimentalFeatures, switches::kEnableUnsafeWebGPU, true}, @@ -124,7 +124,7 @@ #include "base/ranges/algorithm.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h" -@@ -932,6 +933,11 @@ Document::Document(const DocumentInit& i +@@ -906,6 +907,11 @@ Document::Document(const DocumentInit& i TRACE_EVENT_WITH_FLOW0("blink", "Document::Document", TRACE_ID_LOCAL(this), TRACE_EVENT_FLAG_FLOW_OUT); DCHECK(agent_); @@ -136,7 +136,7 @@ if (base::FeatureList::IsEnabled(features::kDelayAsyncScriptExecution) && features::kDelayAsyncScriptExecutionDelayByDefaultParam.Get()) { script_runner_delayer_->Activate(); -@@ -1047,6 +1053,14 @@ const Position Document::PositionAdjuste +@@ -1021,6 +1027,14 @@ const Position Document::PositionAdjuste return Position::BeforeNode(*shadow_host); } @@ -153,7 +153,7 @@ selector_query_cache_ = std::make_unique(); --- a/third_party/blink/renderer/core/dom/document.h +++ b/third_party/blink/renderer/core/dom/document.h -@@ -539,6 +539,10 @@ class CORE_EXPORT Document : public Cont +@@ -548,6 +548,10 @@ class CORE_EXPORT Document : public Cont has_xml_declaration_ = has_xml_declaration ? 1 : 0; } @@ -164,7 +164,7 @@ AtomicString visibilityState() const; bool IsPageVisible() const; bool hidden() const; -@@ -2566,6 +2570,9 @@ class CORE_EXPORT Document : public Cont +@@ -2545,6 +2549,9 @@ class CORE_EXPORT Document : public Cont base::ElapsedTimer start_time_; @@ -176,7 +176,7 @@ --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc -@@ -2413,6 +2413,11 @@ DOMRectList* Element::getClientRects() { +@@ -2432,6 +2432,11 @@ DOMRectList* Element::getClientRects() { DCHECK(element_layout_object); GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads, *element_layout_object); @@ -188,7 +188,7 @@ return MakeGarbageCollected(quads); } -@@ -2440,6 +2445,9 @@ gfx::RectF Element::GetBoundingClientRec +@@ -2459,6 +2464,9 @@ gfx::RectF Element::GetBoundingClientRec DCHECK(element_layout_object); GetDocument().AdjustRectForScrollAndAbsoluteZoom(result, *element_layout_object); @@ -200,7 +200,7 @@ --- a/third_party/blink/renderer/core/dom/range.cc +++ b/third_party/blink/renderer/core/dom/range.cc -@@ -1624,6 +1624,12 @@ DOMRectList* Range::getClientRects() con +@@ -1607,6 +1607,12 @@ DOMRectList* Range::getClientRects() con Vector quads; GetBorderAndTextQuads(quads); @@ -213,7 +213,7 @@ return MakeGarbageCollected(quads); } -@@ -1631,7 +1637,11 @@ DOMRect* Range::getBoundingClientRect() +@@ -1614,7 +1620,11 @@ DOMRect* Range::getBoundingClientRect() // TODO(crbug.com/1499981): This should be removed once synchronized scrolling // impact is understood. SyncScrollAttemptHeuristic::DidAccessScrollOffset(); @@ -266,7 +266,7 @@ const TextDirection&, --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -@@ -83,6 +83,9 @@ +@@ -90,6 +90,9 @@ #include "ui/gfx/geometry/quad_f.h" #include "ui/gfx/geometry/skia_conversions.h" @@ -276,7 +276,7 @@ namespace blink { BASE_FEATURE(kDisableCanvasOverdrawOptimization, -@@ -3205,8 +3208,22 @@ TextMetrics* BaseRenderingContext2D::mea +@@ -3279,8 +3282,22 @@ TextMetrics* BaseRenderingContext2D::mea const CanvasRenderingContext2DState& state = GetState(); TextDirection direction = ToTextDirection(state.GetDirection(), canvas); @@ -328,7 +328,7 @@ } // namespace blink --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1746,6 +1746,12 @@ +@@ -1724,6 +1724,12 @@ status: "experimental", }, { diff --git a/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch b/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch index 8f8411a9..21ea6c10 100644 --- a/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch +++ b/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch @@ -34,7 +34,7 @@ approach to change color components. #endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_ --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -3452,6 +3452,7 @@ void RenderProcessHostImpl::PropagateBro +@@ -3468,6 +3468,7 @@ void RenderProcessHostImpl::PropagateBro switches::kFileUrlPathAlias, switches::kFingerprintingClientRectsNoise, switches::kFingerprintingCanvasMeasureTextNoise, @@ -44,7 +44,7 @@ approach to change color components. switches::kForceGpuMemAvailableMb, --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -503,6 +503,8 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -493,6 +493,8 @@ void SetRuntimeFeaturesFromCommandLine(c switches::kFingerprintingClientRectsNoise, true}, {wrf::EnableFingerprintingCanvasMeasureTextNoise, switches::kFingerprintingCanvasMeasureTextNoise, true}, @@ -65,7 +65,7 @@ approach to change color components. }; --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -@@ -2530,6 +2530,9 @@ ImageData* BaseRenderingContext2D::getIm +@@ -2604,6 +2604,9 @@ ImageData* BaseRenderingContext2D::getIm snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds(); DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } @@ -77,7 +77,7 @@ approach to change color components. return image_data; --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1686,7 +1686,9 @@ component("platform") { +@@ -1685,7 +1685,9 @@ component("platform") { "//third_party/blink/renderer:non_test_config", ] @@ -314,7 +314,7 @@ approach to change color components. // Methods overridden by all sub-classes --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1752,6 +1752,9 @@ +@@ -1730,6 +1730,9 @@ name: "FingerprintingCanvasMeasureTextNoise", }, { diff --git a/patches/extra/bromite/flag-max-connections-per-host.patch b/patches/extra/bromite/flag-max-connections-per-host.patch index 6539c520..13e1db28 100644 --- a/patches/extra/bromite/flag-max-connections-per-host.patch +++ b/patches/extra/bromite/flag-max-connections-per-host.patch @@ -17,7 +17,7 @@ with limited CPU/memory resources and it is disabled by default. --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2323,6 +2323,7 @@ static_library("browser") { +@@ -2331,6 +2331,7 @@ static_library("browser") { "//components/net_log", "//components/network_hints/common:mojo_bindings", "//components/network_session_configurator/browser", @@ -64,7 +64,7 @@ with limited CPU/memory resources and it is disabled by default. #include "base/synchronization/waitable_event.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" -@@ -107,6 +109,7 @@ +@@ -109,6 +111,7 @@ #include "components/metrics/metrics_service.h" #include "components/metrics_services_manager/metrics_services_manager.h" #include "components/metrics_services_manager/metrics_services_manager_client.h" @@ -72,7 +72,7 @@ with limited CPU/memory resources and it is disabled by default. #include "components/network_time/network_time_tracker.h" #include "components/os_crypt/async/browser/os_crypt_async.h" #include "components/permissions/permissions_client.h" -@@ -140,6 +143,7 @@ +@@ -142,6 +145,7 @@ #include "media/media_buildflags.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "net/log/net_log.h" @@ -80,7 +80,7 @@ with limited CPU/memory resources and it is disabled by default. #include "ppapi/buildflags/buildflags.h" #include "printing/buildflags/buildflags.h" #include "services/network/public/cpp/features.h" -@@ -383,6 +387,18 @@ void BrowserProcessImpl::Init() { +@@ -386,6 +390,18 @@ void BrowserProcessImpl::Init() { pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled, base::BindRepeating(&ApplyMetricsReportingPolicy)); @@ -101,7 +101,7 @@ with limited CPU/memory resources and it is disabled by default. --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -2244,6 +2244,10 @@ const char kLogJsConsoleMessagesDescript +@@ -2285,6 +2285,10 @@ const char kLogJsConsoleMessagesDescript "Enable logging JS console messages in system logs, please note that they " "may contain PII."; @@ -114,7 +114,7 @@ with limited CPU/memory resources and it is disabled by default. const char kMediaRouterCastAllowAllIPsDescription[] = --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1297,6 +1297,9 @@ extern const char kLocationBarModelOptim +@@ -1311,6 +1311,9 @@ extern const char kLocationBarModelOptim extern const char kLogJsConsoleMessagesName[]; extern const char kLogJsConsoleMessagesDescription[]; diff --git a/patches/extra/debian/disable/google-api-warning.patch b/patches/extra/debian/disable/google-api-warning.patch index bdf82c75..6a14a278 100644 --- a/patches/extra/debian/disable/google-api-warning.patch +++ b/patches/extra/debian/disable/google-api-warning.patch @@ -3,7 +3,7 @@ author: Michael Gilbert --- a/chrome/browser/ui/startup/infobar_utils.cc +++ b/chrome/browser/ui/startup/infobar_utils.cc -@@ -151,10 +151,6 @@ void AddInfoBarsIfNecessary(Browser* bro +@@ -154,10 +154,6 @@ void AddInfoBarsIfNecessary(Browser* bro infobars::ContentInfoBarManager* infobar_manager = infobars::ContentInfoBarManager::FromWebContents(web_contents); diff --git a/patches/extra/inox-patchset/0006-modify-default-prefs.patch b/patches/extra/inox-patchset/0006-modify-default-prefs.patch index 03a40ad8..abd32017 100644 --- a/patches/extra/inox-patchset/0006-modify-default-prefs.patch +++ b/patches/extra/inox-patchset/0006-modify-default-prefs.patch @@ -12,7 +12,7 @@ void BackgroundModeManager::RegisterProfile(Profile* profile) { --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -1520,7 +1520,7 @@ void ChromeContentBrowserClient::Registe +@@ -1525,7 +1525,7 @@ void ChromeContentBrowserClient::Registe void ChromeContentBrowserClient::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); @@ -23,7 +23,7 @@ // used for mapping the command-line flags). --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc -@@ -428,7 +428,7 @@ void ProfileNetworkContextService::Updat +@@ -385,7 +385,7 @@ void ProfileNetworkContextService::Confi void ProfileNetworkContextService::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled, @@ -120,7 +120,7 @@ --- a/components/password_manager/core/browser/password_manager.cc +++ b/components/password_manager/core/browser/password_manager.cc -@@ -269,14 +269,14 @@ void MaybeNudgeToUpdateGMSCoreWhenSaving +@@ -268,14 +268,14 @@ void MaybeNudgeToUpdateGMSCoreWhenSaving void PasswordManager::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( diff --git a/patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch b/patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch deleted file mode 100644 index baf77dd9..00000000 --- a/patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/chrome/browser/ui/startup/startup_tab_provider.cc -+++ b/chrome/browser/ui/startup/startup_tab_provider.cc -@@ -157,7 +157,7 @@ bool IsChromeControlledNtpUrl(const GURL - - StartupTabs StartupTabProviderImpl::GetOnboardingTabs(Profile* profile) const { - // Chrome OS has its own welcome flow provided by OOBE. --#if BUILDFLAG(IS_CHROMEOS_ASH) -+#if 1 - return StartupTabs(); - #else - if (!profile || base::FeatureList::IsEnabled(kForYouFre)) { diff --git a/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch b/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch index 4fc001ef..eaf232c0 100644 --- a/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch +++ b/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch @@ -5,7 +5,7 @@ Subject: [PATCH 56/66] browser: disable profile auto-import on first run --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc -@@ -1647,11 +1647,6 @@ int ChromeBrowserMainParts::PreMainMessa +@@ -1658,11 +1658,6 @@ int ChromeBrowserMainParts::PreMainMessa // and preferences have been registered since some of the import code depends // on preferences. if (first_run::IsChromeFirstRun()) { diff --git a/patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch b/patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch index 7ea38311..f21311e6 100644 --- a/patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch +++ b/patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch @@ -29,7 +29,7 @@ TLDR: Do not let files sneak onto the disk too easily. --- a/chrome/browser/download/download_prefs.cc +++ b/chrome/browser/download/download_prefs.cc -@@ -274,7 +274,7 @@ void DownloadPrefs::RegisterProfilePrefs +@@ -272,7 +272,7 @@ void DownloadPrefs::RegisterProfilePrefs user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kPromptForDownload, diff --git a/patches/extra/iridium-browser/updater-disable-auto-update.patch b/patches/extra/iridium-browser/updater-disable-auto-update.patch index edfc3b26..60d4730f 100644 --- a/patches/extra/iridium-browser/updater-disable-auto-update.patch +++ b/patches/extra/iridium-browser/updater-disable-auto-update.patch @@ -16,7 +16,7 @@ the case anyway, since we are based off Chromium, not Chrome. --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm -@@ -990,7 +990,7 @@ class AppControllerNativeThemeObserver : +@@ -1059,7 +1059,7 @@ class AppControllerNativeThemeObserver : CFStringRef checkInterval = CFSTR("checkInterval"); CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app); if (!plist) { diff --git a/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch b/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch index c05e8c1a..8790bfbc 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch @@ -1,15 +1,14 @@ --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -142,6 +142,8 @@ - #include "chrome/browser/ui/tabs/tab_utils.h" - #include "chrome/browser/ui/ui_features.h" +@@ -144,6 +144,7 @@ #include "chrome/browser/ui/unload_controller.h" -+#include "chrome/browser/ui/views/frame/browser_view.h" + #include "chrome/browser/ui/views/frame/browser_view.h" + #include "chrome/browser/ui/views/frame/contents_web_view.h" +#include "chrome/browser/ui/views/message_box_dialog.h" #include "chrome/browser/ui/web_applications/app_browser_controller.h" #include "chrome/browser/ui/web_applications/web_app_launch_utils.h" #include "chrome/browser/ui/webui/signin/login_ui_service.h" -@@ -491,6 +493,7 @@ Browser::Browser(const CreateParams& par +@@ -530,6 +531,7 @@ Browser::Browser(const CreateParams& par omit_from_session_restore_(params.omit_from_session_restore), should_trigger_session_restore_(params.should_trigger_session_restore), cancel_download_confirmation_state_(NOT_PROMPTED), @@ -17,15 +16,16 @@ override_bounds_(params.initial_bounds), initial_show_state_(params.initial_show_state), initial_workspace_(params.initial_workspace), -@@ -895,6 +898,7 @@ Browser::WarnBeforeClosingResult Browser - // true or there are no pending downloads we need to prompt about) then - // there's no need to warn. - if (force_skip_warning_user_on_close_ || CanCloseWithInProgressDownloads()) -+ if (CanCloseWithMultipleTabs()) - return WarnBeforeClosingResult::kOkToClose; +@@ -933,6 +935,8 @@ std::u16string Browser::FormatTitleForDi - DCHECK(!warn_before_closing_callback_) -@@ -931,6 +935,7 @@ bool Browser::TryToCloseWindow( + Browser::WarnBeforeClosingResult Browser::MaybeWarnBeforeClosing( + Browser::WarnBeforeClosingCallback warn_callback) { ++ if (!CanCloseWithMultipleTabs()) ++ return WarnBeforeClosingResult::kDoNotClose; + // If the browser can close right away (we've indicated that we want to skip + // before-unload handlers by setting `force_skip_warning_user_on_close_` to + // true or there are no pending downloads we need to prompt about) then +@@ -992,6 +996,7 @@ bool Browser::TryToCloseWindow( void Browser::ResetTryToCloseWindow() { cancel_download_confirmation_state_ = NOT_PROMPTED; @@ -33,7 +33,7 @@ unload_controller_.ResetTryToCloseWindow(); } -@@ -2968,6 +2973,62 @@ bool Browser::CanCloseWithInProgressDown +@@ -3008,6 +3013,58 @@ bool Browser::CanCloseWithInProgressDown return false; } @@ -77,10 +77,6 @@ + + close_multitab_confirmation_state_ = WAITING_FOR_RESPONSE; + -+ // The dialog eats mouse events which results in the close button -+ // getting stuck in the hover state. Reset the window controls to -+ // prevent this. -+ ((BrowserView*)window_)->frame()->non_client_view()->ResetWindowControls(); + auto callback = base::BindOnce(&Browser::MultitabResponse, + weak_factory_.GetWeakPtr()); + MessageBoxDialog::Show(window_->GetNativeWindow(), @@ -96,7 +92,7 @@ void Browser::InProgressDownloadResponse(bool cancel_downloads) { if (cancel_downloads) { cancel_download_confirmation_state_ = RESPONSE_RECEIVED; -@@ -2986,6 +3047,22 @@ void Browser::InProgressDownloadResponse +@@ -3033,6 +3090,22 @@ void Browser::InProgressDownloadResponse std::move(warn_before_closing_callback_) .Run(WarnBeforeClosingResult::kDoNotClose); @@ -118,18 +114,18 @@ + .Run(WarnBeforeClosingResult::kDoNotClose); } - void Browser::FinishWarnBeforeClosing(WarnBeforeClosingResult result) { + void Browser::CookieMigrationNoticeResponse(bool proceed_closing) { --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h -@@ -28,6 +28,7 @@ - #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_observer.h" +@@ -29,6 +29,7 @@ #include "chrome/browser/ui/browser_navigator_params.h" + #include "chrome/browser/ui/browser_window/public/browser_window_interface.h" #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h" +#include "chrome/browser/ui/simple_message_box.h" #include "chrome/browser/ui/signin/signin_view_controller.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" #include "chrome/browser/ui/unload_controller.h" -@@ -1169,12 +1170,17 @@ class Browser : public TabStripModelObse +@@ -1168,12 +1169,17 @@ class Browser : public TabStripModelObse // Returns true if the window can close, false otherwise. bool CanCloseWithInProgressDownloads(); @@ -144,10 +140,10 @@ + void MultitabResponse(chrome::MessageBoxResult result); + - // Called when all warnings have completed when attempting to close the - // browser directly (e.g. via hotkey, close button, terminate signal, etc.) - // Used as a WarnBeforeClosingCallback by HandleBeforeClose(). -@@ -1342,6 +1348,8 @@ class Browser : public TabStripModelObse + // Called when the user has decided whether to proceed or not with the browser + // closure, in case the cookie migration notice was shown. |proceed_closing| + // is true if the browser can be closed. +@@ -1346,6 +1352,8 @@ class Browser : public TabStripModelObse // when the browser is closed with in-progress downloads. CancelDownloadConfirmationState cancel_download_confirmation_state_; diff --git a/patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch b/patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch index ca5d5a67..2e563b31 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -881,10 +881,14 @@ bool HandleNewTabPageLocationOverride( +@@ -886,10 +886,14 @@ bool HandleNewTabPageLocationOverride( // Don't change the URL when incognito mode. if (profile->IsOffTheRecord()) diff --git a/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch b/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch index 00923f7e..e34ed2e6 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch @@ -11,15 +11,15 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc -@@ -199,6 +199,8 @@ BASE_FEATURE(kAutofillSendUnidentifiedKe - "AutofillSendUnidentifiedKeyAfterFill", - base::FEATURE_DISABLED_BY_DEFAULT); +@@ -20,6 +20,8 @@ + namespace blink { + namespace features { +BASE_FEATURE(kDisableLinkDrag, "DisableLinkDrag", base::FEATURE_DISABLED_BY_DEFAULT); + - // Apply lazy-loading to ad frames which have embeds likely impacting Core Web - // Vitals. - BASE_FEATURE(kAutomaticLazyFrameLoadingToAds, + // ----------------------------------------------------------------------------- + // Feature definitions and associated constants (feature params, et cetera) + // --- a/third_party/blink/public/common/features.h +++ b/third_party/blink/public/common/features.h @@ -20,6 +20,8 @@ @@ -50,7 +50,7 @@ Node* inner_node = event.InnerNode(); --- a/third_party/blink/renderer/core/input/mouse_event_manager.cc +++ b/third_party/blink/renderer/core/input/mouse_event_manager.cc -@@ -649,8 +649,14 @@ WebInputEventResult MouseEventManager::H +@@ -648,8 +648,14 @@ WebInputEventResult MouseEventManager::H bool single_click = event.Event().click_count <= 1; diff --git a/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch b/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch index c0137a36..d76cdc81 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc +++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc -@@ -67,6 +67,7 @@ class FrameGrabHandle : public views::Vi +@@ -72,6 +72,7 @@ class FrameGrabHandle : public views::Vi // Reserve some space for the frame to be grabbed by, even if the tabstrip // is full. // TODO(tbergquist): Define this relative to the NTB insets again. diff --git a/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch b/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch index 33b8382c..e2fc26ad 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch @@ -18,7 +18,7 @@ #include "ui/gfx/color_utils.h" #include "ui/native_theme/native_theme.h" -@@ -441,7 +442,9 @@ void NTPResourceCache::CreateNewTabIncog +@@ -416,7 +417,9 @@ void NTPResourceCache::CreateNewTabIncog profile_->GetPrefs()->GetString(prefs::kCurrentThemeID); // Colors. diff --git a/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch b/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch index 79fb3783..8ce49d0b 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch @@ -41,7 +41,7 @@ #include "base/feature_list.h" #include "base/format_macros.h" #include "base/functional/bind.h" -@@ -418,6 +419,15 @@ AutocompleteController::AutocompleteCont +@@ -501,6 +502,15 @@ AutocompleteController::AutocompleteCont steady_state_omnibox_position_( metrics::OmniboxEventProto::UNKNOWN_POSITION) { provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes(); @@ -59,7 +59,7 @@ // so their async requests can be kicked off before waiting a few milliseconds --- a/components/omnibox/browser/history_url_provider.cc +++ b/components/omnibox/browser/history_url_provider.cc -@@ -479,6 +479,9 @@ void HistoryURLProvider::Start(const Aut +@@ -487,6 +487,9 @@ void HistoryURLProvider::Start(const Aut if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY) matches_.push_back(what_you_typed_match); @@ -91,8 +91,8 @@ if (minimal_changes) --- a/components/url_formatter/url_fixer.cc +++ b/components/url_formatter/url_fixer.cc -@@ -7,6 +7,8 @@ - #include +@@ -9,6 +9,8 @@ + #include #include "base/check_op.h" +#include "base/containers/contains.h" @@ -100,7 +100,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/i18n/char_iterator.h" -@@ -621,6 +623,8 @@ GURL FixupURLInternal(const std::string& +@@ -620,6 +622,8 @@ GURL FixupURLInternal(const std::string& FixupHost(trimmed, parts.host, parts.scheme.is_valid(), desired_tld, &url); if (chrome_url && !parts.host.is_valid()) diff --git a/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch b/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch index b6ce52a2..4d32e068 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -486,7 +486,9 @@ void TabHelpers::AttachTabHelpers(WebCon +@@ -501,7 +501,9 @@ void TabHelpers::AttachTabHelpers(WebCon resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents( web_contents); SafetyTipWebContentsObserver::CreateForWebContents(web_contents); @@ -60,7 +60,7 @@ #include "base/containers/contains.h" #include "base/containers/flat_map.h" #include "base/debug/crash_logging.h" -@@ -207,6 +208,12 @@ TemplateURL MergeEnterpriseSiteSearchEng +@@ -209,6 +210,12 @@ TemplateURL MergeEnterpriseSiteSearchEng return TemplateURL(merged_data); } @@ -73,7 +73,7 @@ } // namespace // TemplateURLService::LessWithPrefix ----------------------------------------- -@@ -389,6 +396,7 @@ TemplateURLService::TemplateURLService( +@@ -391,6 +398,7 @@ TemplateURLService::TemplateURLService( #endif // BUILDFLAG(IS_CHROMEOS_LACROS) ) : prefs_(prefs), @@ -81,7 +81,7 @@ search_engine_choice_service_(search_engine_choice_service), search_terms_data_(std::move(search_terms_data)), web_data_service_(web_data_service), -@@ -527,8 +535,8 @@ bool TemplateURLService::CanAddAutogener +@@ -529,8 +537,8 @@ bool TemplateURLService::CanAddAutogener // that may interfere with search queries). An easy heuristic for this is // whether the user has a TemplateURL that has been manually modified (e.g., // renamed) connected to the same host. @@ -92,7 +92,7 @@ } bool TemplateURLService::IsPrepopulatedOrDefaultProviderByPolicy( -@@ -1926,6 +1934,8 @@ SyncDataMap TemplateURLService::CreateGU +@@ -2061,6 +2069,8 @@ SyncDataMap TemplateURLService::CreateGU } void TemplateURLService::Init() { @@ -101,7 +101,7 @@ if (client_) client_->SetOwner(this); -@@ -2101,6 +2111,9 @@ void TemplateURLService::ChangeToLoadedS +@@ -2236,6 +2246,9 @@ void TemplateURLService::ChangeToLoadedS bool TemplateURLService::CanAddAutogeneratedKeywordForHost( const std::string& host) const { @@ -113,7 +113,7 @@ return true; --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h -@@ -881,6 +881,8 @@ class TemplateURLService final : public +@@ -893,6 +893,8 @@ class TemplateURLService final : public raw_ptr search_engine_choice_service_ = nullptr; diff --git a/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch b/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch index f00db0a8..5991c03f 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch @@ -8,7 +8,7 @@ #include "base/debug/alias.h" #include "base/functional/bind.h" #include "base/i18n/rtl.h" -@@ -698,6 +699,8 @@ void Tab::OnGestureEvent(ui::GestureEven +@@ -706,6 +707,8 @@ void Tab::OnGestureEvent(ui::GestureEven } std::u16string Tab::GetTooltipText(const gfx::Point& p) const { @@ -24,10 +24,10 @@ #include +#include "base/command_line.h" + #include "base/check.h" #include "base/compiler_specific.h" #include "base/containers/adapters.h" - #include "base/containers/contains.h" -@@ -1764,6 +1765,8 @@ void TabStrip::OnMouseEventInTab(views:: +@@ -1794,6 +1795,8 @@ void TabStrip::OnMouseEventInTab(views:: } void TabStrip::UpdateHoverCard(Tab* tab, HoverCardUpdateType update_type) { diff --git a/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch b/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch index 6c877bdb..0a1428d4 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc -@@ -1415,7 +1415,8 @@ void BrowserCommandController::InitComma +@@ -1426,7 +1426,8 @@ void BrowserCommandController::InitComma command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS, normal_window); @@ -40,7 +40,7 @@ #include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" -@@ -98,7 +99,8 @@ TabStripRegionView::TabStripRegionView(s +@@ -104,7 +105,8 @@ TabStripRegionView::TabStripRegionView(s // Add and configure the TabSearchContainer. std::unique_ptr tab_search_container; @@ -48,8 +48,8 @@ + if (browser && browser->is_type_normal() && + !base::CommandLine::ForCurrentProcess()->HasSwitch("remove-tabsearch-button")) { tab_search_container = std::make_unique( - tab_strip_->controller(), render_tab_search_before_tab_strip_, this); - tab_search_container->SetProperty(views::kCrossAxisAlignmentKey, + tab_strip_->controller(), browser->tab_strip_model(), + render_tab_search_before_tab_strip_, this); --- a/chrome/browser/ungoogled_flag_entries.h +++ b/chrome/browser/ungoogled_flag_entries.h @@ -60,4 +60,8 @@ diff --git a/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch b/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch index 8d69b705..0b1f9815 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/browser_features.cc +++ b/chrome/browser/browser_features.cc -@@ -422,4 +422,5 @@ BASE_FEATURE(kWebUsbDeviceDetection, +@@ -415,4 +415,5 @@ BASE_FEATURE(kWebUsbDeviceDetection, "WebUsbDeviceDetection", base::FEATURE_ENABLED_BY_DEFAULT); @@ -8,8 +8,8 @@ } // namespace features --- a/chrome/browser/browser_features.h +++ b/chrome/browser/browser_features.h -@@ -157,6 +157,7 @@ BASE_DECLARE_FEATURE(kUseOsCryptAsyncFor - +@@ -153,6 +153,7 @@ BASE_DECLARE_FEATURE(kTabCaptureBlueBord + BASE_DECLARE_FEATURE(kUseOsCryptAsyncForCookieEncryption); BASE_DECLARE_FEATURE(kWebUsbDeviceDetection); +BASE_DECLARE_FEATURE(kClearDataOnExit); diff --git a/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch b/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch index 785c9aa0..3eaa9991 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/tabs/tab_strip_model.cc +++ b/chrome/browser/ui/tabs/tab_strip_model.cc -@@ -11,6 +11,7 @@ +@@ -12,6 +12,7 @@ #include #include @@ -8,7 +8,7 @@ #include "base/containers/adapters.h" #include "base/containers/contains.h" #include "base/containers/flat_map.h" -@@ -2088,6 +2089,10 @@ void TabStripModel::CloseTabs(base::span +@@ -2224,6 +2225,10 @@ void TabStripModel::CloseTabs(base::span return; } diff --git a/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch b/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch index 6856c784..eebadd8a 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch @@ -50,7 +50,7 @@ bool IsExtensionDownload(const download::DownloadItem& download_item); --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -1192,10 +1192,12 @@ DownloadConfirmationReason DownloadTarge +@@ -1191,10 +1191,12 @@ DownloadConfirmationReason DownloadTarge return DownloadConfirmationReason::SAVE_AS; #if BUILDFLAG(ENABLE_EXTENSIONS) diff --git a/patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch b/patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch index d8d07c1f..5402f3d0 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch @@ -21,7 +21,7 @@ #include "base/compiler_specific.h" #include "base/containers/flat_set.h" #include "base/feature_list.h" -@@ -1317,7 +1318,8 @@ void HistoryBackend::InitImpl( +@@ -1319,7 +1320,8 @@ void HistoryBackend::InitImpl( db_->GetStartDate(&first_recorded_time_); // Start expiring old stuff. diff --git a/patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch b/patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch index c1d18e0d..61d247b6 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch @@ -13,7 +13,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/components/url_formatter/url_formatter.cc +++ b/components/url_formatter/url_formatter.cc -@@ -9,6 +9,7 @@ +@@ -10,6 +10,7 @@ #include #include @@ -21,7 +21,7 @@ #include "base/lazy_instance.h" #include "base/memory/raw_ptr.h" #include "base/numerics/safe_conversions.h" -@@ -311,6 +312,13 @@ IDNConversionResult IDNToUnicodeWithAdju +@@ -312,6 +313,13 @@ IDNConversionResult IDNToUnicodeWithAdju host16.reserve(host.length()); host16.insert(host16.end(), host.begin(), host.end()); @@ -33,5 +33,5 @@ + } + // Compute the top level domain to be used in spoof checks later. - base::StringPiece top_level_domain; + std::string_view top_level_domain; std::u16string top_level_domain_unicode; diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch index 0adb7334..aa15579b 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch @@ -3,7 +3,7 @@ --- a/chrome/browser/ui/startup/infobar_utils.cc +++ b/chrome/browser/ui/startup/infobar_utils.cc -@@ -120,7 +120,8 @@ void AddInfoBarsIfNecessary(Browser* bro +@@ -123,7 +123,8 @@ void AddInfoBarsIfNecessary(Browser* bro } // Web apps should not display the session restore bubble (crbug.com/1264121) diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch index bbf2d612..b913833a 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch @@ -16,7 +16,7 @@ #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" #include "components/feature_engagement/public/event_constants.h" -@@ -528,6 +530,17 @@ void ExtensionsToolbarContainer::AnchorA +@@ -537,6 +539,17 @@ void ExtensionsToolbarContainer::AnchorA widget->widget_delegate()->AsBubbleDialogDelegate()->SetAnchorView( anchor_view && anchor_view->GetVisible() ? anchor_view : GetExtensionsButton()); @@ -34,7 +34,7 @@ widget->Show(); } -@@ -936,6 +949,9 @@ void ExtensionsToolbarContainer::UpdateC +@@ -945,6 +958,9 @@ void ExtensionsToolbarContainer::UpdateC } bool ExtensionsToolbarContainer::ShouldContainerBeVisible() const { diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch index 02f1f39c..0b8a8699 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch @@ -1,9 +1,9 @@ --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc -@@ -1960,6 +1960,10 @@ void BrowserView::UpdateExclusiveAccessE - ExclusiveAccessBubbleHideCallback bubble_first_hide_callback, - bool notify_download, - bool force_update) { +@@ -1961,6 +1961,10 @@ void BrowserView::ExitFullscreen() { + void BrowserView::UpdateExclusiveAccessBubble( + const ExclusiveAccessBubbleParams& params, + ExclusiveAccessBubbleHideCallback first_hide_callback) { + if (base::CommandLine::ForCurrentProcess()->HasSwitch( + "hide-fullscreen-exit-ui")) + return; diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-side-panel-button.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-side-panel-button.patch index 01513a81..440efaa2 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-hide-side-panel-button.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-side-panel-button.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -452,7 +452,8 @@ void ToolbarView::Init() { +@@ -461,7 +461,8 @@ void ToolbarView::Init() { send_tab_to_self_button_ = container_view_->AddChildView(std::move(send_tab_to_self_button)); diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch index e3d8c874..72d636cb 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc -@@ -1070,7 +1070,11 @@ void Tab::UpdateIconVisibility() { +@@ -1079,7 +1079,11 @@ void Tab::UpdateIconVisibility() { if (IsActive()) { // Close button is shown on active tabs regardless of the size. showing_close_button_ = true; @@ -12,7 +12,7 @@ showing_alert_indicator_ = has_alert_icon && alert_icon_width <= available_width; -@@ -1095,6 +1099,8 @@ void Tab::UpdateIconVisibility() { +@@ -1104,6 +1108,8 @@ void Tab::UpdateIconVisibility() { } showing_close_button_ = large_enough_for_close_button; diff --git a/patches/extra/ungoogled-chromium/add-flag-to-reduce-system-info.patch b/patches/extra/ungoogled-chromium/add-flag-to-reduce-system-info.patch new file mode 100644 index 00000000..a323ab3b --- /dev/null +++ b/patches/extra/ungoogled-chromium/add-flag-to-reduce-system-info.patch @@ -0,0 +1,80 @@ +--- a/chrome/browser/ungoogled_flag_entries.h ++++ b/chrome/browser/ungoogled_flag_entries.h +@@ -132,4 +132,8 @@ + "Minimal Referrers", + "Removes all cross-origin referrers and strips same-origin referrers down to the origin. Has lower precedence than remove-cross-origin-referrers. ungoogled-chromium flag.", + kOsAll, FEATURE_VALUE_TYPE(features::kMinimalReferrers)}, ++ {"reduced-system-info", ++ "Reduced System Info", ++ "Reduces the amount of system information obatainable through headers and javascript, also causes hardwareConcurrency to respond with two cores. ungoogled-chromium flag.", ++ kOsAll, FEATURE_VALUE_TYPE(blink::features::kReducedSystemInfo)}, + #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ +--- a/components/embedder_support/user_agent_utils.cc ++++ b/components/embedder_support/user_agent_utils.cc +@@ -143,6 +143,8 @@ const std::string& GetWindowsPlatformVer + // TODO(crbug.com/1330890): Remove this method along with policy. + bool ShouldReduceUserAgentMinorVersion( + UserAgentReductionEnterprisePolicyState user_agent_reduction) { ++ if (base::FeatureList::IsEnabled(blink::features::kReducedSystemInfo)) ++ return true; + return ((user_agent_reduction != + UserAgentReductionEnterprisePolicyState::kForceDisabled && + base::FeatureList::IsEnabled( +@@ -166,6 +168,8 @@ bool ShouldReduceUserAgentMinorVersion( + // sending unified platform for the user agent string. + bool ShouldSendUserAgentUnifiedPlatform( + UserAgentReductionEnterprisePolicyState user_agent_reduction) { ++ if (base::FeatureList::IsEnabled(blink::features::kReducedSystemInfo)) ++ return true; + #if BUILDFLAG(IS_ANDROID) + return ShouldReduceUserAgentMinorVersion(user_agent_reduction) && + base::FeatureList::IsEnabled( +@@ -456,6 +460,8 @@ blink::UserAgentMetadata GetUserAgentMet + + blink::UserAgentMetadata GetUserAgentMetadata(const PrefService* pref_service, + bool only_low_entropy_ch) { ++ if (base::FeatureList::IsEnabled(blink::features::kReducedSystemInfo)) ++ only_low_entropy_ch = true; + blink::UserAgentMetadata metadata; + + bool enable_updated_grease_by_policy = true; +--- a/third_party/blink/common/features.cc ++++ b/third_party/blink/common/features.cc +@@ -21,6 +21,7 @@ namespace blink { + namespace features { + + BASE_FEATURE(kDisableLinkDrag, "DisableLinkDrag", base::FEATURE_DISABLED_BY_DEFAULT); ++BASE_FEATURE(kReducedSystemInfo, "ReducedSystemInfo", base::FEATURE_DISABLED_BY_DEFAULT); + + // ----------------------------------------------------------------------------- + // Feature definitions and associated constants (feature params, et cetera) +--- a/third_party/blink/public/common/features.h ++++ b/third_party/blink/public/common/features.h +@@ -21,6 +21,7 @@ namespace blink { + namespace features { + + BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDisableLinkDrag); ++BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kReducedSystemInfo); + + // ----------------------------------------------------------------------------- + // Feature declarations and associated constants (feature params, et cetera) +--- a/third_party/blink/renderer/core/execution_context/navigator_base.cc ++++ b/third_party/blink/renderer/core/execution_context/navigator_base.cc +@@ -69,6 +69,8 @@ String NavigatorBase::platform() const { + } + #endif + ++ if (base::FeatureList::IsEnabled(blink::features::kReducedSystemInfo)) ++ return GetReducedNavigatorPlatform(); + return NavigatorID::platform(); + } + +@@ -80,6 +82,8 @@ void NavigatorBase::Trace(Visitor* visit + } + + unsigned int NavigatorBase::hardwareConcurrency() const { ++ if (base::FeatureList::IsEnabled(blink::features::kReducedSystemInfo)) ++ return 2; + unsigned int hardware_concurrency = + NavigatorConcurrentHardware::hardwareConcurrency(); + diff --git a/patches/extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch b/patches/extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch new file mode 100644 index 00000000..4290bf19 --- /dev/null +++ b/patches/extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch @@ -0,0 +1,70 @@ +--- a/chrome/browser/ungoogled_flag_entries.h ++++ b/chrome/browser/ungoogled_flag_entries.h +@@ -136,4 +136,8 @@ + "Reduced System Info", + "Reduces the amount of system information obatainable through headers and javascript, also causes hardwareConcurrency to respond with two cores. ungoogled-chromium flag.", + kOsAll, FEATURE_VALUE_TYPE(blink::features::kReducedSystemInfo)}, ++ {"remove-client-hints", ++ "Remove Client Hints", ++ "Removes client hints (information sent to servers about your system, similar to a user agent). ungoogled-chromium flag.", ++ kOsAll, FEATURE_VALUE_TYPE(blink::features::kRemoveClientHints)}, + #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ +--- a/content/browser/client_hints/client_hints.cc ++++ b/content/browser/client_hints/client_hints.cc +@@ -836,6 +836,8 @@ void UpdateNavigationRequestClientUaHead + net::HttpRequestHeaders* headers, + const std::optional& request_url) { + DCHECK(frame_tree_node); ++ if (base::FeatureList::IsEnabled(blink::features::kRemoveClientHints)) ++ return; + if (!ShouldAddClientHints(origin, frame_tree_node, delegate, request_url)) { + return; + } +@@ -857,6 +859,8 @@ void AddRequestClientHintsHeaders( + FrameTreeNode* frame_tree_node, + const blink::ParsedPermissionsPolicy& container_policy, + const std::optional& request_url) { ++ if (base::FeatureList::IsEnabled(blink::features::kRemoveClientHints)) ++ return; + ClientHintsExtendedData data(origin, frame_tree_node, delegate, request_url); + UpdateIFramePermissionsPolicyWithDelegationSupportForClientHints( + data, container_policy); +--- a/third_party/blink/common/features.cc ++++ b/third_party/blink/common/features.cc +@@ -22,6 +22,7 @@ namespace features { + + BASE_FEATURE(kDisableLinkDrag, "DisableLinkDrag", base::FEATURE_DISABLED_BY_DEFAULT); + BASE_FEATURE(kReducedSystemInfo, "ReducedSystemInfo", base::FEATURE_DISABLED_BY_DEFAULT); ++BASE_FEATURE(kRemoveClientHints, "RemoveClientHints", base::FEATURE_DISABLED_BY_DEFAULT); + + // ----------------------------------------------------------------------------- + // Feature definitions and associated constants (feature params, et cetera) +--- a/third_party/blink/public/common/features.h ++++ b/third_party/blink/public/common/features.h +@@ -22,6 +22,7 @@ namespace features { + + BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDisableLinkDrag); + BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kReducedSystemInfo); ++BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kRemoveClientHints); + + // ----------------------------------------------------------------------------- + // Feature declarations and associated constants (feature params, et cetera) +--- a/third_party/blink/renderer/core/frame/navigator_ua.cc ++++ b/third_party/blink/renderer/core/frame/navigator_ua.cc +@@ -5,6 +5,7 @@ + #include "third_party/blink/renderer/core/frame/navigator_ua.h" + + #include "base/compiler_specific.h" ++#include "third_party/blink/public/common/features.h" + #include "third_party/blink/public/common/user_agent/user_agent_metadata.h" + #include "third_party/blink/renderer/core/frame/navigator_ua_data.h" + #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" +@@ -12,6 +13,8 @@ + namespace blink { + + NavigatorUAData* NavigatorUA::userAgentData() { ++ if (base::FeatureList::IsEnabled(blink::features::kRemoveClientHints)) ++ return nullptr; + NavigatorUAData* ua_data = + MakeGarbageCollected(GetUAExecutionContext()); + diff --git a/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch b/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch index 6857d919..02ae3183 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch @@ -49,7 +49,7 @@ // tabstrip, or the empty space beside the tabstrip. --- a/chrome/browser/ui/views/frame/browser_root_view.h +++ b/chrome/browser/ui/views/frame/browser_root_view.h -@@ -161,6 +161,8 @@ class BrowserRootView : public views::in +@@ -162,6 +162,8 @@ class BrowserRootView : public views::in int scroll_remainder_x_ = 0; int scroll_remainder_y_ = 0; diff --git a/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch b/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch index 20c0f286..8260727d 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -476,6 +476,17 @@ void ToolbarView::Init() { +@@ -485,6 +485,17 @@ void ToolbarView::Init() { #elif BUILDFLAG(IS_CHROMEOS_LACROS) show_avatar_toolbar_button = !chromeos::IsManagedGuestSession(); #endif diff --git a/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch b/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch index d105f0ca..fec8d2e6 100644 --- a/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch +++ b/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -3919,10 +3919,12 @@ const FeatureEntry::FeatureVariation kDe +@@ -3855,10 +3855,12 @@ const FeatureEntry::FeatureVariation kCo #include "chrome/browser/ungoogled_flag_choices.h" #include "chrome/browser/bromite_flag_choices.h" #include "chrome/browser/ungoogled_platform_flag_choices.h" diff --git a/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch b/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch index 94e98a7f..6f4dda6c 100644 --- a/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch +++ b/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch @@ -19,7 +19,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -159,6 +159,8 @@ static_library("common_lib") { +@@ -158,6 +158,8 @@ static_library("common_lib") { "pref_names_util.cc", "pref_names_util.h", "ref_counted_util.h", @@ -28,7 +28,7 @@ "search/instant_mojom_traits.h", "search/instant_types.cc", "search/instant_types.h", -@@ -268,6 +270,7 @@ static_library("common_lib") { +@@ -270,6 +272,7 @@ static_library("common_lib") { "//components/no_state_prefetch/common:mojo_bindings", "//components/page_load_metrics/common:common", "//components/pdf/common:constants", @@ -38,7 +38,7 @@ if (is_android || enable_library_cdms) { --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -990,6 +990,14 @@ BASE_FEATURE(kNewFilesPolicyUX, +@@ -967,6 +967,14 @@ BASE_FEATURE(kNewFilesPolicyUX, // referrers instead of their ordinary behavior. BASE_FEATURE(kNoReferrers, "NoReferrers", base::FEATURE_DISABLED_BY_DEFAULT); @@ -55,7 +55,7 @@ // on-screen until dismissed, they are instead shown for a very long time. --- a/chrome/common/chrome_features.h +++ b/chrome/common/chrome_features.h -@@ -601,6 +601,10 @@ BASE_DECLARE_FEATURE(kNewFilesPolicyUX); +@@ -576,6 +576,10 @@ BASE_DECLARE_FEATURE(kNewFilesPolicyUX); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kNoReferrers); @@ -173,7 +173,7 @@ disallowed_extension_deps_ = [ # Components should largely not depend on //extensions. Since // extensions # is not a component target and is linked with //chrome, depending on most -@@ -839,7 +839,7 @@ test("components_unittests") { +@@ -843,7 +843,7 @@ test("components_unittests") { # On other platforms, no components should depend on Chrome. # Since //chrome depends on //extensions, we also only assert_no_deps on # extensions targets for non-lacros builds. @@ -182,7 +182,7 @@ assert_no_deps = [ "//chrome/*" ] assert_no_deps += disallowed_extension_deps_ } -@@ -1124,7 +1124,7 @@ if (use_blink) { +@@ -1129,7 +1129,7 @@ if (use_blink) { # dependency. On other platforms, no components should depend on Chrome. # Since //chrome depends on //extensions, we also only assert_no_deps on # extensions targets for non-lacros builds. @@ -193,7 +193,7 @@ } --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -42,6 +42,7 @@ +@@ -41,6 +41,7 @@ #include "build/build_config.h" #include "build/buildflag.h" #include "build/chromeos_buildflags.h" @@ -201,7 +201,7 @@ #include "components/viz/host/host_frame_sink_manager.h" #include "content/browser/blob_storage/chrome_blob_storage_context.h" #include "content/browser/browsing_topics/header_util.h" -@@ -385,10 +386,10 @@ void AddAdditionalRequestHeaders( +@@ -386,10 +387,10 @@ void AddAdditionalRequestHeaders( net::HttpRequestHeaders::kUserAgent, ComputeUserAgentValue(*headers, user_agent_override, browser_context)); @@ -226,7 +226,7 @@ #include "content/common/associated_interfaces.mojom.h" #include "content/common/content_navigation_policy.h" #include "content/common/content_switches_internal.h" -@@ -4542,10 +4543,13 @@ void RenderFrameImpl::WillSendRequestInt +@@ -4547,10 +4548,13 @@ void RenderFrameImpl::WillSendRequestInt request.SetHasUserGesture(frame_->HasTransientUserActivation()); @@ -246,7 +246,7 @@ void RenderFrameImpl::DidLoadResourceFromMemoryCache( --- a/content/shell/BUILD.gn +++ b/content/shell/BUILD.gn -@@ -280,6 +280,7 @@ static_library("content_shell_lib") { +@@ -315,6 +315,7 @@ static_library("content_shell_lib") { "//base:base_static", "//build:chromeos_buildflags", "//cc/base", @@ -355,7 +355,7 @@ WebVector> --- a/tools/v8_context_snapshot/BUILD.gn +++ b/tools/v8_context_snapshot/BUILD.gn -@@ -82,6 +82,7 @@ if (use_v8_context_snapshot) { +@@ -83,6 +83,7 @@ if (use_v8_context_snapshot) { sources = [ "v8_context_snapshot_generator.cc" ] deps = [ diff --git a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch index 5f6f35f9..2e1a4a6c 100644 --- a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch +++ b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch @@ -47,7 +47,7 @@ // True if |hostname| ends with either ".local" or ".local.". bool ResemblesMulticastDNSName(std::string_view hostname) { return hostname.ends_with(".local") || hostname.ends_with(".local."); -@@ -1388,33 +1383,10 @@ int HostResolverManager::StartIPv6Reacha +@@ -1429,33 +1424,10 @@ int HostResolverManager::StartIPv6Reacha return OK; } diff --git a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch index c2e59a92..31267c07 100644 --- a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch +++ b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch @@ -270,7 +270,7 @@ bool CanEdit(const TemplateURL* url) const; --- a/chrome/browser/ui/search_engines/template_url_table_model.cc +++ b/chrome/browser/ui/search_engines/template_url_table_model.cc -@@ -191,21 +191,25 @@ void TemplateURLTableModel::Remove(size_ +@@ -200,21 +200,25 @@ void TemplateURLTableModel::Remove(size_ void TemplateURLTableModel::Add(size_t index, const std::u16string& short_name, const std::u16string& keyword, @@ -301,7 +301,7 @@ DCHECK(index <= RowCount()); DCHECK(!url.empty()); TemplateURL* template_url = GetTemplateURL(index); -@@ -214,7 +218,8 @@ void TemplateURLTableModel::ModifyTempla +@@ -223,7 +227,8 @@ void TemplateURLTableModel::ModifyTempla DCHECK(template_url_service_->GetDefaultSearchProvider() != template_url || template_url->SupportsReplacement( template_url_service_->search_terms_data())); @@ -313,7 +313,7 @@ TemplateURL* TemplateURLTableModel::GetTemplateURL(size_t index) { --- a/chrome/browser/ui/search_engines/template_url_table_model.h +++ b/chrome/browser/ui/search_engines/template_url_table_model.h -@@ -58,13 +58,15 @@ class TemplateURLTableModel : public ui: +@@ -61,13 +61,15 @@ class TemplateURLTableModel : public ui: void Add(size_t index, const std::u16string& short_name, const std::u16string& keyword, @@ -341,7 +341,7 @@ // Dummy number used for indicating that a new search engine is added. const int kNewSearchEngineIndex = -1; -@@ -223,6 +224,8 @@ base::Value::Dict SearchEnginesHandler:: +@@ -222,6 +223,8 @@ base::Value::Dict SearchEnginesHandler:: Profile* profile = Profile::FromWebUI(web_ui()); dict.Set("url", template_url->url_ref().DisplayURL(UIThreadSearchTermsData())); @@ -350,7 +350,7 @@ dict.Set("urlLocked", ((template_url->prepopulate_id() > 0) || (template_url->starter_pack_id() > 0))); GURL icon_url = template_url->favicon_url(); -@@ -364,12 +367,14 @@ void SearchEnginesHandler::HandleSearchE +@@ -363,12 +366,14 @@ void SearchEnginesHandler::HandleSearchE void SearchEnginesHandler::OnEditedKeyword(TemplateURL* template_url, const std::u16string& title, const std::u16string& keyword, @@ -368,7 +368,7 @@ edit_controller_.reset(); } -@@ -397,6 +402,8 @@ bool SearchEnginesHandler::CheckFieldVal +@@ -396,6 +401,8 @@ bool SearchEnginesHandler::CheckFieldVal is_valid = edit_controller_->IsKeywordValid(base::UTF8ToUTF16(field_value)); else if (field_name.compare(kQueryUrlField) == 0) is_valid = edit_controller_->IsURLValid(field_value); @@ -377,7 +377,7 @@ else NOTREACHED(); -@@ -416,18 +423,21 @@ void SearchEnginesHandler::HandleSearchE +@@ -415,18 +422,21 @@ void SearchEnginesHandler::HandleSearchE if (!edit_controller_.get()) return; @@ -427,7 +427,7 @@ --- a/components/search_engines/template_url_service.cc +++ b/components/search_engines/template_url_service.cc -@@ -862,7 +862,8 @@ void TemplateURLService::IncrementUsageC +@@ -916,7 +916,8 @@ void TemplateURLService::IncrementUsageC void TemplateURLService::ResetTemplateURL(TemplateURL* url, const std::u16string& title, const std::u16string& keyword, @@ -437,7 +437,7 @@ DCHECK(!IsCreatedByExtension(url)); DCHECK(!keyword.empty()); DCHECK(!search_url.empty()); -@@ -877,6 +878,7 @@ void TemplateURLService::ResetTemplateUR +@@ -931,6 +932,7 @@ void TemplateURLService::ResetTemplateUR data.safe_for_autoreplace = false; data.last_modified = clock_->Now(); data.is_active = TemplateURLData::ActiveStatus::kTrue; @@ -447,7 +447,7 @@ } --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h -@@ -308,7 +308,8 @@ class TemplateURLService final : public +@@ -316,7 +316,8 @@ class TemplateURLService final : public void ResetTemplateURL(TemplateURL* url, const std::u16string& title, const std::u16string& keyword, diff --git a/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch b/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch index 731ac904..e450aaa0 100644 --- a/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch +++ b/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -3915,7 +3915,13 @@ const FeatureEntry::FeatureVariation kDe +@@ -3851,7 +3851,13 @@ const FeatureEntry::FeatureVariation kCo // calculate and verify checksum. // // When adding a new choice, add it to the end of the list. diff --git a/patches/extra/ungoogled-chromium/disable-capture-all-screens.patch b/patches/extra/ungoogled-chromium/disable-capture-all-screens.patch index 08f6f13e..5037ac14 100644 --- a/patches/extra/ungoogled-chromium/disable-capture-all-screens.patch +++ b/patches/extra/ungoogled-chromium/disable-capture-all-screens.patch @@ -1,29 +1,23 @@ --- a/chrome/browser/media/webrtc/capture_policy_utils.cc +++ b/chrome/browser/media/webrtc/capture_policy_utils.cc -@@ -241,89 +241,13 @@ void RegisterProfilePrefs(PrefRegistrySi - } - - bool IsGetAllScreensMediaAllowedForAnySite(content::BrowserContext* context) { --// TODO(b/40272166): Implement for Lacros. --#if BUILDFLAG(IS_CHROMEOS_ASH) -- policy::MultiScreenCapturePolicyService* multi_capture_policy_service = -- policy::MultiScreenCapturePolicyServiceFactory::GetForBrowserContext( -- context); -- if (!multi_capture_policy_service) { -- return false; +@@ -63,46 +63,7 @@ void IsMultiCaptureAllowedForAnyOriginOn + base::OnceCallback callback, + content::BrowserContext* context, + bool is_multi_capture_allowed_for_any_origin_on_main_profile) { +- // If the new MultiScreenCaptureAllowedForUrls policy permits access, exit +- // early. If not, check the legacy +- // GetDisplayMediaSetSelectAllScreensAllowedForUrls policy. +- if (is_multi_capture_allowed_for_any_origin_on_main_profile) { +- std::move(callback).Run(true); +- return; - } - -- if (multi_capture_policy_service->GetAllowListSize() > 0u) { -- return true; -- } --#endif // BUILDFLAG(IS_CHROMEOS_ASH) -- --// TODO(b/329064666): Remove the checks below once the pivot to IWAs is --// complete. --#if BUILDFLAG(IS_CHROMEOS) +- // TODO(b/329064666): Remove the checks below once the pivot to IWAs is +- // complete. - Profile* profile = Profile::FromBrowserContext(context); - if (!profile) { -- return false; +- std::move(callback).Run(false); +- return; - } - -#if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -31,26 +25,48 @@ - // screens can happen (for privacy reasons), this API is only available on - // primary profiles. - if (!profile->IsMainProfile()) { -- return false; +- std::move(callback).Run(false); +- return; - } -#endif // BUILDFLAG(IS_CHROMEOS_LACROS) - - HostContentSettingsMap* host_content_settings_map = - HostContentSettingsMapFactory::GetForProfile(profile); - if (!host_content_settings_map) { -- return false; + std::move(callback).Run(false); +- return; - } - ContentSettingsForOneType content_settings = - host_content_settings_map->GetSettingsForOneType( - ContentSettingsType::ALL_SCREEN_CAPTURE); -- return base::ranges::any_of(content_settings, -- [](const ContentSettingPatternSource& source) { -- return source.GetContentSetting() == -- ContentSetting::CONTENT_SETTING_ALLOW; -- }); +- std::move(callback).Run(base::ranges::any_of( +- content_settings, [](const ContentSettingPatternSource& source) { +- return source.GetContentSetting() == +- ContentSetting::CONTENT_SETTING_ALLOW; +- })); + } + + void CheckAllScreensMediaAllowedForIwaResultReceived( +@@ -290,58 +251,13 @@ void RegisterProfilePrefs(PrefRegistrySi + void CheckGetAllScreensMediaAllowedForAnyOrigin( + content::BrowserContext* context, + base::OnceCallback callback) { +-#if BUILDFLAG(IS_CHROMEOS) +- if (crosapi::mojom::MultiCaptureService* multi_capture_service = +- GetMultiCaptureService()) { +- multi_capture_service->IsMultiCaptureAllowedForAnyOriginOnMainProfile( +- base::BindOnce( +- IsMultiCaptureAllowedForAnyOriginOnMainProfileResultReceived, +- std::move(callback), context)); +- } else { +- // If the multi capture service is not available with the required version, +- // fall back to the original flow using the deprecated policy. +- IsMultiCaptureAllowedForAnyOriginOnMainProfileResultReceived( +- std::move(callback), context, /*result=*/false); +- } -#else - return false; --#endif + std::move(callback).Run(false); +-#endif // BUILDFLAG(IS_CHROMEOS) } void CheckGetAllScreensMediaAllowed(content::BrowserContext* context, @@ -76,12 +92,12 @@ - GetMultiCaptureService(); - if (multi_capture_service) { - multi_capture_service->IsMultiCaptureAllowed( -- url, base::BindOnce(&IsGetAllScreensMediaAllowedForIwaResultReceived, +- url, base::BindOnce(&CheckAllScreensMediaAllowedForIwaResultReceived, - std::move(callback), std::move(url), context)); - } else { - // If the multi capture service is not available with the required version, - // fall back to the original flow using the deprecated policy. -- IsGetAllScreensMediaAllowedForIwaResultReceived( +- CheckAllScreensMediaAllowedForIwaResultReceived( - std::move(callback), std::move(url), context, /*result=*/false); - } -#else diff --git a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch index b1aa4376..53ea2651 100644 --- a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch +++ b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch @@ -2,7 +2,7 @@ --- a/components/download/internal/common/base_file.cc +++ b/components/download/internal/common/base_file.cc -@@ -22,7 +22,6 @@ +@@ -23,7 +23,6 @@ #include "components/download/public/common/download_interrupt_reasons_utils.h" #include "components/download/public/common/download_item.h" #include "components/download/public/common/download_stats.h" @@ -10,7 +10,7 @@ #include "crypto/secure_hash.h" #if BUILDFLAG(IS_ANDROID) -@@ -525,94 +524,10 @@ DownloadInterruptReason BaseFile::Publis +@@ -526,94 +525,10 @@ DownloadInterruptReason BaseFile::Publis } #endif // BUILDFLAG(IS_ANDROID) @@ -105,7 +105,7 @@ } void BaseFile::AnnotateWithSourceInformation( -@@ -621,32 +536,8 @@ void BaseFile::AnnotateWithSourceInforma +@@ -622,32 +537,8 @@ void BaseFile::AnnotateWithSourceInforma const GURL& referrer_url, mojo::PendingRemote remote_quarantine, OnAnnotationDoneCallback on_annotation_done_callback) { @@ -142,7 +142,7 @@ } // namespace download --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -96,7 +96,6 @@ source_set("browser") { +@@ -98,7 +98,6 @@ source_set("browser") { "//components/payments/mojom", "//components/power_monitor", "//components/services/filesystem:lib", diff --git a/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch b/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch index efdb5659..2a46890c 100644 --- a/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch +++ b/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch @@ -4,7 +4,7 @@ --- a/components/url_formatter/url_formatter.cc +++ b/components/url_formatter/url_formatter.cc -@@ -533,15 +533,15 @@ bool HasTwoViewSourceSchemes(base::Strin +@@ -534,15 +534,15 @@ bool HasTwoViewSourceSchemes(std::string } // namespace const FormatUrlType kFormatUrlOmitNothing = 0; diff --git a/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch b/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch index 90c8b391..2564c5f1 100644 --- a/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch +++ b/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch @@ -3,7 +3,7 @@ --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -3869,8 +3869,7 @@ ScriptValue WebGLRenderingContextBase::g +@@ -3865,8 +3865,7 @@ ScriptValue WebGLRenderingContextBase::g pname, IdentifiabilityBenignStringToken( String(ContextGL()->GetString(GL_RENDERER)))); } @@ -13,7 +13,7 @@ } SynthesizeGLError( GL_INVALID_ENUM, "getParameter", -@@ -3884,8 +3883,7 @@ ScriptValue WebGLRenderingContextBase::g +@@ -3880,8 +3879,7 @@ ScriptValue WebGLRenderingContextBase::g pname, IdentifiabilityBenignStringToken( String(ContextGL()->GetString(GL_VENDOR)))); } diff --git a/patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch b/patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch index c6169bee..616511bf 100644 --- a/patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch +++ b/patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch @@ -2,7 +2,7 @@ --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc -@@ -1792,7 +1792,7 @@ BASE_FEATURE(kPrefetchFontLookupTables, +@@ -1814,7 +1814,7 @@ BASE_FEATURE(kPrefetchFontLookupTables, // crbug.com/988956. BASE_FEATURE(kPrefetchPrivacyChanges, "PrefetchPrivacyChanges", diff --git a/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch b/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch index fc9d0310..1fec368a 100644 --- a/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch +++ b/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/ui/browser_commands.cc +++ b/chrome/browser/ui/browser_commands.cc -@@ -551,11 +551,6 @@ int GetContentRestrictions(const Browser +@@ -557,11 +557,6 @@ int GetContentRestrictions(const Browser CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(current_tab); content_restrictions = core_tab_helper->content_restrictions(); @@ -14,7 +14,7 @@ } return content_restrictions; } -@@ -1698,8 +1693,7 @@ bool CanSavePage(const Browser* browser) +@@ -1704,8 +1699,7 @@ bool CanSavePage(const Browser* browser) DownloadPrefs::DownloadRestriction::ALL_FILES) { return false; } diff --git a/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch b/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch index 870e88c5..2220532c 100644 --- a/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch +++ b/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch @@ -1,8 +1,8 @@ --- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc +++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc -@@ -196,12 +196,10 @@ TabStripRegionView::TabStripRegionView(s +@@ -193,12 +193,10 @@ TabStripRegionView::TabStripRegionView(s - // TODO(crbug.com/1052397): Revisit the macro expression once build flag + // TODO(crbug.com/40118868): Revisit the macro expression once build flag // switch of lacros-chrome is complete. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) // The New Tab Button can be middle-clicked on Linux. @@ -15,16 +15,16 @@ reserved_grab_handle_space_ = --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc -@@ -2001,8 +2001,6 @@ void TabStrip::NewTabButtonPressed(const +@@ -2023,8 +2023,6 @@ void TabStrip::NewTabButtonPressed(const const ui::MouseEvent& mouse = static_cast(event); if (mouse.IsOnlyMiddleMouseButton()) { - if (ui::Clipboard::IsSupportedClipboardBuffer( - ui::ClipboardBuffer::kSelection)) { ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread(); - CHECK(clipboard); - std::u16string clipboard_text; -@@ -2011,7 +2009,6 @@ void TabStrip::NewTabButtonPressed(const + CHECK(clipboard) + << "Clipboard instance is not available, cannot proceed with " +@@ -2035,7 +2033,6 @@ void TabStrip::NewTabButtonPressed(const if (!clipboard_text.empty()) { controller_->CreateNewTabWithLocation(clipboard_text); } diff --git a/patches/extra/ungoogled-chromium/first-run-page.patch b/patches/extra/ungoogled-chromium/first-run-page.patch index bcd53207..2f9f953d 100644 --- a/patches/extra/ungoogled-chromium/first-run-page.patch +++ b/patches/extra/ungoogled-chromium/first-run-page.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc -@@ -1086,6 +1086,7 @@ int ChromeBrowserMainParts::PreCreateThr +@@ -1097,6 +1097,7 @@ int ChromeBrowserMainParts::PreCreateThr if (first_run::IsChromeFirstRun()) { if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kApp) && !base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppId)) { @@ -10,7 +10,7 @@ --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -63,6 +63,7 @@ +@@ -58,6 +58,7 @@ #include "chrome/browser/ui/webui/suggest_internals/suggest_internals_ui.h" #include "chrome/browser/ui/webui/sync_internals/sync_internals_ui.h" #include "chrome/browser/ui/webui/translate_internals/translate_internals_ui.h" @@ -18,7 +18,7 @@ #include "chrome/browser/ui/webui/usb_internals/usb_internals_ui.h" #include "chrome/browser/ui/webui/user_actions/user_actions_ui.h" #include "chrome/browser/ui/webui/version/version_ui.h" -@@ -809,6 +810,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc +@@ -779,6 +780,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc return &NewWebUI; } @@ -169,7 +169,7 @@ +#endif // CHROME_BROWSER_UI_WEBUI_UNGOOGLED_FIRST_RUN_H_ --- a/chrome/common/webui_url_constants.cc +++ b/chrome/common/webui_url_constants.cc -@@ -671,6 +671,7 @@ const char kExtensionConfigureCommandsSu +@@ -672,6 +672,7 @@ const char kExtensionConfigureCommandsSu // Add hosts here to be included in chrome://chrome-urls (about:about). // These hosts will also be suggested by BuiltinProvider. const char* const kChromeHostURLs[] = { diff --git a/patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch b/patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch index 516fed06..d4b5c62c 100644 --- a/patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch +++ b/patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/ui/startup/bad_flags_prompt.cc +++ b/chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -74,7 +74,6 @@ const char* const kBadFlags[] = { +@@ -75,7 +75,6 @@ const char* const kBadFlags[] = { // These flags disable sandbox-related security. sandbox::policy::switches::kDisableGpuSandbox, sandbox::policy::switches::kDisableSeccompFilterSandbox, diff --git a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch index 4f4638fd..5b7569cb 100644 --- a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch +++ b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch @@ -23,16 +23,17 @@ # the feedback entry in the third party cookie popup # unneeded elements from the profile menu # the 'Learn more' link on crashed tabs +# the new profile menu bubble # the Third-party sign-in site settings (FedCM) # disable LiveCaption flag by default, this also removes non-functional Live Caption checkbox from media controls # the new feature badges --- a/chrome/browser/resources/extensions/item_list.html +++ b/chrome/browser/resources/extensions/item_list.html -@@ -106,13 +106,6 @@ -

$i18n{safetyCheckAllExtensions}

- - +@@ -114,13 +114,6 @@ + + + -
@@ -100,20 +101,20 @@ declare global { --- a/chrome/browser/resources/history/side_bar.html +++ b/chrome/browser/resources/history/side_bar.html -@@ -87,13 +87,6 @@ +@@ -88,13 +88,6 @@ $i18n{historyMenuItem} - -- +- - $i18n{openTabsMenuItem} - - - - +
--- a/chrome/browser/resources/settings/appearance_page/appearance_page.ts +++ b/chrome/browser/resources/settings/appearance_page/appearance_page.ts -@@ -412,8 +412,8 @@ export class SettingsAppearancePageEleme +@@ -421,8 +421,8 @@ export class SettingsAppearancePageEleme return; } @@ -193,7 +194,7 @@ switch (this.systemTheme_) { case SystemTheme.GTK: i18nId = 'gtkTheme'; -@@ -425,11 +425,8 @@ export class SettingsAppearancePageEleme +@@ -434,11 +434,8 @@ export class SettingsAppearancePageEleme i18nId = 'classicTheme'; break; } @@ -224,13 +225,22 @@ +++ b/chrome/browser/resources/settings/basic_page/basic_page.html @@ -47,7 +47,7 @@ - +