From 65b9ce098ee321cd9be1f75ce607dfa5d3c72f2d Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 17 Mar 2022 11:44:57 +0100 Subject: [PATCH] Conflict-resolved patches from Chromium 100.0.4896.127 to Chromium 101.0.4919.0. --- patches/chrome-VERSION.patch | 8 ++++---- ...-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch | 8 ++++---- ...r-ui-webui-settings-site_settings_helper.cc.patch | 6 +++--- patches/net-socket-socks5_client_socket.cc.patch | 12 ++++++------ 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index ce8eee0da76..2192ac0dd32 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 92d6b0811a2a6365a136edff1588150602966d9f..8718ba91673566dbbac254e2162516952c707031 100644 +index 5019a18ddae540d79df1aa9015537cf0f0fe8bc8..f61dc38bd01d424cb0d7c9863051f2bd28f64abc 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ - MAJOR=100 + MAJOR=101 -MINOR=0 --BUILD=4896 --PATCH=127 +-BUILD=4919 +-PATCH=0 +MINOR=1 +BUILD=39 +PATCH=63 diff --git a/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch b/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch index 2ceb573adf9..aeab2c19f1e 100644 --- a/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch @@ -1,10 +1,10 @@ diff --git a/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc b/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc -index 4a3c4f3cb08546bac4be19a177c704857ea26a75..169ae2c575c4de0ae53f3dc63c5c9c987901274e 100644 +index c234ee2b112b86d756f276fe461af9d3469d34f7..0e2fbd48acc7576f932652794c1162a3a1d4b1f8 100644 --- a/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc +++ b/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc -@@ -132,6 +132,7 @@ content::WebUIDataSource* CreateBookmarksUIHTMLSource(Profile* profile) { - // need this attribute. - source->AddString("enableBrandingUpdateAttribute", "enable-branding-update"); +@@ -128,6 +128,7 @@ content::WebUIDataSource* CreateBookmarksUIHTMLSource(Profile* profile) { + for (const auto& str : kStrings) + AddLocalizedString(source, str.name, str.id); + BRAVE_CREATE_BOOKMARKS_UI_HTML_SOURCE return source; diff --git a/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch b/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch index 99e610c1d39..d60c51aeb0a 100644 --- a/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc -index 4313cfe4973f173e6796203d864fa657760be58d..36e7ac4d02e43eef3ea45c17a7bf3fa3ed2d7184 100644 +index afec15076eb11742fe5221269dbd4fc85413a447..822a2317d0491334fe43d625820daa7a5582a576 100644 --- a/chrome/browser/ui/webui/settings/site_settings_helper.cc +++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc @@ -167,6 +167,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = { @@ -9,12 +9,12 @@ index 4313cfe4973f173e6796203d864fa657760be58d..36e7ac4d02e43eef3ea45c17a7bf3fa3 + BRAVE_CONTENT_SETTINGS_TYPE_GROUP_NAMES_LIST }; - static_assert(base::size(kContentSettingsTypeGroupNames) == + static_assert(std::size(kContentSettingsTypeGroupNames) == @@ -391,6 +392,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) { } ContentSettingsType ContentSettingsTypeFromGroupName(base::StringPiece name) { + BRAVE_SITE_SETTINGS_HELPER_CONTENT_SETTINGS_TYPE_FROM_GROUP_NAME - for (size_t i = 0; i < base::size(kContentSettingsTypeGroupNames); ++i) { + for (size_t i = 0; i < std::size(kContentSettingsTypeGroupNames); ++i) { if (name == kContentSettingsTypeGroupNames[i].name) return kContentSettingsTypeGroupNames[i].type; diff --git a/patches/net-socket-socks5_client_socket.cc.patch b/patches/net-socket-socks5_client_socket.cc.patch index d30e8b893cc..c0d96bf1456 100644 --- a/patches/net-socket-socks5_client_socket.cc.patch +++ b/patches/net-socket-socks5_client_socket.cc.patch @@ -1,8 +1,8 @@ diff --git a/net/socket/socks5_client_socket.cc b/net/socket/socks5_client_socket.cc -index 0390ad8c2cf484b9f80e9237259aab8ee2c75642..0286937c6c60c97e9aae6fbc1467347ca59fd115 100644 +index eeee9a39b321043327e4e931486de424be42f4e9..a59ac2bd456a02ab5612b2be0eacf0c6d2f35394 100644 --- a/net/socket/socks5_client_socket.cc +++ b/net/socket/socks5_client_socket.cc -@@ -239,6 +239,9 @@ int SOCKS5ClientSocket::DoLoop(int last_io_result) { +@@ -238,6 +238,9 @@ int SOCKS5ClientSocket::DoLoop(int last_io_result) { net_log_.EndEventWithNetErrorCode(NetLogEventType::SOCKS5_GREET_READ, rv); break; @@ -12,7 +12,7 @@ index 0390ad8c2cf484b9f80e9237259aab8ee2c75642..0286937c6c60c97e9aae6fbc1467347c case STATE_HANDSHAKE_WRITE: DCHECK_EQ(OK, rv); net_log_.BeginEvent(NetLogEventType::SOCKS5_HANDSHAKE_WRITE); -@@ -268,8 +271,6 @@ int SOCKS5ClientSocket::DoLoop(int last_io_result) { +@@ -267,8 +270,6 @@ int SOCKS5ClientSocket::DoLoop(int last_io_result) { return rv; } @@ -21,12 +21,12 @@ index 0390ad8c2cf484b9f80e9237259aab8ee2c75642..0286937c6c60c97e9aae6fbc1467347c int SOCKS5ClientSocket::DoGreetWrite() { // Since we only have 1 byte to send the hostname length in, if the // URL has a hostname longer than 255 characters we can't send it. -@@ -279,8 +280,12 @@ int SOCKS5ClientSocket::DoGreetWrite() { +@@ -278,8 +279,12 @@ int SOCKS5ClientSocket::DoGreetWrite() { } if (buffer_.empty()) { - buffer_ = -- std::string(kSOCKS5GreetWriteData, base::size(kSOCKS5GreetWriteData)); +- std::string(kSOCKS5GreetWriteData, std::size(kSOCKS5GreetWriteData)); + const char greeting[] = { + 0x05, // SOCKS version + 0x01, // number of authentication methods @@ -36,7 +36,7 @@ index 0390ad8c2cf484b9f80e9237259aab8ee2c75642..0286937c6c60c97e9aae6fbc1467347c bytes_sent_ = 0; } -@@ -339,14 +344,14 @@ int SOCKS5ClientSocket::DoGreetReadComplete(int result) { +@@ -338,14 +343,14 @@ int SOCKS5ClientSocket::DoGreetReadComplete(int result) { "version", buffer_[0]); return ERR_SOCKS_CONNECTION_FAILED; }