build: Update patches for 6-1-x (#23058)

patches/common/chromium/-_point_usrsctp_to_a68325e7d9ed844cc84ec134192d788586ea6cc1.patch

@@ -1,8 +1,7 @@
-From 3030db702eee4f24e74e84b66024bd0875fd5418 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Mirko Bonadei <mbonadei@chromium.org>
 Date: Tue, 10 Mar 2020 06:04:07 +0000
-Subject: [PATCH] [Merge M81] - Point usrsctp to
- a68325e7d9ed844cc84ec134192d788586ea6cc1.
+Subject: - Point usrsctp to a68325e7d9ed844cc84ec134192d788586ea6cc1.
 
 Bug: 1059349
 Change-Id: I451873d552b6fe0ca6cd481385042bf37a05fbfd
@@ -10,15 +9,12 @@ Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2093604
 Reviewed-by: Guido Urdaneta <guidou@chromium.org>
 Cr-Commit-Position: refs/branch-heads/4044@{#735}
 Cr-Branched-From: a6d9daf149a473ceea37f629c41d4527bf2055bd-refs/heads/master@{#737173}
----
- DEPS | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/DEPS b/DEPS
-index a95e9b828dda0..e86ca48012b57 100644
+index 4404e288aca833c89017f267f479d42771833e10..fec3b60094ee15f91697285ea39bef6ba70bdc6c 100644
 --- a/DEPS
 +++ b/DEPS
-@@ -1463,7 +1463,7 @@ deps = {
+@@ -1324,7 +1324,7 @@ deps = {
    },
  
    'src/third_party/usrsctp/usrsctplib':

patches/common/chromium/.patches

@@ -100,9 +100,9 @@ fix_hi-dpi_transitions_on_catalina.patch
 allow_restricted_clock_nanosleep_in_linux_sandbox.patch
 move_readablestream_requests_onto_the_stack_before_iteration.patch
 streams_convert_state_dchecks_to_checks.patch
-cherry-pick-3030db702eee.patch
+-_point_usrsctp_to_a68325e7d9ed844cc84ec134192d788586ea6cc1.patch
 audiocontext_haspendingactivity_unless_it_s_closed.patch
 protect_automatic_pull_handlers_with_mutex.patch
 reland_sequentialise_access_to_callbacks_in.patch
-cherry-pick-adc8f05aa3ab.patch
+handle_err_cache_race_in_dodoneheadersaddtoentrycomplete.patch
 mojovideoencodeacceleratorservice_handle_potential_later.patch

patches/common/chromium/handle_err_cache_race_in_dodoneheadersaddtoentrycomplete.patch

@@ -1,7 +1,7 @@
-From adc8f05aa3abbde50a7b9171c7311aba08c07b00 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Alex Turner <alexmt@chromium.org>
 Date: Fri, 20 Sep 2019 20:21:41 +0000
-Subject: [PATCH] Handle ERR_CACHE_RACE in DoDoneHeadersAddToEntryComplete
+Subject: Handle ERR_CACHE_RACE in DoDoneHeadersAddToEntryComplete
 
 Crashes have been observed in the wild that may be due to
 ERR_CACHE_RACE being sent to STATE_DONE_HEADERS_ADD_TO_ENTRY_COMPLETE.
@@ -16,15 +16,12 @@ Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1814843
 Commit-Queue: Alex Turner <alexmt@chromium.org>
 Reviewed-by: Shivani Sharma <shivanisha@chromium.org>
 Cr-Commit-Position: refs/heads/master@{#698597}
----
- net/http/http_cache_transaction.cc | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc
-index 6f2577de617ec..bc1193f4b7d43 100644
+index d3795484f0bac2e6318632617f4e2f41bf1cf772..5fc048709e8001919cd5b5684d39ad4e3c6681fb 100644
 --- a/net/http/http_cache_transaction.cc
 +++ b/net/http/http_cache_transaction.cc
-@@ -1430,8 +1430,15 @@ int HttpCache::Transaction::DoDoneHeadersAddToEntryComplete(int result) {
+@@ -1481,8 +1481,15 @@ int HttpCache::Transaction::DoDoneHeadersAddToEntryComplete(int result) {
    DCHECK(response_.headers);
  
    cache_pending_ = false;
@@ -41,7 +38,7 @@ index 6f2577de617ec..bc1193f4b7d43 100644
    DCHECK_NE(response_.headers->response_code(), 304);
    DCHECK(cache_->CanTransactionWriteResponseHeaders(
        entry_, this, partial_ != nullptr, false));
-@@ -2078,6 +2085,7 @@ int HttpCache::Transaction::DoHeadersPhaseCannotProceed(int result) {
+@@ -2113,6 +2120,7 @@ int HttpCache::Transaction::DoHeadersPhaseCannotProceed(int result) {
    SetRequest(net_log_);
  
    entry_ = nullptr;