Import Cronet version 122.0.6261.43

FolderOrigin-RevId: /tmp/copybara-origin/src
Change-Id: Ifb7b548cde690e10cc102366bc538e744efa902b

4 files changed, 16 insertions, 25 deletions

diff --git a/net/filter/DIR_METADATA b/net/filter/DIR_METADATA
index 096293f1c..38785c3a5 100644
--- a/net/filter/DIR_METADATA
+++ b/net/filter/DIR_METADATA
@@ -1,11 +1,6 @@
-# Metadata information for this directory.
-#
-# For more information on DIR_METADATA files, see:
-#   https://source.chromium.org/chromium/infra/infra/+/main:go/src/infra/tools/dirmd/README.md
-#
-# For the schema of this file, see Metadata message:
-#   https://source.chromium.org/chromium/infra/infra/+/main:go/src/infra/tools/dirmd/proto/dir_metadata.proto
-
-monorail {
+monorail: {
   component: "Internals>Network>Filters"
-}
\ No newline at end of file
+}
+buganizer_public: {
+  component_id: 1456914
+}
diff --git a/net/filter/brotli_source_stream.cc b/net/filter/brotli_source_stream.cc
index f690d4c1e..2c047c0ed 100644
--- a/net/filter/brotli_source_stream.cc
+++ b/net/filter/brotli_source_stream.cc
@@ -6,7 +6,6 @@
 
 #include "net/filter/brotli_source_stream.h"
 
-#include "base/bit_cast.h"
 #include "base/check_op.h"
 #include "base/functional/bind.h"
 #include "base/memory/raw_ptr.h"
@@ -108,9 +107,9 @@ class BrotliSourceStream : public FilterSourceStream {
     if (decoding_status_ != DecodingStatus::DECODING_IN_PROGRESS)
       return base::unexpected(ERR_CONTENT_DECODING_FAILED);
 
-    const uint8_t* next_in = base::bit_cast<uint8_t*>(input_buffer->data());
+    const uint8_t* next_in = reinterpret_cast<uint8_t*>(input_buffer->data());
     size_t available_in = input_buffer_size;
-    uint8_t* next_out = base::bit_cast<uint8_t*>(output_buffer->data());
+    uint8_t* next_out = reinterpret_cast<uint8_t*>(output_buffer->data());
     size_t available_out = output_buffer_size;
 
     BrotliDecoderResult result =
diff --git a/net/filter/filter_source_stream_test_util.cc b/net/filter/filter_source_stream_test_util.cc
index 2e18235b7..1c140827f 100644
--- a/net/filter/filter_source_stream_test_util.cc
+++ b/net/filter/filter_source_stream_test_util.cc
@@ -6,7 +6,6 @@
 
 #include <cstring>
 
-#include "base/bit_cast.h"
 #include "base/check_op.h"
 #include "third_party/zlib/zlib.h"
 
@@ -52,9 +51,9 @@ void CompressGzip(const char* source,
     dest_left -= sizeof(gzip_header);
   }
 
-  zlib_stream.next_in = base::bit_cast<Bytef*>(source);
+  zlib_stream.next_in = reinterpret_cast<Bytef*>(const_cast<char*>(source));
   zlib_stream.avail_in = source_len;
-  zlib_stream.next_out = base::bit_cast<Bytef*>(dest);
+  zlib_stream.next_out = reinterpret_cast<Bytef*>(dest);
   zlib_stream.avail_out = dest_left;
 
   code = deflate(&zlib_stream, Z_FINISH);
diff --git a/net/filter/gzip_source_stream.cc b/net/filter/gzip_source_stream.cc
index 82e6f2a0a..1e6f0a605 100644
--- a/net/filter/gzip_source_stream.cc
+++ b/net/filter/gzip_source_stream.cc
@@ -8,7 +8,6 @@
 #include <memory>
 #include <utility>
 
-#include "base/bit_cast.h"
 #include "base/check_op.h"
 #include "base/functional/bind.h"
 #include "base/memory/ptr_util.h"
@@ -133,10 +132,10 @@ base::expected<size_t, Error> GzipSourceStream::FilterData(
       case STATE_SNIFFING_DEFLATE_HEADER: {
         DCHECK_EQ(TYPE_DEFLATE, type());
 
-        zlib_stream_.get()->next_in = base::bit_cast<Bytef*>(input_data);
+        zlib_stream_.get()->next_in = reinterpret_cast<Bytef*>(input_data);
         zlib_stream_.get()->avail_in = input_data_size;
         zlib_stream_.get()->next_out =
-            base::bit_cast<Bytef*>(output_buffer->data());
+            reinterpret_cast<Bytef*>(output_buffer->data());
         zlib_stream_.get()->avail_out = output_buffer_size;
 
         int ret = inflate(zlib_stream_.get(), Z_NO_FLUSH);
@@ -191,8 +190,7 @@ base::expected<size_t, Error> GzipSourceStream::FilterData(
         input_state_ = replay_state_;
         size_t bytes_used;
         scoped_refptr<IOBuffer> replay_buffer =
-            base::MakeRefCounted<WrappedIOBuffer>(replay_data_.data(),
-                                                  replay_data_.size());
+            base::MakeRefCounted<WrappedIOBuffer>(replay_data_);
         base::expected<size_t, Error> result =
             FilterData(output_buffer, output_buffer_size, replay_buffer.get(),
                        replay_data_.size(), &bytes_used, upstream_end_reached);
@@ -211,10 +209,10 @@ base::expected<size_t, Error> GzipSourceStream::FilterData(
         DCHECK(!state_compressed_entered);
 
         state_compressed_entered = true;
-        zlib_stream_.get()->next_in = base::bit_cast<Bytef*>(input_data);
+        zlib_stream_.get()->next_in = reinterpret_cast<Bytef*>(input_data);
         zlib_stream_.get()->avail_in = input_data_size;
         zlib_stream_.get()->next_out =
-            base::bit_cast<Bytef*>(output_buffer->data());
+            reinterpret_cast<Bytef*>(output_buffer->data());
         zlib_stream_.get()->avail_out = output_buffer_size;
 
         int ret = inflate(zlib_stream_.get(), Z_NO_FLUSH);
@@ -256,9 +254,9 @@ bool GzipSourceStream::InsertZlibHeader() {
   char dummy_output[4];
 
   inflateReset(zlib_stream_.get());
-  zlib_stream_.get()->next_in = base::bit_cast<Bytef*>(&dummy_header[0]);
+  zlib_stream_.get()->next_in = reinterpret_cast<Bytef*>(&dummy_header[0]);
   zlib_stream_.get()->avail_in = sizeof(dummy_header);
-  zlib_stream_.get()->next_out = base::bit_cast<Bytef*>(&dummy_output[0]);
+  zlib_stream_.get()->next_out = reinterpret_cast<Bytef*>(&dummy_output[0]);
   zlib_stream_.get()->avail_out = sizeof(dummy_output);
 
   int ret = inflate(zlib_stream_.get(), Z_NO_FLUSH);