From d2faa5113032e5f64e715b2da09eadfdaa071356 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 16 Sep 2020 17:16:49 +0200 Subject: [PATCH] Updated patches from Chromium 87.0.4259.3 to Chromium 87.0.4263.3. This CL touches only those patches which updated cleanly, conflicts resolution to be handled in a follow-up patch. --- patches/base-BUILD.gn.patch | 4 ++-- patches/build-config-android-BUILD.gn.patch | 2 +- patches/build-config-android-config.gni.patch | 2 +- patches/build-config-android-rules.gni.patch | 2 +- patches/chrome-BUILD.gn.patch | 2 +- patches/chrome-android-BUILD.gn.patch | 14 +++++++------- .../chrome-android-chrome_java_sources.gni.patch | 4 ++-- .../chrome-android-java-AndroidManifest.xml.patch | 4 ++-- ...org-chromium-chrome-browser-AppHooks.java.patch | 2 +- ...-chrome-browser-ChromeTabbedActivity.java.patch | 12 ++++++------ ...browser-TabbedModeTabDelegateFactory.java.patch | 4 ++-- ...um-chrome-browser-app-ChromeActivity.java.patch | 4 ++-- ...r-homepage-settings-HomepageSettings.java.patch | 4 ++-- ...-chrome-browser-ntp-NewTabPageLayout.java.patch | 4 ++-- ...ome-browser-sync-AndroidSyncSettings.java.patch | 2 +- ...ar-menu_button-MenuButtonCoordinator.java.patch | 6 +++--- ...browser-toolbar-top-CustomTabToolbar.java.patch | 4 ++-- patches/chrome-browser-BUILD.gn.patch | 4 ++-- patches/chrome-browser-about_flags.cc.patch | 6 +++--- ...e-browser-chrome_content_browser_client.h.patch | 4 ++-- ...rowser-extensions-extension_management.cc.patch | 4 ++-- ...wser-flags-android-chrome_feature_list.cc.patch | 4 ++-- ...owser-media-webrtc-webrtc_log_uploader.cc.patch | 2 +- ...tions-notification_platform_bridge_mac.mm.patch | 6 +++--- .../chrome-browser-prefs-browser_prefs.cc.patch | 6 +++--- ...wser-profiles-profile_avatar_icon_util.cc.patch | 8 ++++---- ...chrome-browser-profiles-profile_manager.h.patch | 4 ++-- ...-profiles-profile_shortcut_manager_win.cc.patch | 4 ++-- ...hrome-browser-resources-settings-route.js.patch | 4 ++-- ...me-browser-resources-settings-settings.js.patch | 2 +- patches/chrome-browser-ui-BUILD.gn.patch | 8 ++++---- ...i-startup-startup_browser_creator_impl.cc.patch | 2 +- ...i-views-profiles-profile_menu_view_base.h.patch | 4 ++-- ...-browser-ui-views-toolbar-toolbar_view.cc.patch | 2 +- ...-views-translate-translate_bubble_view.cc.patch | 2 +- ...i-views-translate-translate_bubble_view.h.patch | 4 ++-- patches/chrome-test-BUILD.gn.patch | 4 ++-- ...chrome-utility-importer-safari_importer.h.patch | 2 +- ...site_settings-SingleCategorySettings.java.patch | 2 +- ...s-renderer-content_settings_agent_impl.cc.patch | 4 ++-- ...gs-renderer-content_settings_agent_impl.h.patch | 4 ++-- patches/components-omnibox-browser-BUILD.gn.patch | 4 ++-- ...mnibox-browser-autocomplete_controller.cc.patch | 2 +- patches/components-page_info-BUILD.gn.patch | 4 ++-- ...rd_manager-core-browser-login_database.cc.patch | 4 ++-- ...ts-policy-tools-generate_policy_source.py.patch | 2 +- ...onents-sync-driver-profile_sync_service.h.patch | 4 ++-- patches/content-common-BUILD.gn.patch | 2 +- ...t-public-browser-content_browser_client.h.patch | 4 ++-- ...media-blink-key_system_config_selector.cc.patch | 6 +++--- patches/net-BUILD.gn.patch | 4 ++-- patches/services-network-public-cpp-BUILD.gn.patch | 4 ++-- .../third_party-blink-renderer-core-BUILD.gn.patch | 6 +++--- ...party-blink-renderer-core-dom-document.cc.patch | 2 +- ...ird_party-blink-renderer-modules-BUILD.gn.patch | 4 ++-- ...erer-modules-cookie_store-cookie_store.cc.patch | 4 ++-- .../tools-metrics-histograms-histograms.xml.patch | 4 ++-- 57 files changed, 116 insertions(+), 116 deletions(-) diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch index 308513dca04..a1b1cb79553 100644 --- a/patches/base-BUILD.gn.patch +++ b/patches/base-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn -index 47658df3c38ed7a9ced1e35509a5a68896eec855..01ac5cb8e3479e65c462bf1acc838548cac279c5 100644 +index 370a19ef0b556afff8a78c308003878767273c50..99a8ce640e56f4bab0c0aee2528e7f92df6cad4a 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -3646,6 +3646,7 @@ if (is_android) { +@@ -3660,6 +3660,7 @@ if (is_android) { "android/java/src/org/chromium/base/task/TaskTraits.java", "android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java", ] diff --git a/patches/build-config-android-BUILD.gn.patch b/patches/build-config-android-BUILD.gn.patch index 063da2411c1..50acf1807f2 100644 --- a/patches/build-config-android-BUILD.gn.patch +++ b/patches/build-config-android-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/BUILD.gn b/build/config/android/BUILD.gn -index b5600ace509d35acef0296ad486f10412099701c..92b3d37caac7d477437c42ce74742a520b390187 100644 +index 78c7983a71a0d550567e463d0d9d0ad5fa951d93..36c398457409e7ebfbb4e5f857751573b982c442 100644 --- a/build/config/android/BUILD.gn +++ b/build/config/android/BUILD.gn @@ -50,6 +50,7 @@ config("compiler") { diff --git a/patches/build-config-android-config.gni.patch b/patches/build-config-android-config.gni.patch index 81fbd87a0d5..d07ed9ea2f1 100644 --- a/patches/build-config-android-config.gni.patch +++ b/patches/build-config-android-config.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/config.gni b/build/config/android/config.gni -index 9a57ce4417276fd917721bc011ffb22764e98280..66378b5df6311fcb7725b9a6c14d725cd1f502e6 100644 +index 0b942fa4cf9ce965d9ba5d93ac25e42baf7bbfe8..ee0e84a822681db8282e35d6d9e1f0d0c7aa7cb6 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni @@ -3,6 +3,7 @@ diff --git a/patches/build-config-android-rules.gni.patch b/patches/build-config-android-rules.gni.patch index b435d2c49c3..f3ef29b3db5 100644 --- a/patches/build-config-android-rules.gni.patch +++ b/patches/build-config-android-rules.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni -index fbcec6f9ca28472d4347bcb4d3d4cceff1f98240..71d6263320d680a05b8b9342af508196062d954f 100644 +index 8bf6bca84173e418ba582798403ba72280c99904..5ead9cb2f969d22abb711abce881ee3768a705fa 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -513,6 +513,7 @@ if (enable_java_templates) { diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index d57000f6cc7..d7165d82188 100644 --- a/patches/chrome-BUILD.gn.patch +++ b/patches/chrome-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index d5a717dd89bca3e5b43da66cd110fd042e86df54..f559f05b38a7e3487f97f4b75fc30d2b07afaec9 100644 +index 7997568809d0224e5753c21bcfdf85afd36c98b9..d1b7d56fb68a3a250b5b9be5910602ba19be421e 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -146,6 +146,10 @@ if (!is_android && !is_mac) { diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch index 855e6e428de..2d7fd482f9a 100644 --- a/patches/chrome-android-BUILD.gn.patch +++ b/patches/chrome-android-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index bb74c9bc1e04e9e2f07af85c88d0107220555b3d..0d9176180b9707ad20593e56903d8119a01a1116 100644 +index d0aa1fa0fe90f763ebd777030eb3c6f7c6e745dc..8a06a00e65be1c05649f9b27895d6c4b9e10d24b 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -209,6 +209,7 @@ android_resources("chrome_app_java_resources") { +@@ -210,6 +210,7 @@ android_resources("chrome_app_java_resources") { "//third_party/android_deps:androidx_recyclerview_recyclerview_java", "//third_party/android_deps:material_design_java", ] @@ -10,7 +10,7 @@ index bb74c9bc1e04e9e2f07af85c88d0107220555b3d..0d9176180b9707ad20593e56903d8119 create_srcjar = false } -@@ -495,6 +496,7 @@ android_library("chrome_java") { +@@ -497,6 +498,7 @@ android_library("chrome_java") { ] deps += feed_deps @@ -18,7 +18,7 @@ index bb74c9bc1e04e9e2f07af85c88d0107220555b3d..0d9176180b9707ad20593e56903d8119 srcjar_deps = [ ":chrome_android_java_enums_srcjar", -@@ -529,6 +531,7 @@ android_library("chrome_java") { +@@ -531,6 +533,7 @@ android_library("chrome_java") { "//components/ui_metrics:ui_metrics_enums_java", "//net:effective_connection_type_java", ] @@ -26,15 +26,15 @@ index bb74c9bc1e04e9e2f07af85c88d0107220555b3d..0d9176180b9707ad20593e56903d8119 # From java_sources.gni. sources = chrome_java_sources + [ -@@ -654,6 +657,7 @@ group("jni_headers") { - "//chrome/browser/util:jni_headers", +@@ -655,6 +658,7 @@ group("jni_headers") { "//chrome/browser/webauthn/android:jni_headers", + "//components/media_router/browser/android:jni_headers", ] + public_deps += ["//brave/build/android:jni_headers"] } action("chrome_android_java_google_api_keys_srcjar") { -@@ -1724,6 +1728,7 @@ if (current_toolchain == default_toolchain) { +@@ -1726,6 +1730,7 @@ if (current_toolchain == default_toolchain) { ":${_variant}_locale_pak_assets", ":${_variant}_paks", ] diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index 017f82d3869..d63c2c9947c 100644 --- a/patches/chrome-android-chrome_java_sources.gni.patch +++ b/patches/chrome-android-chrome_java_sources.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni -index 921912c4b291c5d64efc5d520efe52ab527eed3b..ba84ef39c1f20f92e5e1432173507b57363d0cb3 100644 +index e7fe71f05e0867be88b8dda6cb1c5ba0c2c09f52..642fdd5f0fca210eceb52d414ac779d8fb7c36c9 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1725,3 +1725,4 @@ chrome_java_sources = [ +@@ -1708,3 +1708,4 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java", "java/src/org/chromium/chrome/browser/widget/DateDividedAdapter.java", ] diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index 02885fa7e2b..23bec8fd10d 100644 --- a/patches/chrome-android-java-AndroidManifest.xml.patch +++ b/patches/chrome-android-java-AndroidManifest.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml -index 7677b522a011df999cc610b870d77fa29282f670..1dcce1504b39f87dd51a7986c32b48b1d3f0ea24 100644 +index 3b1a51fe42f01e1c4d0c9b018c283675c2703106..bf977767a3f2d88099ce388332d836652945a297 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -34,7 +34,9 @@ by a child template that "extends" this file. @@ -62,7 +62,7 @@ index 7677b522a011df999cc610b870d77fa29282f670..1dcce1504b39f87dd51a7986c32b48b1 {% endif %} -@@ -1198,6 +1210,7 @@ by a child template that "extends" this file. +@@ -1203,6 +1215,7 @@ by a child template that "extends" this file. {% endif %} diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch index 68766c53b5c..bf52d067c4e 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java -index 5701d326c79c452900083c01a270cb33f37a7de9..25fdf32d78d076733b8652111cd3879ae064ae10 100644 +index 8e4cb23ad6a1949a9c5214de22db581fcfb15aaf..dc80294c0520741cdbfc72b17362874ffdfdea01 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java @@ -76,7 +76,7 @@ public abstract class AppHooks { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch index 0c0d62ee140..91b71845c72 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -index 9378c7896502f36fd50628747f713432d6155587..7bc5674368f8c45907cd12d3f7f77f6eb3aa6616 100644 +index 5af719f9bac15ce7dfbe992147a525630d80af80..734859067ee10c425cc7f74c4bf555acb409a4b5 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -182,7 +182,7 @@ import java.util.Locale; +@@ -181,7 +181,7 @@ import java.util.Locale; * This is the main activity for ChromeMobile when not running in document mode. All the tabs * are accessible via a chrome specific tab switching UI. */ @@ -11,7 +11,7 @@ index 9378c7896502f36fd50628747f713432d6155587..7bc5674368f8c45907cd12d3f7f77f6e implements ChromeAccessibilityUtil.Observer { private static final String TAG = "ChromeTabbedActivity"; -@@ -994,7 +994,7 @@ public class ChromeTabbedActivity extends ChromeActivity( @@ -20,7 +20,7 @@ index 9378c7896502f36fd50628747f713432d6155587..7bc5674368f8c45907cd12d3f7f77f6e assert profile != null : "Unexpectedly null profile from TabModel."; if (profile == null) return; -@@ -1588,7 +1588,7 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -324,7 +324,7 @@ public abstract class ChromeActivity NightModeReparentingController mNightModeReparentingController; protected ChromeActivity() { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-homepage-settings-HomepageSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-homepage-settings-HomepageSettings.java.patch index efeb7f4a492..2b9d0170724 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-homepage-settings-HomepageSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-homepage-settings-HomepageSettings.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java -index 4e2976d0345546ac528fe330f152cceb56a3ce57..0559583ed1ee26d440a89f0d87590e0ee8b2d9c2 100644 +index 156eea09b9e0cc894b4263826f54055184970791..b62852518ef915d435ec6712ec5c470640f87f01 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java -@@ -29,7 +29,7 @@ import org.chromium.components.url_formatter.UrlFormatter; +@@ -28,7 +28,7 @@ import org.chromium.components.url_formatter.UrlFormatter; /** * Fragment that allows the user to configure homepage related preferences. */ diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch index 03e40581d98..6275b0d22bc 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java -index 1569fda071165a5315a2dcfb6184290be116d633..0ca4847a7c406f1bc65f7fbce9deb8144935e777 100644 +index 80684745fece0d8c580bb3a78fb11e760e4790c5..723b0881594dcd0a3bb3a75d2398eb0f86cbcbc5 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java -@@ -61,7 +61,7 @@ import org.chromium.ui.vr.VrModeObserver; +@@ -58,7 +58,7 @@ import org.chromium.ui.vr.VrModeObserver; * Layout for the new tab page. This positions the page elements in the correct vertical positions. * There are no separate phone and tablet UIs; this layout adapts based on the available space. */ diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch index 89266d48d09..cdec34c4388 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java -index 0e12ac3d15bfcc4553425d5d505ac699ca2066e8..6d939e5be9a6f974214c51e557d019c118349058 100644 +index 3160cd7ad38a0b777dd17e7686ebeb25fc335d76..45e4e019e9b753175ce794426290b3b3aa980f5f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java @@ -78,7 +78,7 @@ public class AndroidSyncSettings { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-menu_button-MenuButtonCoordinator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-menu_button-MenuButtonCoordinator.java.patch index a2d583a94cb..4610464024a 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-menu_button-MenuButtonCoordinator.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-menu_button-MenuButtonCoordinator.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/menu_button/MenuButtonCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/menu_button/MenuButtonCoordinator.java -index 6930f24920771cc2a44a06a3c8b1de92891b180b..7eabd85fd6c000b2af763123e57da43b850951db 100644 +index 2d9b68296d598b723cd60f8b268f988bc2f79be8..dd5ced91b58503fc39f6e780025ebfdaced3bc3e 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/menu_button/MenuButtonCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/menu_button/MenuButtonCoordinator.java -@@ -236,6 +236,7 @@ public class MenuButtonCoordinator implements AppMenuObserver { +@@ -272,6 +272,7 @@ public class MenuButtonCoordinator implements AppMenuObserver { mAppMenuHandler = appMenuHandler; mAppMenuHandler.addObserver(this); mAppMenuButtonHelper = mAppMenuHandler.createAppMenuButtonHelper(); @@ -10,7 +10,7 @@ index 6930f24920771cc2a44a06a3c8b1de92891b180b..7eabd85fd6c000b2af763123e57da43b mAppMenuButtonHelper.setOnAppMenuShownListener( () -> { RecordUserAction.record("MobileToolbarShowMenu"); }); if (mMenuButton != null) { -@@ -275,4 +276,5 @@ public class MenuButtonCoordinator implements AppMenuObserver { +@@ -311,4 +312,5 @@ public class MenuButtonCoordinator implements AppMenuObserver { mMenuButton.removeAppMenuUpdateBadge(false); } } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-CustomTabToolbar.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-CustomTabToolbar.java.patch index 8ff63b53570..b0229e640e5 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-CustomTabToolbar.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-CustomTabToolbar.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/CustomTabToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/CustomTabToolbar.java -index 9fb5daea8fd9242d998a002f6f46b2299a68b424..9c9a28cca919e03544d19b11a717aad673325b26 100644 +index 28427567c273e5bc672912a3127cb9c0d7491d5c..355773204776bd413f477d2f137677ead5bf56c7 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/CustomTabToolbar.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/CustomTabToolbar.java -@@ -85,7 +85,7 @@ import java.util.regex.Pattern; +@@ -92,7 +92,7 @@ import java.util.regex.Pattern; /** * The Toolbar layout to be used for a custom tab. This is used for both phone and tablet UIs. */ diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index 8f2ff30efb5..f7e973b99f1 100644 --- a/patches/chrome-browser-BUILD.gn.patch +++ b/patches/chrome-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index d6b316a4e249033efc5c05416007b979895072af..456182bcedd9210b053357c2c4f379707c2ee95b 100644 +index 5bc9f9015a6249e62bdc3781fe065dd0551d48f5..f8e0b37764b9f6d72c95338b5527fe5ac87c6f00 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2189,6 +2189,7 @@ static_library("browser") { +@@ -2191,6 +2191,7 @@ static_library("browser") { "//ui/strings", "//ui/surface", "//ui/web_dialogs", diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index d1f115542e0..1ac35b9f1c2 100644 --- a/patches/chrome-browser-about_flags.cc.patch +++ b/patches/chrome-browser-about_flags.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index 78eedbcbf627a4bef171c8d4bc58e43ab64d22e3..9c4a79228e4e1d2639661f09e95f8c6f5c283758 100644 +index c476b77f26e7fb1d1284a70e67a8f8bfb8729070..7c5574b0458268119d85ff2d2d39a34ae806523b 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -294,14 +294,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { +@@ -293,14 +293,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { const FeatureEntry::Choice kTraceUploadURL[] = { {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, {flag_descriptions::kTraceUploadUrlChoiceOther, switches::kTraceUploadURL, @@ -21,7 +21,7 @@ index 78eedbcbf627a4bef171c8d4bc58e43ab64d22e3..9c4a79228e4e1d2639661f09e95f8c6f const FeatureEntry::Choice kPassiveListenersChoices[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -6454,6 +6454,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6400,6 +6400,7 @@ const FeatureEntry kFeatureEntries[] = { // "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag // Histograms" in tools/metrics/histograms/README.md (run the // AboutFlagsHistogramTest unit test to verify this process). diff --git a/patches/chrome-browser-chrome_content_browser_client.h.patch b/patches/chrome-browser-chrome_content_browser_client.h.patch index 55d41d09880..b9ff91d9a44 100644 --- a/patches/chrome-browser-chrome_content_browser_client.h.patch +++ b/patches/chrome-browser-chrome_content_browser_client.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h -index 972aff144bef92e9d20c3e5a1359328510da6ffe..7f75141d7368bfbdeda34a6ce7223cc9ae02b4c7 100644 +index 1f90198c6622259586da9d3cad3c0d60e7efef4c..35f23c004ecc75d3011de9c3a4c415f9c3e19534 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h -@@ -706,6 +706,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -709,6 +709,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { } private: diff --git a/patches/chrome-browser-extensions-extension_management.cc.patch b/patches/chrome-browser-extensions-extension_management.cc.patch index 7088fe65960..b2208a6e431 100644 --- a/patches/chrome-browser-extensions-extension_management.cc.patch +++ b/patches/chrome-browser-extensions-extension_management.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc -index c6a79618b181670418dd73ce3835bee40c95e6e2..eba30a7546933312033c0340ac38e2b8ef6d4e13 100644 +index 45300358307ddc086f175a8ef31f3dabfc79e85f..33a911a6defa8e5220b67d177196fcb00c15f46d 100644 --- a/chrome/browser/extensions/extension_management.cc +++ b/chrome/browser/extensions/extension_management.cc @@ -17,6 +17,7 @@ @@ -10,7 +10,7 @@ index c6a79618b181670418dd73ce3835bee40c95e6e2..eba30a7546933312033c0340ac38e2b8 #include "chrome/browser/extensions/extension_management_constants.h" #include "chrome/browser/extensions/extension_management_internal.h" #include "chrome/browser/extensions/external_policy_loader.h" -@@ -649,7 +650,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor( +@@ -661,7 +662,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { TRACE_EVENT0("browser,startup", "ExtensionManagementFactory::BuildServiceInstanceFor"); diff --git a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch index c3d9603997d..04cadbcf19e 100644 --- a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch +++ b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc -index 1b9f5eb0ca2377f4d8fa05d10adc2a28a2a1cffa..071f9d53661daccef39830c9ba2f7b754b1e81ed 100644 +index fc48bb2beae8a31be359362d63e4af9b48981b18..da80fb22a623c3cef4d22e6466392acbf70ba322 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -271,6 +271,7 @@ const base::Feature* kFeaturesExposedToJava[] = { +@@ -265,6 +265,7 @@ const base::Feature* kFeaturesExposedToJava[] = { }; const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) { diff --git a/patches/chrome-browser-media-webrtc-webrtc_log_uploader.cc.patch b/patches/chrome-browser-media-webrtc-webrtc_log_uploader.cc.patch index eda0db47663..ffbc900bd78 100644 --- a/patches/chrome-browser-media-webrtc-webrtc_log_uploader.cc.patch +++ b/patches/chrome-browser-media-webrtc-webrtc_log_uploader.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_log_uploader.cc -index b3d74a06e147477af30b63ecc9473bfafaff3198..ddb8bc84ffc35977c98e6e9b7ba4cc380f747815 100644 +index bd9dda865eaae624a665e2423013934ed4925771..e0cfa7dc44effca943d9d7530980be27d97e4471 100644 --- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc @@ -441,6 +441,7 @@ std::string WebRtcLogUploader::CompressLog(WebRtcLogBuffer* buffer) { diff --git a/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch b/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch index 3e4194a49e4..667b5a4f6cf 100644 --- a/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch +++ b/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/notifications/notification_platform_bridge_mac.mm b/chrome/browser/notifications/notification_platform_bridge_mac.mm -index ad52e63ed83a3a9e6a159d4475b2d2748d423d0e..a02cb828f86d224f4925a08ac569d340d967b823 100644 +index 1ff3b69f1b565a175baef6499aef151078da2e1e..dd050ef0ea37da14d7e97a5f77a4d95d02cc9aa2 100644 --- a/chrome/browser/notifications/notification_platform_bridge_mac.mm +++ b/chrome/browser/notifications/notification_platform_bridge_mac.mm -@@ -180,6 +180,7 @@ base::string16 CreateNotificationContext( +@@ -183,6 +183,7 @@ base::string16 CreateNotificationContext( // an expensive call. Instead use NotificationPlatformBridgeMac::SupportsAlerts // which caches this value. bool SupportsAlertsImpl() { @@ -10,7 +10,7 @@ index ad52e63ed83a3a9e6a159d4475b2d2748d423d0e..a02cb828f86d224f4925a08ac569d340 int32_t major, minor, bugfix; base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix); // Allow alerts on all versions except 10.15.0, 10.15.1 & 10.15.2. -@@ -317,6 +318,7 @@ void NotificationPlatformBridgeMac::Display( +@@ -323,6 +324,7 @@ void NotificationPlatformBridgeMac::Display( } else { NSUserNotification* toast = [builder buildUserNotification]; [notification_center_ deliverNotification:toast]; diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index 885f40e8de5..03d30877e56 100644 --- a/patches/chrome-browser-prefs-browser_prefs.cc.patch +++ b/patches/chrome-browser-prefs-browser_prefs.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc -index 95c645a8788331bbc4cfccd126edfda9906ca1c9..86b1101fadd2fff388fe90919ef081ad1998b5c2 100644 +index 016d4c9f0bfdc94fec7e61a0a7bf761e6f833981..6d2738a1cc2611191023467999e00a381dcf1440 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -719,6 +719,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -734,6 +734,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { #if defined(TOOLKIT_VIEWS) RegisterBrowserViewLocalPrefs(registry); #endif @@ -10,7 +10,7 @@ index 95c645a8788331bbc4cfccd126edfda9906ca1c9..86b1101fadd2fff388fe90919ef081ad // This is intentionally last. RegisterLocalStatePrefsForMigration(registry); -@@ -988,6 +989,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1003,6 +1004,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, #endif RegisterProfilePrefsForMigration(registry); diff --git a/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch b/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch index fe0a0750f61..ee97427a82e 100644 --- a/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch +++ b/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_avatar_icon_util.cc b/chrome/browser/profiles/profile_avatar_icon_util.cc -index 57cfedd8459f8fa80164b666c6d8b9be0bb044b1..85241ab48618f1a246c158ab06b4d7f024117b03 100644 +index 6d88545a52677d20fe988338d5535d2f32ef46d6..c08353e313788ae5b302b1b1fffbccbe31388d4a 100644 --- a/chrome/browser/profiles/profile_avatar_icon_util.cc +++ b/chrome/browser/profiles/profile_avatar_icon_util.cc -@@ -340,7 +340,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1; +@@ -333,7 +333,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1; #elif defined(OS_CHROMEOS) constexpr size_t kDefaultAvatarIconsCount = 27; #else @@ -11,7 +11,7 @@ index 57cfedd8459f8fa80164b666c6d8b9be0bb044b1..85241ab48618f1a246c158ab06b4d7f0 #endif #if !defined(OS_ANDROID) -@@ -470,6 +470,7 @@ size_t GetPlaceholderAvatarIndex() { +@@ -463,6 +463,7 @@ size_t GetPlaceholderAvatarIndex() { size_t GetModernAvatarIconStartIndex() { #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) @@ -19,7 +19,7 @@ index 57cfedd8459f8fa80164b666c6d8b9be0bb044b1..85241ab48618f1a246c158ab06b4d7f0 return GetPlaceholderAvatarIndex() + 1; #else // Only use the placeholder avatar on ChromeOS and Android. -@@ -503,6 +504,7 @@ std::string GetPlaceholderAvatarIconUrl() { +@@ -496,6 +497,7 @@ std::string GetPlaceholderAvatarIconUrl() { const IconResourceInfo* GetDefaultAvatarIconResourceInfo(size_t index) { CHECK_LT(index, kDefaultAvatarIconsCount); diff --git a/patches/chrome-browser-profiles-profile_manager.h.patch b/patches/chrome-browser-profiles-profile_manager.h.patch index 63f61c6b2f3..ccd501950b8 100644 --- a/patches/chrome-browser-profiles-profile_manager.h.patch +++ b/patches/chrome-browser-profiles-profile_manager.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h -index 1bb2d7aedf9f5f812bd28a4d5d404390f9adbce8..5ae7e698d54f2a733e3432960923a43c555f7cbf 100644 +index f27f42540638bb57848714dd33aafb8987cd28b6..02a3b4299a825332a2256ed552124b864a5fec7f 100644 --- a/chrome/browser/profiles/profile_manager.h +++ b/chrome/browser/profiles/profile_manager.h -@@ -271,6 +271,7 @@ class ProfileManager : public content::NotificationObserver, +@@ -265,6 +265,7 @@ class ProfileManager : public content::NotificationObserver, void set_do_final_services_init(bool do_final_services_init) { do_final_services_init_ = do_final_services_init; } diff --git a/patches/chrome-browser-profiles-profile_shortcut_manager_win.cc.patch b/patches/chrome-browser-profiles-profile_shortcut_manager_win.cc.patch index fcc3136659f..d78e07ae7db 100644 --- a/patches/chrome-browser-profiles-profile_shortcut_manager_win.cc.patch +++ b/patches/chrome-browser-profiles-profile_shortcut_manager_win.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.cc b/chrome/browser/profiles/profile_shortcut_manager_win.cc -index 51d0c3b3a858271b180a443ed0d91eafdf29f960..eb764258e6c61182a35654fe1c7a4a83d56b71a0 100644 +index 8aed937abc6ba6f95d6e0eeab7ea15554a92f329..2f0590cd09f66e2f7bf1b73ed8179aec1c448a7f 100644 --- a/chrome/browser/profiles/profile_shortcut_manager_win.cc +++ b/chrome/browser/profiles/profile_shortcut_manager_win.cc -@@ -746,7 +746,7 @@ bool ProfileShortcutManager::IsFeatureEnabled() { +@@ -744,7 +744,7 @@ bool ProfileShortcutManager::IsFeatureEnabled() { // static std::unique_ptr ProfileShortcutManager::Create( ProfileManager* manager) { diff --git a/patches/chrome-browser-resources-settings-route.js.patch b/patches/chrome-browser-resources-settings-route.js.patch index f789a7954af..ca9a8976cf2 100644 --- a/patches/chrome-browser-resources-settings-route.js.patch +++ b/patches/chrome-browser-resources-settings-route.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/route.js b/chrome/browser/resources/settings/route.js -index 162b5ec9f9d6451a6723d10e96f71ac94622729f..8f0463b5d35670b01c34190fe5f1a8e7d2c2174f 100644 +index 8f61f71e589efba60c146ef60bd191133948e4d6..9df7f236e4a10f2c952c8d6d965e11158837927e 100644 --- a/chrome/browser/resources/settings/route.js +++ b/chrome/browser/resources/settings/route.js @@ -34,7 +34,9 @@ function addPrivacyChildRoutes(r) { @@ -12,7 +12,7 @@ index 162b5ec9f9d6451a6723d10e96f71ac94622729f..8f0463b5d35670b01c34190fe5f1a8e7 r.SITE_SETTINGS_AR = r.SITE_SETTINGS.createChild('ar'); r.SITE_SETTINGS_AUTOMATIC_DOWNLOADS = r.SITE_SETTINGS.createChild('automaticDownloads'); -@@ -181,7 +183,9 @@ function createBrowserSettingsRoutes() { +@@ -178,7 +180,9 @@ function createBrowserSettingsRoutes() { } r.PRINTING = r.ADVANCED.createSection('/printing', 'printing'); diff --git a/patches/chrome-browser-resources-settings-settings.js.patch b/patches/chrome-browser-resources-settings-settings.js.patch index c43135e9eb8..955585ebe31 100644 --- a/patches/chrome-browser-resources-settings-settings.js.patch +++ b/patches/chrome-browser-resources-settings-settings.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/settings.js b/chrome/browser/resources/settings/settings.js -index 7de9664f61b6bb1fd62ed4022d061d1d96163bff..97eeb5caa6d466a0a88b13f6c4d68ccea07b29f6 100644 +index e542cb1c9dd347c14fa59a3445102f6d42984b51..8542600fe591b029d8069b42c21d6522e138f0ad 100644 --- a/chrome/browser/resources/settings/settings.js +++ b/chrome/browser/resources/settings/settings.js @@ -2,6 +2,7 @@ diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index a167b6a4432..3fb03f9e9f9 100644 --- a/patches/chrome-browser-ui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-BUILD.gn.patch @@ -1,16 +1,16 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn -index 6c3d94a49aedbc07ad88e2cfeb87240a848f9cbd..8fb5c20ce63102a01d3e8136d1a75681267d3658 100644 +index 4f610894b2c42ffbfc667c96ddb5dcbea81b1877..9809e22d15d980910c1631581cc4bef6caf79465 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -590,6 +590,7 @@ static_library("ui") { - "//ui/webui", +@@ -591,6 +591,7 @@ static_library("ui") { + "//ui/webui/resources/cr_components/customize_themes:mojom", "//v8:v8_version", ] + deps+= [ "//brave/browser/ui" ] allow_circular_includes_from += [ "//chrome/browser/ui/webui/bluetooth_internals" ] -@@ -3126,10 +3127,13 @@ static_library("ui") { +@@ -3130,10 +3131,13 @@ static_library("ui") { ] deps += [ "//google_update" ] } else { diff --git a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch index 4471c4b5fe7..5b03215a662 100644 --- a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch +++ b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -index baee6546523bcbe6e0602775d58d54c22b5500ac..d0062665c076080bcdc4d165a87d957b96c2bb10 100644 +index 47ddd90ab37cd6d1d59b59380bf49ec476efda1a..555b153fe5ff68a0e144fc39f4544659ccb50958 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc @@ -666,6 +666,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch( diff --git a/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch b/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch index 8c15ea3e569..528f109fb37 100644 --- a/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch +++ b/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/profiles/profile_menu_view_base.h b/chrome/browser/ui/views/profiles/profile_menu_view_base.h -index 045c45d88095bdd772e2b67aaba100f2c788fa0f..ce9cac96174bf99f1a33490bc262859cca612df0 100644 +index e4cf1181d859b21cc235dd561f99ae3e1c21939d..21b4aa9bfcd262130d48e42da06ae9449257a986 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_view_base.h +++ b/chrome/browser/ui/views/profiles/profile_menu_view_base.h -@@ -170,6 +170,7 @@ class ProfileMenuViewBase : public content::WebContentsDelegate, +@@ -168,6 +168,7 @@ class ProfileMenuViewBase : public content::WebContentsDelegate, void set_perform_menu_actions_for_testing(bool perform_menu_actions) { perform_menu_actions_ = perform_menu_actions; } diff --git a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch index 1e56564462d..f211e085252 100644 --- a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch +++ b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc -index f69ad82885c4dd582895896983930bda3331be35..1cb71f892c156563810b330a783d0e208c9eb0f6 100644 +index 2f91f263187145f19ab03d8cb68169cbbffdb27b..2a66a0591e0200c91e0132db52066ce1045ae3dd 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc @@ -275,7 +275,7 @@ void ToolbarView::Init() { diff --git a/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch b/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch index 14803626976..c65bc7a61ce 100644 --- a/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch +++ b/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.cc b/chrome/browser/ui/views/translate/translate_bubble_view.cc -index aef57f393cce4622dcc7a7f8cfc0ca2327a921e5..599ceaf1b45a8fe175edeb36fd3452d480f2e2ec 100644 +index a8152b0e02ed5371be13465e3f97830aee673d41..626f32fb0d45caec898fe8564dc1c41573f95660 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_view.cc +++ b/chrome/browser/ui/views/translate/translate_bubble_view.cc @@ -175,7 +175,7 @@ views::Widget* TranslateBubbleView::ShowBubble( diff --git a/patches/chrome-browser-ui-views-translate-translate_bubble_view.h.patch b/patches/chrome-browser-ui-views-translate-translate_bubble_view.h.patch index 347cb0f2025..ccff80b3a34 100644 --- a/patches/chrome-browser-ui-views-translate-translate_bubble_view.h.patch +++ b/patches/chrome-browser-ui-views-translate-translate_bubble_view.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.h b/chrome/browser/ui/views/translate/translate_bubble_view.h -index 476617654d18f5ff311b7429d68806887ba256ab..f2d21c6d1d3b4e980dc96dc0c80625dc5cbcd3a1 100644 +index e328162d034f60918bc51b251199bc59d1c2c9eb..cf8258b887431807c7471574074388bde7ee4760 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_view.h +++ b/chrome/browser/ui/views/translate/translate_bubble_view.h -@@ -104,6 +104,7 @@ class TranslateBubbleView : public LocationBarBubbleDelegateView, +@@ -102,6 +102,7 @@ class TranslateBubbleView : public LocationBarBubbleDelegateView, // Returns the current view state. TranslateBubbleModel::ViewState GetViewState() const; diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index 13c40946558..b5e81ac7231 100644 --- a/patches/chrome-test-BUILD.gn.patch +++ b/patches/chrome-test-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index f0df7f5a110e51f4e40e8cb4a47ff41445029d76..90ecc12d40e7d64365049c7bb6a7f7dc769a8dc3 100644 +index 7429f324e6e856eaa8caf06999f483de3d2b6e4e..1f935c123c49d82bec9b1f40ac3e5b0e87d72e66 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -802,6 +802,7 @@ if (!is_android) { +@@ -806,6 +806,7 @@ if (!is_android) { "//v8", ] diff --git a/patches/chrome-utility-importer-safari_importer.h.patch b/patches/chrome-utility-importer-safari_importer.h.patch index 67c361902be..0a1f82fd301 100644 --- a/patches/chrome-utility-importer-safari_importer.h.patch +++ b/patches/chrome-utility-importer-safari_importer.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/utility/importer/safari_importer.h b/chrome/utility/importer/safari_importer.h -index 1b585ea85dd695087f492224bab18056188371e7..1ea2a602771b7a9718378e05228d0a8cc3edd88d 100644 +index 1891fa3eff16f4e7b8f0821bc9f793c5e00514f7..89bce81bbc3d2f682adb3aacd888ac29f6d06e74 100644 --- a/chrome/utility/importer/safari_importer.h +++ b/chrome/utility/importer/safari_importer.h @@ -46,6 +46,7 @@ class SafariImporter : public Importer { diff --git a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch index bddbdf99516..81ca65da2f4 100644 --- a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch +++ b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch @@ -1,5 +1,5 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java -index d41bf22f6d53a54d44a2c1dd7c279f9d6c368034..c17dae61774c2d3a3bf8535da71581cd07ebf7be 100644 +index 2d8dce05a67a7df3d8e83465ff7df2124e89659b..fae600026640d7a36cab7494263d66b239d911e2 100644 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java @@ -394,7 +394,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment diff --git a/patches/components-content_settings-renderer-content_settings_agent_impl.cc.patch b/patches/components-content_settings-renderer-content_settings_agent_impl.cc.patch index 7d83f839ccc..6e19493aacd 100644 --- a/patches/components-content_settings-renderer-content_settings_agent_impl.cc.patch +++ b/patches/components-content_settings-renderer-content_settings_agent_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc b/components/content_settings/renderer/content_settings_agent_impl.cc -index 450005f9fc0b4378da7f21731f2722565cf011ad..87ffeec0fb72d5a4a360a661c19cd9c760538bcc 100644 +index 370251296f0b21a0605b03452a239535f38ffb4c..a2f035c705225809f8c003276f0c6e72bf565c58 100644 --- a/components/content_settings/renderer/content_settings_agent_impl.cc +++ b/components/content_settings/renderer/content_settings_agent_impl.cc -@@ -468,6 +468,7 @@ bool ContentSettingsAgentImpl::IsWhitelistedForContentSettings() const { +@@ -486,6 +486,7 @@ bool ContentSettingsAgentImpl::IsWhitelistedForContentSettings() const { const WebDocument& document = render_frame()->GetWebFrame()->GetDocument(); WebSecurityOrigin origin = document.GetSecurityOrigin(); WebURL document_url = document.Url(); diff --git a/patches/components-content_settings-renderer-content_settings_agent_impl.h.patch b/patches/components-content_settings-renderer-content_settings_agent_impl.h.patch index d45170f1f6d..7ab9a79ed54 100644 --- a/patches/components-content_settings-renderer-content_settings_agent_impl.h.patch +++ b/patches/components-content_settings-renderer-content_settings_agent_impl.h.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.h b/components/content_settings/renderer/content_settings_agent_impl.h -index 7dd094e9329cff4cdac570f34fd3991320dbadce..5c75b519ef3dbb631ccd5da4f1a0f38fa366cdd2 100644 +index e6f97a1ebb4d706c9b113da8f8d799cd668c7efd..d5fa4f8628cefc143c0f78340f7e03bc6d1cf225 100644 --- a/components/content_settings/renderer/content_settings_agent_impl.h +++ b/components/content_settings/renderer/content_settings_agent_impl.h -@@ -117,6 +117,7 @@ class ContentSettingsAgentImpl +@@ -118,6 +118,7 @@ class ContentSettingsAgentImpl const blink::WebFrame* frame, const blink::WebURL& secondary_url); diff --git a/patches/components-omnibox-browser-BUILD.gn.patch b/patches/components-omnibox-browser-BUILD.gn.patch index 3cdb817ba09..efd7e1c4778 100644 --- a/patches/components-omnibox-browser-BUILD.gn.patch +++ b/patches/components-omnibox-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn -index 4764157e3a0f6f1b98d90347e9bdd0b9b2d348db..b142e6a5b9cdb57c574396d80bbd28d46f4c4788 100644 +index 4a0d2e8f91136ef9c263f1634d54f1d183d62dcf..3f0ce951fbd82d778eeaf95ca9cf67fc39de1850 100644 --- a/components/omnibox/browser/BUILD.gn +++ b/components/omnibox/browser/BUILD.gn -@@ -251,6 +251,7 @@ static_library("browser") { +@@ -253,6 +253,7 @@ static_library("browser") { "//ui/base", "//ui/gfx", ] diff --git a/patches/components-omnibox-browser-autocomplete_controller.cc.patch b/patches/components-omnibox-browser-autocomplete_controller.cc.patch index 35c96905f9f..367a025069c 100644 --- a/patches/components-omnibox-browser-autocomplete_controller.cc.patch +++ b/patches/components-omnibox-browser-autocomplete_controller.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc -index 56dc1412e9797dac9258f8b9c1e745aaae4d6eb6..aa22c1fa5e4f536a7167f8c20d22628e36267c54 100644 +index 95f686586eda32edf0868774f9568dfaa4b33338..61c7c72e69c64bd380ee50190a503480afe22956 100644 --- a/components/omnibox/browser/autocomplete_controller.cc +++ b/components/omnibox/browser/autocomplete_controller.cc @@ -261,6 +261,7 @@ AutocompleteController::AutocompleteController( diff --git a/patches/components-page_info-BUILD.gn.patch b/patches/components-page_info-BUILD.gn.patch index d0e8f47623b..5e23d62e5ad 100644 --- a/patches/components-page_info-BUILD.gn.patch +++ b/patches/components-page_info-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/page_info/BUILD.gn b/components/page_info/BUILD.gn -index 8f6fbc29e086c4c33626552c2f5d9caa18a0c35c..cf29aa2ea6bf4ccb0040ce7f584775e7841667e6 100644 +index 102b85b1bca45815426cee755c13a13674a52caa..59ffb14e2e9738c2e7dd6176643dc8e55d900c77 100644 --- a/components/page_info/BUILD.gn +++ b/components/page_info/BUILD.gn -@@ -39,6 +39,7 @@ static_library("page_info") { +@@ -41,6 +41,7 @@ static_library("page_info") { "//services/device/public/cpp:device_features", "//services/metrics/public/cpp:ukm_builders", ] diff --git a/patches/components-password_manager-core-browser-login_database.cc.patch b/patches/components-password_manager-core-browser-login_database.cc.patch index 84de50a26ad..5d6d57c4a36 100644 --- a/patches/components-password_manager-core-browser-login_database.cc.patch +++ b/patches/components-password_manager-core-browser-login_database.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/password_manager/core/browser/login_database.cc b/components/password_manager/core/browser/login_database.cc -index 13de006427b84c50ee72d7b2baff29ad946fa949..6b77a687727d94c164129f92cc956149f33ac153 100644 +index 140a1bdf4b9080dbb2c26ed5c5f75b4373418c74..7e157a0d269010d21529714ca5dd436798250b5b 100644 --- a/components/password_manager/core/browser/login_database.cc +++ b/components/password_manager/core/browser/login_database.cc -@@ -1968,6 +1968,7 @@ FormRetrievalResult LoginDatabase::StatementToForms( +@@ -1970,6 +1970,7 @@ FormRetrievalResult LoginDatabase::StatementToForms( EncryptionResult result = InitPasswordFormFromStatement( *statement, /*decrypt_and_fill_password_value=*/true, &primary_key, new_form.get()); diff --git a/patches/components-policy-tools-generate_policy_source.py.patch b/patches/components-policy-tools-generate_policy_source.py.patch index b221fb8be4b..2ce3025f405 100644 --- a/patches/components-policy-tools-generate_policy_source.py.patch +++ b/patches/components-policy-tools-generate_policy_source.py.patch @@ -1,5 +1,5 @@ diff --git a/components/policy/tools/generate_policy_source.py b/components/policy/tools/generate_policy_source.py -index f6056e1cef74ed3048c19dd10a4cc2590ce866fd..cc5ef772ed7bf38a710f8c102fab95f830861b07 100755 +index d9beb4d9c29eb14fabd213d97805144cc6d30375..b5e91b5fa90a3e42fa840b08f816c6b002da1cb3 100755 --- a/components/policy/tools/generate_policy_source.py +++ b/components/policy/tools/generate_policy_source.py @@ -42,6 +42,7 @@ PLATFORM_STRINGS = { diff --git a/patches/components-sync-driver-profile_sync_service.h.patch b/patches/components-sync-driver-profile_sync_service.h.patch index 4c81f7f5d69..a5f8a414670 100644 --- a/patches/components-sync-driver-profile_sync_service.h.patch +++ b/patches/components-sync-driver-profile_sync_service.h.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/driver/profile_sync_service.h b/components/sync/driver/profile_sync_service.h -index dc38a8848926d8481d39e2164025950d8217fbf2..a5e2747499fe942a20aa5f73f18a798262c89fca 100644 +index 475bd2f73eb88a007f5792b7052f0eca175088c0..f468fcbd303b26244cfc98a11edac427d984d382 100644 --- a/components/sync/driver/profile_sync_service.h +++ b/components/sync/driver/profile_sync_service.h -@@ -246,6 +246,7 @@ class ProfileSyncService : public SyncService, +@@ -257,6 +257,7 @@ class ProfileSyncService : public SyncService, static std::string GenerateCacheGUIDForTest(); diff --git a/patches/content-common-BUILD.gn.patch b/patches/content-common-BUILD.gn.patch index 2026b937469..e37a68de6d3 100644 --- a/patches/content-common-BUILD.gn.patch +++ b/patches/content-common-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn -index e95a3d0574dae89852ec25407bd56b338b8ce956..d41d60c186391a3312912ec990d08bb04d3ac93d 100644 +index 8f47984d72b93e5178ec93a68711f03d6eca3cdb..651c62a7a283a3fd97d656971777c4e083479d1d 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -37,6 +37,7 @@ source_set("common") { diff --git a/patches/content-public-browser-content_browser_client.h.patch b/patches/content-public-browser-content_browser_client.h.patch index 69f2aa03b75..ba147d26fdb 100644 --- a/patches/content-public-browser-content_browser_client.h.patch +++ b/patches/content-public-browser-content_browser_client.h.patch @@ -1,8 +1,8 @@ diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 754d7efda808d8d45728476a1c5072e90a504909..55a2fff72041c8818170e930463b56b149b77e62 100644 +index 718fc096bd1087ef89d599f572abe20d4173a41c..9e8e5f04d4ccdf43a25723e46e4d3db12c262c5c 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -1785,6 +1785,7 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1788,6 +1788,7 @@ class CONTENT_EXPORT ContentBrowserClient { virtual ui::AXMode GetAXModeForBrowserContext( BrowserContext* browser_context); diff --git a/patches/media-blink-key_system_config_selector.cc.patch b/patches/media-blink-key_system_config_selector.cc.patch index b8a484caffa..489f8bfcdc9 100644 --- a/patches/media-blink-key_system_config_selector.cc.patch +++ b/patches/media-blink-key_system_config_selector.cc.patch @@ -1,12 +1,12 @@ diff --git a/media/blink/key_system_config_selector.cc b/media/blink/key_system_config_selector.cc -index 096a6d98d3979bfd5c802b5f86ea0c982258b7a8..8fc413f7ec64ae469a59b94e12a34b3f58a1d2c4 100644 +index 9004970d84eff9d12fbcb45754f1e70b4ca5355c..c8344783b72e4217a5ee9b968ed3f9cb1d96399c 100644 --- a/media/blink/key_system_config_selector.cc +++ b/media/blink/key_system_config_selector.cc -@@ -912,6 +912,7 @@ void KeySystemConfigSelector::SelectConfig( +@@ -907,6 +907,7 @@ void KeySystemConfigSelector::SelectConfig( key_systems_->UpdateIfNeeded(); + KeySystems::GetInstance(); std::string key_system_ascii = key_system.Ascii(); if (!key_systems_->IsSupportedKeySystem(key_system_ascii)) { - std::move(not_supported_cb).Run(); + std::move(cb).Run(Status::kUnsupportedKeySystem, nullptr, nullptr); diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch index 4b659f94bf0..71ca0870d96 100644 --- a/patches/net-BUILD.gn.patch +++ b/patches/net-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn -index c46b8c6803598fdad5e2dd507ef26055657a601b..900ac6f5bc45574306f154192c522e0b0720386c 100644 +index adc6d76a2dbc76d86692b177d711eaa6e66e7b5e..9a1223a0df6feb8bf72714455cbca0e2bd8653f3 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1184,6 +1184,7 @@ component("net") { +@@ -1182,6 +1182,7 @@ component("net") { "reporting/reporting_uploader.h", ] } diff --git a/patches/services-network-public-cpp-BUILD.gn.patch b/patches/services-network-public-cpp-BUILD.gn.patch index e3195aa62c8..a6054d4f632 100644 --- a/patches/services-network-public-cpp-BUILD.gn.patch +++ b/patches/services-network-public-cpp-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/services/network/public/cpp/BUILD.gn b/services/network/public/cpp/BUILD.gn -index 039da2fdc70c7fd5920b8a0f88514950af158356..4371795d51176a5ec18232cc4f976a152ee1f08d 100644 +index cc148fc2e8f9f896876f0cc0fae75d00c340d621..f332229d01e6d541dd4d713db525dfb996a9ddaa 100644 --- a/services/network/public/cpp/BUILD.gn +++ b/services/network/public/cpp/BUILD.gn -@@ -147,6 +147,7 @@ component("cpp") { +@@ -146,6 +146,7 @@ component("cpp") { "//services/proxy_resolver/public/mojom", ] diff --git a/patches/third_party-blink-renderer-core-BUILD.gn.patch b/patches/third_party-blink-renderer-core-BUILD.gn.patch index e81e580376a..0c365725e8b 100644 --- a/patches/third_party-blink-renderer-core-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-core-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn -index 0c962124e7dfb868f10ae3dce73caf814137d415..7e141b2265e67c663396c34a400ec4a8e065ba0e 100644 +index 1301aa2ad8d14962bb0caeaffcd6b31aed7f4bc0..1f0908040fafe677de9ccb716ab71a84be5d01e6 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn -@@ -122,6 +122,7 @@ component("core") { +@@ -126,6 +126,7 @@ component("core") { visibility = [] # Allow re-assignment of list. visibility = [ "//third_party/blink/*" ] @@ -10,7 +10,7 @@ index 0c962124e7dfb868f10ae3dce73caf814137d415..7e141b2265e67c663396c34a400ec4a8 # If you create a new subdirectory, make a new BUILD file for that directory # and reference it in the deps below rather than adding the sources here. -@@ -194,6 +195,7 @@ component("core") { +@@ -197,6 +198,7 @@ component("core") { "//url", "//v8", ] diff --git a/patches/third_party-blink-renderer-core-dom-document.cc.patch b/patches/third_party-blink-renderer-core-dom-document.cc.patch index 3929f06e8c4..7b5aeb2460a 100644 --- a/patches/third_party-blink-renderer-core-dom-document.cc.patch +++ b/patches/third_party-blink-renderer-core-dom-document.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc -index 01f4b1d7ffe928126be221ff39715d1c0e6ae849..5c0f9a34f1337e2848345db63ef306b71b38a044 100644 +index addb2d72ece5d65a9c17bab67297c3e2a251bba7..f2ac4689046610912ca60e4e29e5c1add06b003d 100644 --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc @@ -33,7 +33,7 @@ diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch index 9f4407bc5a6..1c78061681d 100644 --- a/patches/third_party-blink-renderer-modules-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-modules-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn -index 9c1514f80fcbc8b897e043e48576276edbc1749d..cc76ae7e3d6ee56ecf7dde201da8e2027bdabc96 100644 +index f3641ca8328feb847cc4f94acd9c46ecbdda9407..07ba7e5f77f839f964e1d215ebbb5f4134ee3d8e 100644 --- a/third_party/blink/renderer/modules/BUILD.gn +++ b/third_party/blink/renderer/modules/BUILD.gn @@ -16,6 +16,7 @@ if (is_android) { @@ -17,4 +17,4 @@ index 9c1514f80fcbc8b897e043e48576276edbc1749d..cc76ae7e3d6ee56ecf7dde201da8e202 + sub_modules += brave_blink_sub_modules if (is_android) { sub_modules += [ "//third_party/blink/renderer/modules/remote_objects" ] - } + } else { diff --git a/patches/third_party-blink-renderer-modules-cookie_store-cookie_store.cc.patch b/patches/third_party-blink-renderer-modules-cookie_store-cookie_store.cc.patch index 6b60f798e31..910c27481f4 100644 --- a/patches/third_party-blink-renderer-modules-cookie_store-cookie_store.cc.patch +++ b/patches/third_party-blink-renderer-modules-cookie_store-cookie_store.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/cookie_store/cookie_store.cc b/third_party/blink/renderer/modules/cookie_store/cookie_store.cc -index ae1bd6304e44677e05a310adc4bab66446a381af..3232d69b3ef61fef326c84bc1bd8a5e85c1ed73f 100644 +index 0e8354b706b594d67dbc68f1a147a2206f13f559..abe03c13e11f99cd11a3575f7dfb7c903f7dd1c8 100644 --- a/third_party/blink/renderer/modules/cookie_store/cookie_store.cc +++ b/third_party/blink/renderer/modules/cookie_store/cookie_store.cc -@@ -86,6 +86,7 @@ base::Optional ToCanonicalCookie( +@@ -80,6 +80,7 @@ base::Optional ToCanonicalCookie( base::Time expires = options->hasExpiresNonNull() ? base::Time::FromJavaTime(options->expiresNonNull()) : base::Time(); diff --git a/patches/tools-metrics-histograms-histograms.xml.patch b/patches/tools-metrics-histograms-histograms.xml.patch index 0ad32cbf43a..b7cc6c8ab0e 100644 --- a/patches/tools-metrics-histograms-histograms.xml.patch +++ b/patches/tools-metrics-histograms-histograms.xml.patch @@ -1,8 +1,8 @@ diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml -index fce98645a6cc679823a3422ed3d5a6cb34b8d5dc..c4a5a4f299dfdcba2d936e474be0c4bc10e8b19c 100644 +index 305e198790e8fbf92fc6dc982fe2f087d75e2418..6a53dd324f8dd2a5be6ff56c64c665232cabdcf3 100644 --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml -@@ -213888,6 +213888,7 @@ regressions. --> +@@ -214162,6 +214162,7 @@ regressions. -->