BASELINE: Update Chromium to 106.0.5249.126

Change-Id: Ib0bb21c437a7d1686e21c33f2d329f2ac425b7ab
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/438936
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 12 insertions, 31 deletions

diff --git a/chromium/net/third_party/quiche/src/quiche/quic/core/http/quic_receive_control_stream_test.cc b/chromium/net/third_party/quiche/src/quiche/quic/core/http/quic_receive_control_stream_test.cc
index c2dcfa7d4b2..af7e5d43bc6 100644
--- a/chromium/net/third_party/quiche/src/quiche/quic/core/http/quic_receive_control_stream_test.cc
+++ b/chromium/net/third_party/quiche/src/quiche/quic/core/http/quic_receive_control_stream_test.cc
@@ -109,22 +109,6 @@ class QuicReceiveControlStreamTest : public QuicTestWithParam<TestParams> {
 
   Perspective perspective() const { return GetParam().perspective; }
 
-  std::string EncodeSettings(const SettingsFrame& settings) {
-    std::unique_ptr<char[]> buffer;
-    QuicByteCount settings_frame_length =
-        HttpEncoder::SerializeSettingsFrame(settings, &buffer);
-    return std::string(buffer.get(), settings_frame_length);
-  }
-
-  std::string SerializePriorityUpdateFrame(
-      const PriorityUpdateFrame& priority_update) {
-    std::unique_ptr<char[]> priority_buffer;
-    QuicByteCount priority_frame_length =
-        HttpEncoder::SerializePriorityUpdateFrame(priority_update,
-                                                  &priority_buffer);
-    return std::string(priority_buffer.get(), priority_frame_length);
-  }
-
   QuicStreamOffset NumBytesConsumed() {
     return QuicStreamPeer::sequencer(receive_control_stream_)
         ->NumBytesConsumed();
@@ -158,7 +142,7 @@ TEST_P(QuicReceiveControlStreamTest, ReceiveSettings) {
   settings.values[SETTINGS_MAX_FIELD_SECTION_SIZE] = 5;
   settings.values[SETTINGS_QPACK_BLOCKED_STREAMS] = 12;
   settings.values[SETTINGS_QPACK_MAX_TABLE_CAPACITY] = 37;
-  std::string data = EncodeSettings(settings);
+  std::string data = HttpEncoder::SerializeSettingsFrame(settings);
   QuicStreamFrame frame(receive_control_stream_->id(), false, 1, data);
 
   QpackEncoder* qpack_encoder = session_.qpack_encoder();
@@ -185,7 +169,7 @@ TEST_P(QuicReceiveControlStreamTest, ReceiveSettingsTwice) {
   settings.values[0x21] = 100;
   settings.values[0x40] = 200;
 
-  std::string settings_frame = EncodeSettings(settings);
+  std::string settings_frame = HttpEncoder::SerializeSettingsFrame(settings);
 
   QuicStreamOffset offset = 1;
   EXPECT_EQ(offset, NumBytesConsumed());
@@ -223,7 +207,7 @@ TEST_P(QuicReceiveControlStreamTest, ReceiveSettingsFragments) {
   SettingsFrame settings;
   settings.values[10] = 2;
   settings.values[SETTINGS_MAX_FIELD_SECTION_SIZE] = 5;
-  std::string data = EncodeSettings(settings);
+  std::string data = HttpEncoder::SerializeSettingsFrame(settings);
   std::string data1 = data.substr(0, 1);
   std::string data2 = data.substr(1, data.length() - 1);
 
@@ -250,7 +234,7 @@ TEST_P(QuicReceiveControlStreamTest, ReceiveWrongFrame) {
 
 TEST_P(QuicReceiveControlStreamTest,
        ReceivePriorityUpdateFrameBeforeSettingsFrame) {
-  std::string serialized_frame = SerializePriorityUpdateFrame({});
+  std::string serialized_frame = HttpEncoder::SerializePriorityUpdateFrame({});
   QuicStreamFrame data(receive_control_stream_->id(), /* fin = */ false,
                        /* offset = */ 1, serialized_frame);
 
@@ -275,7 +259,7 @@ TEST_P(QuicReceiveControlStreamTest, ReceiveGoAwayFrame) {
 
   // Receive SETTINGS frame.
   SettingsFrame settings;
-  std::string settings_frame = EncodeSettings(settings);
+  std::string settings_frame = HttpEncoder::SerializeSettingsFrame(settings);
   EXPECT_CALL(debug_visitor, OnSettingsFrameReceived(settings));
   receive_control_stream_->OnStreamFrame(
       QuicStreamFrame(receive_control_stream_->id(), /* fin = */ false, offset,
@@ -283,18 +267,15 @@ TEST_P(QuicReceiveControlStreamTest, ReceiveGoAwayFrame) {
   offset += settings_frame.length();
 
   GoAwayFrame goaway{/* id = */ 0};
+  std::string goaway_frame = HttpEncoder::SerializeGoAwayFrame(goaway);
+  QuicStreamFrame frame(receive_control_stream_->id(), false, offset,
+                        goaway_frame);
 
-  std::unique_ptr<char[]> buffer;
-  QuicByteCount header_length =
-      HttpEncoder::SerializeGoAwayFrame(goaway, &buffer);
-  std::string data = std::string(buffer.get(), header_length);
-
-  QuicStreamFrame frame(receive_control_stream_->id(), false, offset, data);
   EXPECT_FALSE(session_.goaway_received());
 
   EXPECT_CALL(debug_visitor, OnGoAwayFrameReceived(goaway));
-
   receive_control_stream_->OnStreamFrame(frame);
+
   EXPECT_TRUE(session_.goaway_received());
 }
 
@@ -320,7 +301,7 @@ TEST_P(QuicReceiveControlStreamTest, ConsumeUnknownFrame) {
   QuicStreamOffset offset = 1;
 
   // Receive SETTINGS frame.
-  std::string settings_frame = EncodeSettings({});
+  std::string settings_frame = HttpEncoder::SerializeSettingsFrame({});
   receive_control_stream_->OnStreamFrame(
       QuicStreamFrame(receive_control_stream_->id(), /* fin = */ false, offset,
                       settings_frame));
@@ -352,7 +333,7 @@ TEST_P(QuicReceiveControlStreamTest, ReceiveUnknownFrame) {
 
   // Receive SETTINGS frame.
   SettingsFrame settings;
-  std::string settings_frame = EncodeSettings(settings);
+  std::string settings_frame = HttpEncoder::SerializeSettingsFrame(settings);
   EXPECT_CALL(debug_visitor, OnSettingsFrameReceived(settings));
   receive_control_stream_->OnStreamFrame(
       QuicStreamFrame(id, /* fin = */ false, offset, settings_frame));
@@ -426,7 +407,7 @@ TEST_P(QuicReceiveControlStreamTest, ReceiveAcceptChFrame) {
 
   // Receive SETTINGS frame.
   SettingsFrame settings;
-  std::string settings_frame = EncodeSettings(settings);
+  std::string settings_frame = HttpEncoder::SerializeSettingsFrame(settings);
   EXPECT_CALL(debug_visitor, OnSettingsFrameReceived(settings));
   receive_control_stream_->OnStreamFrame(
       QuicStreamFrame(id, /* fin = */ false, offset, settings_frame));