Rename SpdyHeaderBlock to Http2HeaderBlock.
See upstream change at
https://quiche.googlesource.com/quiche/+/557dfbcce6630971df1722e6add40c5c1db44144.
Also rename ElideSpdyHeaderBlockForNetLog* and
SpdyHeaderBlockNetLogParams accordingly.
Change-Id: I6980bafe2eaa7a1830dbd59d1b407aee356d9a75
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2491314
Commit-Queue: Bence Béky <[email protected]>
Reviewed-by: Dianna Hu <[email protected]>
Cr-Commit-Position: refs/heads/master@{#819977}
diff --git a/net/http/bidirectional_stream_unittest.cc b/net/http/bidirectional_stream_unittest.cc
index 70e734b1..2f1470c 100644
--- a/net/http/bidirectional_stream_unittest.cc
+++ b/net/http/bidirectional_stream_unittest.cc
@@ -127,7 +127,7 @@
}
void OnHeadersReceived(
- const spdy::SpdyHeaderBlock& response_headers) override {
+ const spdy::Http2HeaderBlock& response_headers) override {
CHECK(!not_expect_callback_);
response_headers_ = response_headers.Clone();
@@ -152,7 +152,7 @@
++on_data_sent_count_;
}
- void OnTrailersReceived(const spdy::SpdyHeaderBlock& trailers) override {
+ void OnTrailersReceived(const spdy::Http2HeaderBlock& trailers) override {
CHECK(!not_expect_callback_);
trailers_ = trailers.Clone();
@@ -263,10 +263,10 @@
// Const getters for internal states.
const std::string& data_received() const { return data_received_; }
int error() const { return error_; }
- const spdy::SpdyHeaderBlock& response_headers() const {
+ const spdy::Http2HeaderBlock& response_headers() const {
return response_headers_;
}
- const spdy::SpdyHeaderBlock& trailers() const { return trailers_; }
+ const spdy::Http2HeaderBlock& trailers() const { return trailers_; }
int on_data_read_count() const { return on_data_read_count_; }
int on_data_sent_count() const { return on_data_sent_count_; }
@@ -291,8 +291,8 @@
std::unique_ptr<base::OneShotTimer> timer_;
std::string data_received_;
std::unique_ptr<base::RunLoop> loop_;
- spdy::SpdyHeaderBlock response_headers_;
- spdy::SpdyHeaderBlock trailers_;
+ spdy::Http2HeaderBlock response_headers_;
+ spdy::Http2HeaderBlock trailers_;
NextProto next_proto_;
int64_t received_bytes_;
int64_t sent_bytes_;
@@ -326,7 +326,7 @@
~DeleteStreamDelegate() override = default;
void OnHeadersReceived(
- const spdy::SpdyHeaderBlock& response_headers) override {
+ const spdy::Http2HeaderBlock& response_headers) override {
TestDelegateBase::OnHeadersReceived(response_headers);
if (phase_ == ON_HEADERS_RECEIVED) {
DeleteStream();
@@ -348,7 +348,7 @@
}
}
- void OnTrailersReceived(const spdy::SpdyHeaderBlock& trailers) override {
+ void OnTrailersReceived(const spdy::Http2HeaderBlock& trailers) override {
if (phase_ == ON_HEADERS_RECEIVED || phase_ == ON_DATA_READ) {
NOTREACHED();
return;
@@ -653,7 +653,7 @@
ASSERT_FALSE(client_cert);
ASSERT_FALSE(client_private_key);
- const spdy::SpdyHeaderBlock& response_headers = delegate->response_headers();
+ const spdy::Http2HeaderBlock& response_headers = delegate->response_headers();
EXPECT_EQ("200", response_headers.find(":status")->second);
EXPECT_EQ(1, delegate->on_data_read_count());
EXPECT_EQ(0, delegate->on_data_sent_count());
@@ -733,7 +733,7 @@
rv = delegate->ReadData();
EXPECT_THAT(rv, IsOk()); // EOF.
- const spdy::SpdyHeaderBlock& response_headers = delegate->response_headers();
+ const spdy::Http2HeaderBlock& response_headers = delegate->response_headers();
EXPECT_EQ("200", response_headers.find(":status")->second);
EXPECT_EQ("header-value", response_headers.find("header-name")->second);
EXPECT_EQ(1, delegate->on_data_read_count());
@@ -760,7 +760,7 @@
spdy::SpdySerializedFrame response_body_frame2(
spdy_util_.ConstructSpdyDataFrame(1, false));
- spdy::SpdyHeaderBlock trailers;
+ spdy::Http2HeaderBlock trailers;
trailers["foo"] = "bar";
spdy::SpdySerializedFrame response_trailers(
spdy_util_.ConstructSpdyResponseHeaders(1, std::move(trailers), true));
@@ -1199,7 +1199,7 @@
EXPECT_EQ(kUploadDataSize * 3,
static_cast<int>(delegate->data_received().size()));
- const spdy::SpdyHeaderBlock& response_headers = delegate->response_headers();
+ const spdy::Http2HeaderBlock& response_headers = delegate->response_headers();
EXPECT_EQ("200", response_headers.find(":status")->second);
EXPECT_EQ("header-value", response_headers.find("header-name")->second);
EXPECT_EQ(0, delegate->on_data_sent_count());
@@ -1222,7 +1222,7 @@
spdy::SpdySerializedFrame body_frame(
spdy_util_.ConstructSpdyDataFrame(1, false));
- spdy::SpdyHeaderBlock trailers;
+ spdy::Http2HeaderBlock trailers;
trailers["foo"] = "bar";
spdy::SpdySerializedFrame response_trailers(
spdy_util_.ConstructSpdyResponseHeaders(1, std::move(trailers), true));
@@ -1272,7 +1272,7 @@
EXPECT_EQ(1, delegate->on_data_read_count());
EXPECT_EQ(kUploadDataSize * 3,
static_cast<int>(delegate->data_received().size()));
- const spdy::SpdyHeaderBlock& response_headers = delegate->response_headers();
+ const spdy::Http2HeaderBlock& response_headers = delegate->response_headers();
EXPECT_EQ("200", response_headers.find(":status")->second);
EXPECT_EQ("header-value", response_headers.find("header-name")->second);
EXPECT_EQ("bar", delegate->trailers().find("foo")->second);
@@ -1511,7 +1511,7 @@
delegate->Start(std::move(request_info), http_session_.get());
// Makes sure delegate does not get called.
base::RunLoop().RunUntilIdle();
- const spdy::SpdyHeaderBlock& response_headers = delegate->response_headers();
+ const spdy::Http2HeaderBlock& response_headers = delegate->response_headers();
EXPECT_EQ("200", response_headers.find(":status")->second);
EXPECT_EQ("header-value", response_headers.find("header-name")->second);
EXPECT_EQ(0u, delegate->data_received().size());
@@ -1566,7 +1566,7 @@
delegate->Start(std::move(request_info), http_session_.get());
// Makes sure delegate does not get called.
base::RunLoop().RunUntilIdle();
- const spdy::SpdyHeaderBlock& response_headers = delegate->response_headers();
+ const spdy::Http2HeaderBlock& response_headers = delegate->response_headers();
EXPECT_EQ("200", response_headers.find(":status")->second);
EXPECT_EQ("header-value", response_headers.find("header-name")->second);
EXPECT_EQ(kUploadDataSize * 1,
@@ -1598,7 +1598,7 @@
spdy::SpdySerializedFrame response_body_frame(
spdy_util_.ConstructSpdyDataFrame(1, false));
- spdy::SpdyHeaderBlock trailers;
+ spdy::Http2HeaderBlock trailers;
trailers["foo"] = "bar";
spdy::SpdySerializedFrame response_trailers(
spdy_util_.ConstructSpdyResponseHeaders(1, std::move(trailers), true));
@@ -1626,7 +1626,7 @@
delegate->Start(std::move(request_info), http_session_.get());
// Makes sure delegate does not get called.
base::RunLoop().RunUntilIdle();
- const spdy::SpdyHeaderBlock& response_headers = delegate->response_headers();
+ const spdy::Http2HeaderBlock& response_headers = delegate->response_headers();
EXPECT_EQ("200", response_headers.find(":status")->second);
EXPECT_EQ("header-value", response_headers.find("header-name")->second);
EXPECT_EQ("bar", delegate->trailers().find("foo")->second);
@@ -1731,7 +1731,7 @@
delegate->SetRunUntilCompletion(true);
delegate->Start(std::move(request_info), http_session_.get());
- const spdy::SpdyHeaderBlock& response_headers = delegate->response_headers();
+ const spdy::Http2HeaderBlock& response_headers = delegate->response_headers();
EXPECT_EQ("200", response_headers.find(":status")->second);
EXPECT_EQ(alt_svc_header_value, response_headers.find("alt-svc")->second);
EXPECT_EQ(0, delegate->on_data_sent_count());
