Rename SpdyHeaderBlock to Http2HeaderBlock.
Salvaged from a botched Zwingli attempt:
http://refactor/16032281396283088571 created by go/Zwingli
Tested:
TAP for global presubmit queue passed after automated deflaking of failures: http://mondo/deflaker/run/9a9c8d4e-50d0-47e0-970b-4b6c24ace2d7 http://mondo/deflaker/run/32a00ba5-16fa-4c78-9e10-afa7c56abc61
http://test/OCL:338336205:BASE:339106963:1603774283861:13fcf12c
PiperOrigin-RevId: 339252455
Change-Id: Icce13789ba4b6e74894b0715ec897fc61aba9993
diff --git a/spdy/core/spdy_framer.cc b/spdy/core/spdy_framer.cc
index e5619df..d425bdd 100644
--- a/spdy/core/spdy_framer.cc
+++ b/spdy/core/spdy_framer.cc
@@ -45,7 +45,7 @@
// The size of one parameter in SETTINGS frame.
const size_t kOneSettingParameterSize = 6;
-size_t GetUncompressedSerializedLength(const SpdyHeaderBlock& headers) {
+size_t GetUncompressedSerializedLength(const Http2HeaderBlock& headers) {
const size_t num_name_value_pairs_size = sizeof(uint32_t);
const size_t length_of_name_size = num_name_value_pairs_size;
const size_t length_of_value_size = num_name_value_pairs_size;
diff --git a/spdy/core/spdy_framer_test.cc b/spdy/core/spdy_framer_test.cc
index cd96457..3ddaec5 100644
--- a/spdy/core/spdy_framer_test.cc
+++ b/spdy/core/spdy_framer_test.cc
@@ -532,7 +532,7 @@
SpdyFrameType header_control_type_;
bool header_buffer_valid_;
std::unique_ptr<TestHeadersHandler> headers_handler_;
- SpdyHeaderBlock headers_;
+ Http2HeaderBlock headers_;
bool header_has_priority_;
SpdyStreamId header_parent_stream_id_;
bool header_exclusive_;
@@ -1102,7 +1102,7 @@
SpdyFramer framer(SpdyFramer::DISABLE_COMPRESSION);
std::string value("value1\0value2", 13);
// TODO(jgraettinger): If this pattern appears again, move to test class.
- SpdyHeaderBlock header_set;
+ Http2HeaderBlock header_set;
header_set["name"] = value;
std::string buffer;
HpackEncoder encoder;
@@ -2304,7 +2304,7 @@
};
// frame-format on
- SpdyHeaderBlock header_block;
+ Http2HeaderBlock header_block;
header_block["bar"] = "foo";
header_block["foo"] = "bar";
auto buffer = std::make_unique<std::string>();
diff --git a/spdy/core/spdy_protocol.cc b/spdy/core/spdy_protocol.cc
index 53901ab..f9a1800 100644
--- a/spdy/core/spdy_protocol.cc
+++ b/spdy/core/spdy_protocol.cc
@@ -276,7 +276,7 @@
SpdyFrameWithHeaderBlockIR::SpdyFrameWithHeaderBlockIR(
SpdyStreamId stream_id,
- SpdyHeaderBlock header_block)
+ Http2HeaderBlock header_block)
: SpdyFrameWithFinIR(stream_id), header_block_(std::move(header_block)) {}
SpdyFrameWithHeaderBlockIR::~SpdyFrameWithHeaderBlockIR() = default;
diff --git a/spdy/core/spdy_protocol.h b/spdy/core/spdy_protocol.h
index 4c9c79a..a2b9c4d 100644
--- a/spdy/core/spdy_protocol.h
+++ b/spdy/core/spdy_protocol.h
@@ -492,8 +492,8 @@
public:
~SpdyFrameWithHeaderBlockIR() override;
- const SpdyHeaderBlock& header_block() const { return header_block_; }
- void set_header_block(SpdyHeaderBlock header_block) {
+ const Http2HeaderBlock& header_block() const { return header_block_; }
+ void set_header_block(Http2HeaderBlock header_block) {
// Deep copy.
header_block_ = std::move(header_block);
}
@@ -503,13 +503,13 @@
protected:
SpdyFrameWithHeaderBlockIR(SpdyStreamId stream_id,
- SpdyHeaderBlock header_block);
+ Http2HeaderBlock header_block);
SpdyFrameWithHeaderBlockIR(const SpdyFrameWithHeaderBlockIR&) = delete;
SpdyFrameWithHeaderBlockIR& operator=(const SpdyFrameWithHeaderBlockIR&) =
delete;
private:
- SpdyHeaderBlock header_block_;
+ Http2HeaderBlock header_block_;
};
class QUICHE_EXPORT_PRIVATE SpdyDataIR : public SpdyFrameWithFinIR {
@@ -706,8 +706,8 @@
class QUICHE_EXPORT_PRIVATE SpdyHeadersIR : public SpdyFrameWithHeaderBlockIR {
public:
explicit SpdyHeadersIR(SpdyStreamId stream_id)
- : SpdyHeadersIR(stream_id, SpdyHeaderBlock()) {}
- SpdyHeadersIR(SpdyStreamId stream_id, SpdyHeaderBlock header_block)
+ : SpdyHeadersIR(stream_id, Http2HeaderBlock()) {}
+ SpdyHeadersIR(SpdyStreamId stream_id, Http2HeaderBlock header_block)
: SpdyFrameWithHeaderBlockIR(stream_id, std::move(header_block)) {}
SpdyHeadersIR(const SpdyHeadersIR&) = delete;
SpdyHeadersIR& operator=(const SpdyHeadersIR&) = delete;
@@ -775,10 +775,10 @@
: public SpdyFrameWithHeaderBlockIR {
public:
SpdyPushPromiseIR(SpdyStreamId stream_id, SpdyStreamId promised_stream_id)
- : SpdyPushPromiseIR(stream_id, promised_stream_id, SpdyHeaderBlock()) {}
+ : SpdyPushPromiseIR(stream_id, promised_stream_id, Http2HeaderBlock()) {}
SpdyPushPromiseIR(SpdyStreamId stream_id,
SpdyStreamId promised_stream_id,
- SpdyHeaderBlock header_block)
+ Http2HeaderBlock header_block)
: SpdyFrameWithHeaderBlockIR(stream_id, std::move(header_block)),
promised_stream_id_(promised_stream_id),
padded_(false),
diff --git a/spdy/core/spdy_test_utils.h b/spdy/core/spdy_test_utils.h
index aaaa65a..c6390a7 100644
--- a/spdy/core/spdy_test_utils.h
+++ b/spdy/core/spdy_test_utils.h
@@ -18,7 +18,7 @@
namespace spdy {
inline bool operator==(absl::string_view x,
- const SpdyHeaderBlock::ValueProxy& y) {
+ const Http2HeaderBlock::ValueProxy& y) {
return y.operator==(x);
}
@@ -54,14 +54,14 @@
void OnHeaderBlockEnd(size_t header_bytes_parsed,
size_t compressed_header_bytes_parsed) override;
- const SpdyHeaderBlock& decoded_block() const { return block_; }
+ const Http2HeaderBlock& decoded_block() const { return block_; }
size_t header_bytes_parsed() const { return header_bytes_parsed_; }
size_t compressed_header_bytes_parsed() const {
return compressed_header_bytes_parsed_;
}
private:
- SpdyHeaderBlock block_;
+ Http2HeaderBlock block_;
size_t header_bytes_parsed_ = 0;
size_t compressed_header_bytes_parsed_ = 0;
};
