Load QUIC build config in spdy/core/hpack/BUILD, spdy/platform/api/BUILD and spdy/platform/impl/BUILD. This CL helps align the google3 spdy core build with Chromium, which prevents quiche merge issues. All non-trivial changes are found by enabling this build config: unused parameters, inconsistent param names between .h and .cc files. gfe-relnote: n/a, build-only change. PiperOrigin-RevId: 285474166 Change-Id: I11669af285ee1b7d3d07750ac19cc8668908153a
diff --git a/spdy/core/hpack/hpack_decoder_adapter.cc b/spdy/core/hpack/hpack_decoder_adapter.cc index 278eaab..b3bce70 100644 --- a/spdy/core/hpack/hpack_decoder_adapter.cc +++ b/spdy/core/hpack/hpack_decoder_adapter.cc
@@ -10,7 +10,6 @@ #include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h" using ::http2::DecodeBuffer; -using ::http2::HpackEntryType; using ::http2::HpackString; namespace spdy { @@ -146,8 +145,7 @@ } } -void HpackDecoderAdapter::ListenerAdapter::OnHeader(HpackEntryType entry_type, - const HpackString& name, +void HpackDecoderAdapter::ListenerAdapter::OnHeader(const HpackString& name, const HpackString& value) { SPDY_DVLOG(2) << "HpackDecoderAdapter::ListenerAdapter::OnHeader:\n name: " << name << "\n value: " << value; @@ -178,16 +176,17 @@ } int64_t HpackDecoderAdapter::ListenerAdapter::OnEntryInserted( - const http2::HpackStringPair& sp, + const http2::HpackStringPair& entry, size_t insert_count) { SPDY_DVLOG(2) << "HpackDecoderAdapter::ListenerAdapter::OnEntryInserted: " - << sp << ", insert_count=" << insert_count; + << entry << ", insert_count=" << insert_count; if (visitor_ == nullptr) { return 0; } - HpackEntry entry(sp.name.ToStringPiece(), sp.value.ToStringPiece(), - /*is_static*/ false, insert_count); - int64_t time_added = visitor_->OnNewEntry(entry); + HpackEntry hpack_entry(entry.name.ToStringPiece(), + entry.value.ToStringPiece(), + /*is_static*/ false, insert_count); + int64_t time_added = visitor_->OnNewEntry(hpack_entry); SPDY_DVLOG(2) << "HpackDecoderAdapter::ListenerAdapter::OnEntryInserted: time_added=" << time_added; @@ -195,17 +194,18 @@ } void HpackDecoderAdapter::ListenerAdapter::OnUseEntry( - const http2::HpackStringPair& sp, + const http2::HpackStringPair& entry, size_t insert_count, int64_t time_added) { - SPDY_DVLOG(2) << "HpackDecoderAdapter::ListenerAdapter::OnUseEntry: " << sp + SPDY_DVLOG(2) << "HpackDecoderAdapter::ListenerAdapter::OnUseEntry: " << entry << ", insert_count=" << insert_count << ", time_added=" << time_added; if (visitor_ != nullptr) { - HpackEntry entry(sp.name.ToStringPiece(), sp.value.ToStringPiece(), - /*is_static*/ false, insert_count); - entry.set_time_added(time_added); - visitor_->OnUseEntry(entry); + HpackEntry hpack_entry(entry.name.ToStringPiece(), + entry.value.ToStringPiece(), /*is_static*/ false, + insert_count); + hpack_entry.set_time_added(time_added); + visitor_->OnUseEntry(hpack_entry); } }
diff --git a/spdy/core/hpack/hpack_decoder_adapter.h b/spdy/core/hpack/hpack_decoder_adapter.h index 17c4461..cdea661 100644 --- a/spdy/core/hpack/hpack_decoder_adapter.h +++ b/spdy/core/hpack/hpack_decoder_adapter.h
@@ -105,8 +105,7 @@ // Override the HpackDecoderListener methods: void OnHeaderListStart() override; - void OnHeader(http2::HpackEntryType entry_type, - const http2::HpackString& name, + void OnHeader(const http2::HpackString& name, const http2::HpackString& value) override; void OnHeaderListEnd() override; void OnHeaderErrorDetected(SpdyStringPiece error_message) override; @@ -116,7 +115,7 @@ size_t insert_count) override; void OnUseEntry(const http2::HpackStringPair& entry, size_t insert_count, - int64_t insert_time) override; + int64_t time_added) override; void AddToTotalHpackBytes(size_t delta) { total_hpack_bytes_ += delta; } size_t total_hpack_bytes() const { return total_hpack_bytes_; }
diff --git a/spdy/core/hpack/hpack_decoder_adapter_test.cc b/spdy/core/hpack/hpack_decoder_adapter_test.cc index 73c33eb..88318fb 100644 --- a/spdy/core/hpack/hpack_decoder_adapter_test.cc +++ b/spdy/core/hpack/hpack_decoder_adapter_test.cc
@@ -66,8 +66,7 @@ : decoder_(decoder) {} void HandleHeaderRepresentation(SpdyStringPiece name, SpdyStringPiece value) { - decoder_->listener_adapter_.OnHeader(HpackEntryType::kIndexedLiteralHeader, - HpackString(name), HpackString(value)); + decoder_->listener_adapter_.OnHeader(HpackString(name), HpackString(value)); } http2::HpackDecoderTables* GetDecoderTables() {
diff --git a/spdy/core/hpack/hpack_encoder_test.cc b/spdy/core/hpack/hpack_encoder_test.cc index b905214..a878866 100644 --- a/spdy/core/hpack/hpack_encoder_test.cc +++ b/spdy/core/hpack/hpack_encoder_test.cc
@@ -326,7 +326,7 @@ headers[static_->name()] = static_->value(); CompareWithExpectedEncoding(headers); - EXPECT_EQ(0u, peer_.table_peer().dynamic_entries()->size()); + EXPECT_EQ(0, peer_.table_peer().dynamic_entries()->size()); } TEST_P(HpackEncoderTest, SingleLiteralWithIndexName) {