From 0842c9b4068bd3e8ec44da06fc5b59ea0fd0c4ec Mon Sep 17 00:00:00 2001 From: Dmitrii Pichulin Date: Wed, 6 Dec 2023 03:07:52 +0300 Subject: [PATCH] adopt patches --- patch/boringssl.patch | 32 ++++++++--------- patch/bubble.patch | 38 ++++++++++---------- patch/chromium.patch | 84 +++++++++++++++++++++---------------------- 3 files changed, 77 insertions(+), 77 deletions(-) diff --git a/patch/boringssl.patch b/patch/boringssl.patch index 334f00a..f7c1924 100644 --- a/patch/boringssl.patch +++ b/patch/boringssl.patch @@ -1,4 +1,4 @@ -From a43e127543aa667fd60df9ec2a63f0f954488644 Mon Sep 17 00:00:00 2001 +From 46e52c83742905e3a6dadcbbc3d8f8ef334c7334 Mon Sep 17 00:00:00 2001 From: Dmitrii Pichulin Date: Fri, 14 Jul 2023 15:32:39 +0300 Subject: [PATCH] boringssl GOSTSSL @@ -15,10 +15,10 @@ Subject: [PATCH] boringssl GOSTSSL 8 files changed, 513 insertions(+) diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h -index f8f696b8d..ad3dadd6c 100644 +index e500dd76e..e6c0b9c80 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h -@@ -5589,6 +5589,11 @@ BSSL_NAMESPACE_END +@@ -5620,6 +5620,11 @@ BSSL_NAMESPACE_END #endif @@ -31,7 +31,7 @@ index f8f696b8d..ad3dadd6c 100644 #define SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT 101 #define SSL_R_BAD_ALERT 102 diff --git a/ssl/extensions.cc b/ssl/extensions.cc -index c5b1ed143..a005303e6 100644 +index b13400097..bc2eb0901 100644 --- a/ssl/extensions.cc +++ b/ssl/extensions.cc @@ -437,6 +437,34 @@ bool tls12_add_verify_sigalgs(const SSL_HANDSHAKE *hs, CBB *out) { @@ -113,7 +113,7 @@ index 971ebd0b1..53bfff2cf 100644 OPENSSL_PUT_ERROR(SSL, SSL_R_UNSUPPORTED_PROTOCOL); ssl_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_PROTOCOL_VERSION); diff --git a/ssl/internal.h b/ssl/internal.h -index fa35073fa..0cf17863f 100644 +index c9facb699..23cc54d78 100644 --- a/ssl/internal.h +++ b/ssl/internal.h @@ -553,6 +553,13 @@ BSSL_NAMESPACE_BEGIN @@ -130,7 +130,7 @@ index fa35073fa..0cf17863f 100644 // Bits for |algorithm_auth| (server authentication). #define SSL_aRSA 0x00000001u #define SSL_aECDSA 0x00000002u -@@ -3435,6 +3442,36 @@ void ssl_set_read_error(SSL *ssl); +@@ -3439,6 +3446,36 @@ void ssl_set_read_error(SSL *ssl); BSSL_NAMESPACE_END @@ -203,7 +203,7 @@ index 2ca14efae..1359e37e7 100644 } diff --git a/ssl/ssl_cipher.cc b/ssl/ssl_cipher.cc -index 6f2098981..a4d1d2e5f 100644 +index fd8cef95d..5cd63c6de 100644 --- a/ssl/ssl_cipher.cc +++ b/ssl/ssl_cipher.cc @@ -197,6 +197,20 @@ static constexpr SSL_CIPHER kCiphers[] = { @@ -459,7 +459,7 @@ index 6f2098981..a4d1d2e5f 100644 alg_bits = 256; strength_bits = 256; diff --git a/ssl/ssl_lib.cc b/ssl/ssl_lib.cc -index d7b5be3dd..27ac298bb 100644 +index 58b68e675..f25aec8e9 100644 --- a/ssl/ssl_lib.cc +++ b/ssl/ssl_lib.cc @@ -522,6 +522,163 @@ static int ssl_session_cmp(const SSL_SESSION *a, const SSL_SESSION *b) { @@ -626,7 +626,7 @@ index d7b5be3dd..27ac298bb 100644 ssl_ctx_st::ssl_ctx_st(const SSL_METHOD *ssl_method) : method(ssl_method->method), x509_method(ssl_method->x509_method), -@@ -718,6 +875,11 @@ SSL_CONFIG::~SSL_CONFIG() { +@@ -719,6 +876,11 @@ SSL_CONFIG::~SSL_CONFIG() { } void SSL_free(SSL *ssl) { @@ -638,7 +638,7 @@ index d7b5be3dd..27ac298bb 100644 Delete(ssl); } -@@ -847,6 +1009,15 @@ int SSL_provide_quic_data(SSL *ssl, enum ssl_encryption_level_t level, +@@ -848,6 +1010,15 @@ int SSL_provide_quic_data(SSL *ssl, enum ssl_encryption_level_t level, int SSL_do_handshake(SSL *ssl) { ssl_reset_error_state(ssl); @@ -654,7 +654,7 @@ index d7b5be3dd..27ac298bb 100644 if (ssl->do_handshake == NULL) { OPENSSL_PUT_ERROR(SSL, SSL_R_CONNECTION_TYPE_NOT_SET); -@@ -865,6 +1036,18 @@ int SSL_do_handshake(SSL *ssl) { +@@ -866,6 +1037,18 @@ int SSL_do_handshake(SSL *ssl) { ssl_do_info_callback( ssl, ssl->server ? SSL_CB_ACCEPT_EXIT : SSL_CB_CONNECT_EXIT, ret); if (ret <= 0) { @@ -673,7 +673,7 @@ index d7b5be3dd..27ac298bb 100644 return ret; } -@@ -1029,6 +1212,15 @@ static int ssl_read_impl(SSL *ssl) { +@@ -1030,6 +1213,15 @@ static int ssl_read_impl(SSL *ssl) { } int SSL_read(SSL *ssl, void *buf, int num) { @@ -689,7 +689,7 @@ index d7b5be3dd..27ac298bb 100644 int ret = SSL_peek(ssl, buf, num); if (ret <= 0) { return ret; -@@ -1044,6 +1236,15 @@ int SSL_read(SSL *ssl, void *buf, int num) { +@@ -1045,6 +1237,15 @@ int SSL_read(SSL *ssl, void *buf, int num) { } int SSL_peek(SSL *ssl, void *buf, int num) { @@ -705,7 +705,7 @@ index d7b5be3dd..27ac298bb 100644 if (ssl->quic_method != nullptr) { OPENSSL_PUT_ERROR(SSL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return -1; -@@ -1064,6 +1265,15 @@ int SSL_peek(SSL *ssl, void *buf, int num) { +@@ -1065,6 +1266,15 @@ int SSL_peek(SSL *ssl, void *buf, int num) { int SSL_write(SSL *ssl, const void *buf, int num) { ssl_reset_error_state(ssl); @@ -721,7 +721,7 @@ index d7b5be3dd..27ac298bb 100644 if (ssl->quic_method != nullptr) { OPENSSL_PUT_ERROR(SSL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); -@@ -1136,6 +1346,15 @@ int SSL_key_update(SSL *ssl, int request_type) { +@@ -1137,6 +1347,15 @@ int SSL_key_update(SSL *ssl, int request_type) { int SSL_shutdown(SSL *ssl) { ssl_reset_error_state(ssl); @@ -737,7 +737,7 @@ index d7b5be3dd..27ac298bb 100644 if (ssl->do_handshake == NULL) { OPENSSL_PUT_ERROR(SSL, SSL_R_UNINITIALIZED); -@@ -2527,6 +2746,10 @@ EVP_PKEY *SSL_CTX_get0_privatekey(const SSL_CTX *ctx) { +@@ -2537,6 +2756,10 @@ EVP_PKEY *SSL_CTX_get0_privatekey(const SSL_CTX *ctx) { } const SSL_CIPHER *SSL_get_current_cipher(const SSL *ssl) { diff --git a/patch/bubble.patch b/patch/bubble.patch index b717ebd..a5a305e 100644 --- a/patch/bubble.patch +++ b/patch/bubble.patch @@ -1,6 +1,6 @@ -From 8a8ab66f173efacd97c9e3c544bd2e258fdfffec Mon Sep 17 00:00:00 2001 +From c31f42efa3d7a8c12d580a6b3eaf6c727deaa7ac Mon Sep 17 00:00:00 2001 From: Dmitrii Pichulin -Date: Wed, 8 Nov 2023 18:10:26 +0300 +Date: Wed, 6 Dec 2023 03:04:30 +0300 Subject: [PATCH] Revert "Remove Download Bubble flags" revert 3629ca9973f6460137c40ddca7e1fdffd045c3a7 && 118 -> -1 @@ -13,10 +13,10 @@ revert 3629ca9973f6460137c40ddca7e1fdffd045c3a7 && 118 -> -1 5 files changed, 40 insertions(+) diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index 32e2e14cdb2d9..2f672cc60ef71 100644 +index 8736a91998f6b..016ec681fc039 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -9940,6 +9940,16 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9874,6 +9874,16 @@ const FeatureEntry kFeatureEntries[] = { "IsolateSandboxedIframes" /* trial name */)}, #endif @@ -34,12 +34,12 @@ index 32e2e14cdb2d9..2f672cc60ef71 100644 flag_descriptions::kDownloadWarningImprovementsName, flag_descriptions::kDownloadWarningImprovementsDescription, diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json -index 60d6876953def..8506a63fe8503 100644 +index 400505f9d64e6..4776eceaebe70 100644 --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -1903,6 +1903,16 @@ - "owners": [ "shaktisahu", "qinmin" ], - "expiry_milestone": 96 +@@ -1797,6 +1797,16 @@ + "owners": [ "afakhry@chromium.org", "tbuckley@chromium.org" ], + "expiry_milestone": 85 }, + { + "name": "download-bubble", @@ -52,13 +52,13 @@ index 60d6876953def..8506a63fe8503 100644 + "expiry_milestone": -1 + }, { - "name": "download-later", - "owners": [ "xingliu", "dtrainor" ], + "name": "download-notification-service-unified-api", + "owners": ["shaktisahu@chromium.org", "qinmin@chromium.org"], diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc -index d33d6d04c130e..a6868fe3e7fb9 100644 +index f92c5df0fc600..50c28156c7a17 100644 --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1254,6 +1254,16 @@ const char kExperimentalRgbKeyboardPatternsName[] = +@@ -1210,6 +1210,16 @@ const char kExperimentalRgbKeyboardPatternsName[] = const char kExperimentalRgbKeyboardPatternsDescription[] = "Enable experimental RGB Keyboard patterns support on supported devices."; @@ -76,10 +76,10 @@ index d33d6d04c130e..a6868fe3e7fb9 100644 const char kDownloadRangeDescription[] = "Enables arbitrary download range request support."; diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h -index 89d8ca8a55114..a372632c29aaa 100644 +index 71eae84724eab..454e229f483b2 100644 --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -743,6 +743,12 @@ extern const char kMemlogStackModeDescription[]; +@@ -726,6 +726,12 @@ extern const char kMemlogStackModeDescription[]; extern const char kMemlogStackModeNative[]; extern const char kMemlogStackModeNativeWithThreadNames[]; @@ -93,10 +93,10 @@ index 89d8ca8a55114..a372632c29aaa 100644 extern const char kDownloadRangeDescription[]; diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml -index 75e5eeb9cc761..4821d346cb457 100644 +index 83291c4f39d57..a5bd9072580b1 100644 --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml -@@ -61165,6 +61165,7 @@ from previous Chrome versions. +@@ -61833,6 +61833,7 @@ from previous Chrome versions. @@ -104,7 +104,7 @@ index 75e5eeb9cc761..4821d346cb457 100644 -@@ -62653,6 +62654,7 @@ from previous Chrome versions. +@@ -63343,6 +63344,7 @@ from previous Chrome versions. @@ -112,7 +112,7 @@ index 75e5eeb9cc761..4821d346cb457 100644 -@@ -62801,6 +62803,7 @@ from previous Chrome versions. +@@ -63492,6 +63494,7 @@ from previous Chrome versions. @@ -120,7 +120,7 @@ index 75e5eeb9cc761..4821d346cb457 100644 -@@ -63406,6 +63409,7 @@ from previous Chrome versions. +@@ -64109,6 +64112,7 @@ from previous Chrome versions. diff --git a/patch/chromium.patch b/patch/chromium.patch index 304c572..81eabd2 100644 --- a/patch/chromium.patch +++ b/patch/chromium.patch @@ -1,4 +1,4 @@ -From 20c6513509ae82804858a25ecc1d8dab4b0ca9f5 Mon Sep 17 00:00:00 2001 +From c5424cd60bf736a70c72591a9f1339cf902caa40 Mon Sep 17 00:00:00 2001 From: Dmitrii Pichulin Date: Wed, 1 Nov 2023 01:50:07 +0300 Subject: [PATCH] chromium GOSTSSL @@ -63,10 +63,10 @@ Subject: [PATCH] chromium GOSTSSL 56 files changed, 688 insertions(+), 55 deletions(-) diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index 78e717afce47c..0e2f30afb88ce 100644 +index 6ccd58b51df77..15dc6656fc722 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -1579,7 +1579,7 @@ group("extra_resources") { +@@ -1588,7 +1588,7 @@ group("extra_resources") { ] } @@ -75,7 +75,7 @@ index 78e717afce47c..0e2f30afb88ce 100644 if (!is_mac) { _preinstalled_apps_target_type = "copy" } else { -@@ -1623,7 +1623,7 @@ if (!is_android) { +@@ -1632,7 +1632,7 @@ if (!is_android) { deps = [ ":resource_allowlist" ] } @@ -85,7 +85,7 @@ index 78e717afce47c..0e2f30afb88ce 100644 } diff --git a/chrome/app/app-Info.plist b/chrome/app/app-Info.plist -index ff644f12dd89f..a76aace9f8248 100644 +index 5654e5c9d5858..31a3dde1db26c 100644 --- a/chrome/app/app-Info.plist +++ b/chrome/app/app-Info.plist @@ -241,8 +241,6 @@ @@ -116,10 +116,10 @@ index 5223754108237..177064aa6ecf7 100644 diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd -index 0b10daa9cebde..3c794026c7a9b 100644 +index c880e097690f8..dc128f98ea762 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd -@@ -7370,13 +7370,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7441,13 +7441,10 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -134,10 +134,10 @@ index 0b10daa9cebde..3c794026c7a9b 100644 Add shortcut diff --git a/chrome/app/resources/generated_resources_ru.xtb b/chrome/app/resources/generated_resources_ru.xtb -index c54b2fbc20797..80c9b4807e807 100644 +index 384c8a01a9b49..3ec00d1274234 100644 --- a/chrome/app/resources/generated_resources_ru.xtb +++ b/chrome/app/resources/generated_resources_ru.xtb -@@ -5199,7 +5199,7 @@ +@@ -5291,7 +5291,7 @@ Удаление телефона •  – дополнительные настройки @@ -170,7 +170,7 @@ index f8363d5b294fe..2f8021eabe810 100644 MAC_CREATOR_CODE=Cr24 MAC_TEAM_ID= diff --git a/chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc b/chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc -index f1a064bd2e8c5..c26cff6a17966 100644 +index 5e7bca0a55d90..3d2a141e416a4 100644 --- a/chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc +++ b/chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc @@ -43,6 +43,18 @@ base::FilePath NativeProcessLauncher::FindManifest( @@ -215,7 +215,7 @@ index 55d07e905b96c..70c6e15cfb460 100644 PrefService* pref_service = profile->GetPrefs(); bool hide_web_store_icon = diff --git a/chrome/browser/resources/new_tab_page/app.ts b/chrome/browser/resources/new_tab_page/app.ts -index 4cc4702e4c577..27c211d3d944d 100644 +index 0e4c7ec743232..3aad822ca02eb 100644 --- a/chrome/browser/resources/new_tab_page/app.ts +++ b/chrome/browser/resources/new_tab_page/app.ts @@ -221,7 +221,7 @@ export class AppElement extends AppElementBase { @@ -259,7 +259,7 @@ index f1bf028553046..1bc12e7588401 100644 :host(:not([single-colored])) #logo { diff --git a/chrome/browser/resources/new_tab_page/logo.ts b/chrome/browser/resources/new_tab_page/logo.ts -index d62ba160bbcad..eb5fb4e60d915 100644 +index 20a2a2aa1ed84..17950b383a257 100644 --- a/chrome/browser/resources/new_tab_page/logo.ts +++ b/chrome/browser/resources/new_tab_page/logo.ts @@ -75,7 +75,7 @@ export class LogoElement extends PolymerElement { @@ -314,7 +314,7 @@ index 772a7785015de..74f7006de2d5f 100644 } diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc -index b2d517bffefb1..5d5c8827c0ba5 100644 +index cef85a137d3e2..821045c40a6fb 100644 --- a/chrome/browser/ui/startup/startup_browser_creator.cc +++ b/chrome/browser/ui/startup/startup_browser_creator.cc @@ -870,12 +870,12 @@ void StartupBrowserCreator::ClearLaunchedProfilesForTesting() { @@ -333,7 +333,7 @@ index b2d517bffefb1..5d5c8827c0ba5 100644 #if BUILDFLAG(IS_WIN) diff --git a/chrome/browser/ui/ui_features.cc b/chrome/browser/ui/ui_features.cc -index e2b019d7e399d..1b57accdd99ad 100644 +index f778132dcd227..473ccb482e10e 100644 --- a/chrome/browser/ui/ui_features.cc +++ b/chrome/browser/ui/ui_features.cc @@ -30,7 +30,7 @@ BASE_FEATURE(kAllowEyeDropperWGCScreenCapture, @@ -411,10 +411,10 @@ index 32f7a63a43f99..46cfd099c8879 100644 for (auto& column : columns) { column.sortable = true; diff --git a/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc b/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc -index b327e16bce80e..db7c0941a64f0 100644 +index a78cb41f953b2..144d604c0861d 100644 --- a/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc +++ b/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc -@@ -239,7 +239,7 @@ void BrowserAppMenuButton::UpdateTextAndHighlightColor() { +@@ -229,7 +229,7 @@ void BrowserAppMenuButton::UpdateTextAndHighlightColor() { #endif } else { tooltip_message_id = IDS_APPMENU_TOOLTIP_ALERT; @@ -424,10 +424,10 @@ index b327e16bce80e..db7c0941a64f0 100644 absl::optional color; diff --git a/chrome/browser/ui/webui/whats_new/whats_new_util.cc b/chrome/browser/ui/webui/whats_new/whats_new_util.cc -index d9a438b614e79..7bd0162508d11 100644 +index 28439aae9cc53..50b1a13152662 100644 --- a/chrome/browser/ui/webui/whats_new/whats_new_util.cc +++ b/chrome/browser/ui/webui/whats_new/whats_new_util.cc -@@ -137,7 +137,7 @@ bool ShouldShowForState(PrefService* local_state, +@@ -153,7 +153,7 @@ bool ShouldShowForState(PrefService* local_state, // potentially displaying multiple times in a given milestone, e.g. for // multiple profile relaunches (see https://crbug.com/1274313). local_state->SetInteger(prefs::kLastWhatsNewVersion, CHROME_VERSION_MAJOR); @@ -450,7 +450,7 @@ index 51e8bae89a41b..2fdcafa5c35f9 100644 } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc -index 3a39e2bb7b608..e31fbeac13582 100644 +index 064cb8fef1f1b..79c3fa64724da 100644 --- a/chrome/common/chrome_constants.cc +++ b/chrome/common/chrome_constants.cc @@ -16,7 +16,7 @@ @@ -607,7 +607,7 @@ index ad6afc9ee4308..d28ac27862930 100644 data->suggestions_url_post_params = s.ColumnString(18); data->image_url_post_params = s.ColumnString(19); diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json -index 8ab6a40d2e8d3..14a844ca9a111 100644 +index 9f4e01c1bf706..53bfed40ee47c 100644 --- a/components/search_engines/prepopulated_engines.json +++ b/components/search_engines/prepopulated_engines.json @@ -635,7 +635,7 @@ @@ -717,7 +717,7 @@ index 82d054944af0e..13d2aa704e71e 100644 if (string_value) { contextual_search_url = *string_value; diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc -index 315fa0bc59255..4cd260be1db48 100644 +index bbe0d8ad57c83..cc6517acc5a26 100644 --- a/components/search_engines/template_url_prepopulate_data.cc +++ b/components/search_engines/template_url_prepopulate_data.cc @@ -1680,6 +1680,12 @@ GetPrepopulatedEnginesForEeaRegionCountries(int country_id, @@ -733,7 +733,7 @@ index 315fa0bc59255..4cd260be1db48 100644 return t_urls; } -@@ -1776,7 +1782,7 @@ std::vector> GetPrepopulatedEngines( +@@ -1779,7 +1785,7 @@ std::vector> GetPrepopulatedEngines( } if (default_search_provider_index) { const auto itr = @@ -743,10 +743,10 @@ index 315fa0bc59255..4cd260be1db48 100644 itr == t_urls.end() ? 0 : std::distance(t_urls.begin(), itr); } diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc -index 5202b07e11c21..446651aac32d1 100644 +index b363364dc0648..d55bc33f9fdd5 100644 --- a/content/browser/storage_partition_impl.cc +++ b/content/browser/storage_partition_impl.cc -@@ -164,6 +164,10 @@ +@@ -165,6 +165,10 @@ #include "services/service_manager/public/cpp/interface_provider.h" #endif // BUILDFLAG(IS_ANDROID) @@ -755,9 +755,9 @@ index 5202b07e11c21..446651aac32d1 100644 +#endif // GOSTSSL + #if BUILDFLAG(ENABLE_LIBRARY_CDMS) - #include "content/browser/media/media_license_manager.h" - #endif // BUILDFLAG(ENABLE_LIBRARY_CDMS) -@@ -658,6 +662,11 @@ class SSLClientAuthDelegate : public SSLClientAuthHandler::Delegate { + #include "content/browser/media/cdm_storage_common.h" + #include "content/browser/media/cdm_storage_manager.h" +@@ -661,6 +665,11 @@ class SSLClientAuthDelegate : public SSLClientAuthHandler::Delegate { scoped_refptr cert, scoped_refptr private_key) override { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -770,7 +770,7 @@ index 5202b07e11c21..446651aac32d1 100644 if (cert && private_key) { diff --git a/content/browser/utility_process_host.cc b/content/browser/utility_process_host.cc -index e7ea7206793a9..a48c5fca40307 100644 +index ac993ad9d37fd..1c0afe03e9a28 100644 --- a/content/browser/utility_process_host.cc +++ b/content/browser/utility_process_host.cc @@ -307,6 +307,11 @@ bool UtilityProcessHost::StartProcess() { @@ -799,7 +799,7 @@ index 5c99971335e9c..e69eccd614d64 100644 os_info.c_str(), product.c_str()); return user_agent; diff --git a/net/base/net_error_list.h b/net/base/net_error_list.h -index 2e28c884939f9..901df0eb005a2 100644 +index 086c1fb0f4fbf..89d8545a7f362 100644 --- a/net/base/net_error_list.h +++ b/net/base/net_error_list.h @@ -22,6 +22,11 @@ @@ -815,10 +815,10 @@ index 2e28c884939f9..901df0eb005a2 100644 // indicate a fatal error. Typically this error will be generated as a // notification to wait for some external notification that the IO operation diff --git a/net/cert/cert_verify_proc.cc b/net/cert/cert_verify_proc.cc -index 35b06d5b69bcf..b6dd086ccce29 100644 +index c554480e6488e..c50875e93123f 100644 --- a/net/cert/cert_verify_proc.cc +++ b/net/cert/cert_verify_proc.cc -@@ -457,6 +457,12 @@ CertVerifyProc::CertVerifyProc(scoped_refptr crl_set) +@@ -455,6 +455,12 @@ CertVerifyProc::CertVerifyProc(scoped_refptr crl_set) CHECK(crl_set_); } @@ -831,7 +831,7 @@ index 35b06d5b69bcf..b6dd086ccce29 100644 CertVerifyProc::~CertVerifyProc() = default; int CertVerifyProc::Verify(X509Certificate* cert, -@@ -491,6 +497,23 @@ int CertVerifyProc::Verify(X509Certificate* cert, +@@ -489,6 +495,23 @@ int CertVerifyProc::Verify(X509Certificate* cert, CHECK(verify_result->verified_cert); @@ -913,10 +913,10 @@ index d4bb5eaa31169..a53c89229cb57 100644 std::string state_or_province_name; std::string country_name; diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc -index 1c7464df9ec1b..1d10158895844 100644 +index 3383909b1f3c1..7b28a2107a0e5 100644 --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc -@@ -1676,6 +1676,15 @@ int HttpNetworkTransaction::HandleSSLClientAuthError(int error) { +@@ -1675,6 +1675,15 @@ int HttpNetworkTransaction::HandleSSLClientAuthError(int error) { } } } @@ -990,17 +990,17 @@ index 637c32b522cc7..93c632c6e4fa2 100644 void NotifySSLConfigChanged(SSLConfigChangeType change_type); void NotifySSLConfigForServersChanged( diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket_impl.cc -index 90fe67fc775bb..51053567ef898 100644 +index 19db6d77a7c32..2a68050945b5c 100644 --- a/net/socket/ssl_client_socket_impl.cc +++ b/net/socket/ssl_client_socket_impl.cc -@@ -29,6 +29,7 @@ +@@ -28,6 +28,7 @@ #include "base/strings/string_piece.h" #include "base/synchronization/lock.h" #include "base/task/sequenced_task_runner.h" +#include "base/task/thread_pool.h" #include "base/values.h" #include "build/build_config.h" - #include "crypto/ec_private_key.h" + #include "components/miracle_parameter/common/public/miracle_parameter.h" @@ -424,6 +425,92 @@ int SSLClientSocketImpl::ExportKeyingMaterial(base::StringPiece label, return OK; } @@ -1255,7 +1255,7 @@ index fc7487077a3ec..9455b5918bdc9 100644 // The given hostname will be compared with the name(s) in the server's // certificate during the SSL handshake. |ssl_config| specifies the SSL diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc -index 997a98ac50966..5a5c6d478570c 100644 +index fa57f9d924859..867e680e36a8f 100644 --- a/net/spdy/spdy_session.cc +++ b/net/spdy/spdy_session.cc @@ -1467,6 +1467,11 @@ void SpdySession::RemovePooledAlias(const SpdySessionKey& alias_key) { @@ -1271,7 +1271,7 @@ index 997a98ac50966..5a5c6d478570c 100644 CHECK(GetSSLInfo(&ssl_info)); diff --git a/net/ssl/client_cert_store_mac.cc b/net/ssl/client_cert_store_mac.cc -index db92d1c069e37..7aa2bbde81cde 100644 +index 03cfee278d9ac..63669f2adcced 100644 --- a/net/ssl/client_cert_store_mac.cc +++ b/net/ssl/client_cert_store_mac.cc @@ -296,6 +296,12 @@ void AddIdentity(ScopedCFTypeRef sec_identity, @@ -1576,7 +1576,7 @@ index 5e26c931141dd..5e31c3572b134 100644 bssl::UniquePtr GetClientCertPublicKey( const X509Certificate* certificate); diff --git a/sandbox/policy/features.cc b/sandbox/policy/features.cc -index 489dc1f1f53eb..a7f6891bcae0f 100644 +index e5cd9cf561249..d8d0a3eff90e0 100644 --- a/sandbox/policy/features.cc +++ b/sandbox/policy/features.cc @@ -29,7 +29,7 @@ BASE_FEATURE(kNetworkServiceSandbox, @@ -1661,7 +1661,7 @@ index 79ca46ee037be..52afdd4fbb03a 100644 // Enable image load policies. diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_party/blink/renderer/core/frame/reporting_context.cc -index dc32fd90d945a..6474fd321bde6 100644 +index 688f2c4decc00..e2339575ed9b4 100644 --- a/third_party/blink/renderer/core/frame/reporting_context.cc +++ b/third_party/blink/renderer/core/frame/reporting_context.cc @@ -53,7 +53,9 @@ const char ReportingContext::kSupplementName[] = "ReportingContext"; @@ -1753,7 +1753,7 @@ index 68e9fc988a2d6..e28a1c1eb275a 100644 HeapMojoReceiver receiver_; }; diff --git a/third_party/boringssl/BUILD.generated.gni b/third_party/boringssl/BUILD.generated.gni -index 910ebff0218db..8806aac4ffc3a 100644 +index 37a121bb31591..83fdcc6d8cb35 100644 --- a/third_party/boringssl/BUILD.generated.gni +++ b/third_party/boringssl/BUILD.generated.gni @@ -15,6 +15,8 @@