gfe-relnote: (n/a) Platformize logging for spdy. Refactor only, no behavior change.
Note on merge: spdy/platform/impl/spdy_logging_impl.h also needs to be merged to Chromium.
PiperOrigin-RevId: 237328904
Change-Id: I8834e0c0bc004f545337b14d1c76f2b578fc1745
diff --git a/spdy/core/hpack/hpack_constants.cc b/spdy/core/hpack/hpack_constants.cc
index 9c1498a..77cae3a 100644
--- a/spdy/core/hpack/hpack_constants.cc
+++ b/spdy/core/hpack/hpack_constants.cc
@@ -8,10 +8,10 @@
#include <memory>
#include <vector>
-#include "base/logging.h"
#include "net/third_party/quiche/src/spdy/core/hpack/hpack_huffman_table.h"
#include "net/third_party/quiche/src/spdy/core/hpack/hpack_static_table.h"
#include "net/third_party/quiche/src/spdy/platform/api/spdy_arraysize.h"
+#include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h"
namespace spdy {
diff --git a/spdy/core/hpack/hpack_decoder_adapter.cc b/spdy/core/hpack/hpack_decoder_adapter.cc
index 309af39..ad05b1f 100644
--- a/spdy/core/hpack/hpack_decoder_adapter.cc
+++ b/spdy/core/hpack/hpack_decoder_adapter.cc
@@ -4,10 +4,10 @@
#include "net/third_party/quiche/src/spdy/core/hpack/hpack_decoder_adapter.h"
-#include "base/logging.h"
#include "net/third_party/quiche/src/http2/decoder/decode_buffer.h"
#include "net/third_party/quiche/src/http2/decoder/decode_status.h"
#include "net/third_party/quiche/src/spdy/platform/api/spdy_estimate_memory_usage.h"
+#include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h"
using ::http2::DecodeBuffer;
using ::http2::HpackEntryType;
@@ -26,13 +26,13 @@
HpackDecoderAdapter::~HpackDecoderAdapter() = default;
void HpackDecoderAdapter::ApplyHeaderTableSizeSetting(size_t size_setting) {
- DVLOG(2) << "HpackDecoderAdapter::ApplyHeaderTableSizeSetting";
+ SPDY_DVLOG(2) << "HpackDecoderAdapter::ApplyHeaderTableSizeSetting";
hpack_decoder_.ApplyHeaderTableSizeSetting(size_setting);
}
void HpackDecoderAdapter::HandleControlFrameHeadersStart(
SpdyHeadersHandlerInterface* handler) {
- DVLOG(2) << "HpackDecoderAdapter::HandleControlFrameHeadersStart";
+ SPDY_DVLOG(2) << "HpackDecoderAdapter::HandleControlFrameHeadersStart";
DCHECK(!header_block_started_);
listener_adapter_.set_handler(handler);
}
@@ -40,8 +40,8 @@
bool HpackDecoderAdapter::HandleControlFrameHeadersData(
const char* headers_data,
size_t headers_data_length) {
- DVLOG(2) << "HpackDecoderAdapter::HandleControlFrameHeadersData: len="
- << headers_data_length;
+ SPDY_DVLOG(2) << "HpackDecoderAdapter::HandleControlFrameHeadersData: len="
+ << headers_data_length;
if (!header_block_started_) {
// Initialize the decoding process here rather than in
// HandleControlFrameHeadersStart because that method is not always called.
@@ -58,8 +58,9 @@
if (headers_data_length > 0) {
DCHECK_NE(headers_data, nullptr);
if (headers_data_length > max_decode_buffer_size_bytes_) {
- DVLOG(1) << "max_decode_buffer_size_bytes_ < headers_data_length: "
- << max_decode_buffer_size_bytes_ << " < " << headers_data_length;
+ SPDY_DVLOG(1) << "max_decode_buffer_size_bytes_ < headers_data_length: "
+ << max_decode_buffer_size_bytes_ << " < "
+ << headers_data_length;
return false;
}
listener_adapter_.AddToTotalHpackBytes(headers_data_length);
@@ -73,12 +74,12 @@
bool HpackDecoderAdapter::HandleControlFrameHeadersComplete(
size_t* compressed_len) {
- DVLOG(2) << "HpackDecoderAdapter::HandleControlFrameHeadersComplete";
+ SPDY_DVLOG(2) << "HpackDecoderAdapter::HandleControlFrameHeadersComplete";
if (compressed_len != nullptr) {
*compressed_len = listener_adapter_.total_hpack_bytes();
}
if (!hpack_decoder_.EndDecodingBlock()) {
- DVLOG(3) << "EndDecodingBlock returned false";
+ SPDY_DVLOG(3) << "EndDecodingBlock returned false";
return false;
}
header_block_started_ = false;
@@ -91,7 +92,7 @@
void HpackDecoderAdapter::SetHeaderTableDebugVisitor(
std::unique_ptr<HpackHeaderTable::DebugVisitorInterface> visitor) {
- DVLOG(2) << "HpackDecoderAdapter::SetHeaderTableDebugVisitor";
+ SPDY_DVLOG(2) << "HpackDecoderAdapter::SetHeaderTableDebugVisitor";
if (visitor != nullptr) {
listener_adapter_.SetHeaderTableDebugVisitor(std::move(visitor));
hpack_decoder_.set_tables_debug_listener(&listener_adapter_);
@@ -103,7 +104,7 @@
void HpackDecoderAdapter::set_max_decode_buffer_size_bytes(
size_t max_decode_buffer_size_bytes) {
- DVLOG(2) << "HpackDecoderAdapter::set_max_decode_buffer_size_bytes";
+ SPDY_DVLOG(2) << "HpackDecoderAdapter::set_max_decode_buffer_size_bytes";
max_decode_buffer_size_bytes_ = max_decode_buffer_size_bytes;
hpack_decoder_.set_max_string_size_bytes(max_decode_buffer_size_bytes);
}
@@ -126,7 +127,7 @@
}
void HpackDecoderAdapter::ListenerAdapter::OnHeaderListStart() {
- DVLOG(2) << "HpackDecoderAdapter::ListenerAdapter::OnHeaderListStart";
+ SPDY_DVLOG(2) << "HpackDecoderAdapter::ListenerAdapter::OnHeaderListStart";
total_hpack_bytes_ = 0;
total_uncompressed_bytes_ = 0;
decoded_block_.clear();
@@ -138,21 +139,21 @@
void HpackDecoderAdapter::ListenerAdapter::OnHeader(HpackEntryType entry_type,
const HpackString& name,
const HpackString& value) {
- DVLOG(2) << "HpackDecoderAdapter::ListenerAdapter::OnHeader:\n name: " << name
- << "\n value: " << value;
+ SPDY_DVLOG(2) << "HpackDecoderAdapter::ListenerAdapter::OnHeader:\n name: "
+ << name << "\n value: " << value;
total_uncompressed_bytes_ += name.size() + value.size();
if (handler_ == nullptr) {
- DVLOG(3) << "Adding to decoded_block";
+ SPDY_DVLOG(3) << "Adding to decoded_block";
decoded_block_.AppendValueOrAddHeader(name.ToStringPiece(),
value.ToStringPiece());
} else {
- DVLOG(3) << "Passing to handler";
+ SPDY_DVLOG(3) << "Passing to handler";
handler_->OnHeader(name.ToStringPiece(), value.ToStringPiece());
}
}
void HpackDecoderAdapter::ListenerAdapter::OnHeaderListEnd() {
- DVLOG(2) << "HpackDecoderAdapter::ListenerAdapter::OnHeaderListEnd";
+ SPDY_DVLOG(2) << "HpackDecoderAdapter::ListenerAdapter::OnHeaderListEnd";
// We don't clear the SpdyHeaderBlock here to allow access to it until the
// next HPACK block is decoded.
if (handler_ != nullptr) {
@@ -163,21 +164,21 @@
void HpackDecoderAdapter::ListenerAdapter::OnHeaderErrorDetected(
SpdyStringPiece error_message) {
- VLOG(1) << error_message;
+ SPDY_VLOG(1) << error_message;
}
int64_t HpackDecoderAdapter::ListenerAdapter::OnEntryInserted(
const http2::HpackStringPair& sp,
size_t insert_count) {
- DVLOG(2) << "HpackDecoderAdapter::ListenerAdapter::OnEntryInserted: " << sp
- << ", insert_count=" << insert_count;
+ SPDY_DVLOG(2) << "HpackDecoderAdapter::ListenerAdapter::OnEntryInserted: "
+ << sp << ", 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);
- DVLOG(2)
+ SPDY_DVLOG(2)
<< "HpackDecoderAdapter::ListenerAdapter::OnEntryInserted: time_added="
<< time_added;
return time_added;
@@ -187,9 +188,9 @@
const http2::HpackStringPair& sp,
size_t insert_count,
int64_t time_added) {
- DVLOG(2) << "HpackDecoderAdapter::ListenerAdapter::OnUseEntry: " << sp
- << ", insert_count=" << insert_count
- << ", time_added=" << time_added;
+ SPDY_DVLOG(2) << "HpackDecoderAdapter::ListenerAdapter::OnUseEntry: " << sp
+ << ", insert_count=" << insert_count
+ << ", time_added=" << time_added;
if (visitor_ != nullptr) {
HpackEntry entry(sp.name.ToStringPiece(), sp.value.ToStringPiece(),
/*is_static*/ false, insert_count);
diff --git a/spdy/core/hpack/hpack_decoder_adapter.h b/spdy/core/hpack/hpack_decoder_adapter.h
index b497fe7..d54cf1e 100644
--- a/spdy/core/hpack/hpack_decoder_adapter.h
+++ b/spdy/core/hpack/hpack_decoder_adapter.h
@@ -13,7 +13,6 @@
#include <cstdint>
#include <memory>
-#include "base/macros.h"
#include "net/third_party/quiche/src/http2/hpack/decoder/hpack_decoder.h"
#include "net/third_party/quiche/src/http2/hpack/decoder/hpack_decoder_listener.h"
#include "net/third_party/quiche/src/http2/hpack/decoder/hpack_decoder_tables.h"
diff --git a/spdy/core/hpack/hpack_decoder_adapter_test.cc b/spdy/core/hpack/hpack_decoder_adapter_test.cc
index 9c94126..0d952d1 100644
--- a/spdy/core/hpack/hpack_decoder_adapter_test.cc
+++ b/spdy/core/hpack/hpack_decoder_adapter_test.cc
@@ -12,7 +12,6 @@
#include <utility>
#include <vector>
-#include "base/logging.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "net/third_party/quiche/src/http2/hpack/decoder/hpack_decoder_state.h"
@@ -24,6 +23,7 @@
#include "net/third_party/quiche/src/spdy/core/hpack/hpack_output_stream.h"
#include "net/third_party/quiche/src/spdy/core/spdy_test_utils.h"
#include "net/third_party/quiche/src/spdy/platform/api/spdy_arraysize.h"
+#include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h"
#include "net/third_party/quiche/src/spdy/platform/api/spdy_string.h"
#include "net/third_party/quiche/src/spdy/platform/api/spdy_string_utils.h"
@@ -135,7 +135,7 @@
}
bool HandleControlFrameHeadersData(SpdyStringPiece str) {
- VLOG(3) << "HandleControlFrameHeadersData:\n" << SpdyHexDump(str);
+ SPDY_VLOG(3) << "HandleControlFrameHeadersData:\n" << SpdyHexDump(str);
bytes_passed_in_ += str.size();
return decoder_.HandleControlFrameHeadersData(str.data(), str.size());
}
@@ -260,12 +260,14 @@
};
INSTANTIATE_TEST_SUITE_P(
- NoHandler, HpackDecoderAdapterTest,
+ NoHandler,
+ HpackDecoderAdapterTest,
::testing::Combine(::testing::Values(START_WITHOUT_HANDLER, NO_START),
::testing::Bool()));
INSTANTIATE_TEST_SUITE_P(
- WithHandler, HpackDecoderAdapterTest,
+ WithHandler,
+ HpackDecoderAdapterTest,
::testing::Combine(::testing::Values(START_WITH_HANDLER),
::testing::Bool()));
diff --git a/spdy/core/hpack/hpack_encoder.cc b/spdy/core/hpack/hpack_encoder.cc
index a9981b9..d76ead0 100644
--- a/spdy/core/hpack/hpack_encoder.cc
+++ b/spdy/core/hpack/hpack_encoder.cc
@@ -7,12 +7,12 @@
#include <algorithm>
#include <limits>
-#include "base/logging.h"
#include "net/third_party/quiche/src/spdy/core/hpack/hpack_constants.h"
#include "net/third_party/quiche/src/spdy/core/hpack/hpack_header_table.h"
#include "net/third_party/quiche/src/spdy/core/hpack/hpack_huffman_table.h"
#include "net/third_party/quiche/src/spdy/core/hpack/hpack_output_stream.h"
#include "net/third_party/quiche/src/spdy/platform/api/spdy_estimate_memory_usage.h"
+#include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h"
#include "net/third_party/quiche/src/spdy/platform/api/spdy_ptr_util.h"
namespace spdy {
@@ -155,22 +155,22 @@
}
void HpackEncoder::EmitIndex(const HpackEntry* entry) {
- DVLOG(2) << "Emitting index " << header_table_.IndexOf(entry);
+ SPDY_DVLOG(2) << "Emitting index " << header_table_.IndexOf(entry);
output_stream_.AppendPrefix(kIndexedOpcode);
output_stream_.AppendUint32(header_table_.IndexOf(entry));
}
void HpackEncoder::EmitIndexedLiteral(const Representation& representation) {
- DVLOG(2) << "Emitting indexed literal: (" << representation.first << ", "
- << representation.second << ")";
+ SPDY_DVLOG(2) << "Emitting indexed literal: (" << representation.first << ", "
+ << representation.second << ")";
output_stream_.AppendPrefix(kLiteralIncrementalIndexOpcode);
EmitLiteral(representation);
header_table_.TryAddEntry(representation.first, representation.second);
}
void HpackEncoder::EmitNonIndexedLiteral(const Representation& representation) {
- DVLOG(2) << "Emitting nonindexed literal: (" << representation.first << ", "
- << representation.second << ")";
+ SPDY_DVLOG(2) << "Emitting nonindexed literal: (" << representation.first
+ << ", " << representation.second << ")";
output_stream_.AppendPrefix(kLiteralNoIndexOpcode);
output_stream_.AppendUint32(0);
EmitString(representation.first);
@@ -192,12 +192,13 @@
size_t encoded_size =
enable_compression_ ? huffman_table_.EncodedSize(str) : str.size();
if (encoded_size < str.size()) {
- DVLOG(2) << "Emitted Huffman-encoded string of length " << encoded_size;
+ SPDY_DVLOG(2) << "Emitted Huffman-encoded string of length "
+ << encoded_size;
output_stream_.AppendPrefix(kStringLiteralHuffmanEncoded);
output_stream_.AppendUint32(encoded_size);
huffman_table_.EncodeString(str, &output_stream_);
} else {
- DVLOG(2) << "Emitted literal string of length " << str.size();
+ SPDY_DVLOG(2) << "Emitted literal string of length " << str.size();
output_stream_.AppendPrefix(kStringLiteralIdentityEncoded);
output_stream_.AppendUint32(str.size());
output_stream_.AppendBytes(str);
@@ -209,9 +210,9 @@
return;
}
const size_t current_size = CurrentHeaderTableSizeSetting();
- DVLOG(1) << "MaybeEmitTableSize current_size=" << current_size;
- DVLOG(1) << "MaybeEmitTableSize min_table_size_setting_received_="
- << min_table_size_setting_received_;
+ SPDY_DVLOG(1) << "MaybeEmitTableSize current_size=" << current_size;
+ SPDY_DVLOG(1) << "MaybeEmitTableSize min_table_size_setting_received_="
+ << min_table_size_setting_received_;
if (min_table_size_setting_received_ < current_size) {
output_stream_.AppendPrefix(kHeaderTableSizeUpdateOpcode);
output_stream_.AppendUint32(min_table_size_setting_received_);
diff --git a/spdy/core/hpack/hpack_encoder.h b/spdy/core/hpack/hpack_encoder.h
index 486d536..c0cf968 100644
--- a/spdy/core/hpack/hpack_encoder.h
+++ b/spdy/core/hpack/hpack_encoder.h
@@ -13,7 +13,6 @@
#include <utility>
#include <vector>
-#include "base/macros.h"
#include "net/third_party/quiche/src/spdy/core/hpack/hpack_header_table.h"
#include "net/third_party/quiche/src/spdy/core/hpack/hpack_output_stream.h"
#include "net/third_party/quiche/src/spdy/core/spdy_protocol.h"
diff --git a/spdy/core/hpack/hpack_encoder_test.cc b/spdy/core/hpack/hpack_encoder_test.cc
index 7d7d37d..a4f763c 100644
--- a/spdy/core/hpack/hpack_encoder_test.cc
+++ b/spdy/core/hpack/hpack_encoder_test.cc
@@ -207,7 +207,8 @@
bool use_incremental_;
};
-INSTANTIATE_TEST_SUITE_P(HpackEncoderTests, HpackEncoderTest,
+INSTANTIATE_TEST_SUITE_P(HpackEncoderTests,
+ HpackEncoderTest,
::testing::Bool());
TEST_P(HpackEncoderTest, SingleDynamicIndex) {
diff --git a/spdy/core/hpack/hpack_entry.cc b/spdy/core/hpack/hpack_entry.cc
index 90d53e6..46e6086 100644
--- a/spdy/core/hpack/hpack_entry.cc
+++ b/spdy/core/hpack/hpack_entry.cc
@@ -4,8 +4,8 @@
#include "net/third_party/quiche/src/spdy/core/hpack/hpack_entry.h"
-#include "base/logging.h"
#include "net/third_party/quiche/src/spdy/platform/api/spdy_estimate_memory_usage.h"
+#include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h"
#include "net/third_party/quiche/src/spdy/platform/api/spdy_string_utils.h"
namespace spdy {
diff --git a/spdy/core/hpack/hpack_entry.h b/spdy/core/hpack/hpack_entry.h
index 28dee47..61103fd 100644
--- a/spdy/core/hpack/hpack_entry.h
+++ b/spdy/core/hpack/hpack_entry.h
@@ -8,7 +8,6 @@
#include <cstddef>
#include <cstdint>
-#include "base/macros.h"
#include "net/third_party/quiche/src/spdy/platform/api/spdy_export.h"
#include "net/third_party/quiche/src/spdy/platform/api/spdy_string.h"
#include "net/third_party/quiche/src/spdy/platform/api/spdy_string_piece.h"
diff --git a/spdy/core/hpack/hpack_header_table.cc b/spdy/core/hpack/hpack_header_table.cc
index dbe565f..17f91cd 100644
--- a/spdy/core/hpack/hpack_header_table.cc
+++ b/spdy/core/hpack/hpack_header_table.cc
@@ -6,11 +6,11 @@
#include <algorithm>
-#include "base/logging.h"
#include "net/third_party/quiche/src/spdy/core/hpack/hpack_constants.h"
#include "net/third_party/quiche/src/spdy/core/hpack/hpack_static_table.h"
#include "net/third_party/quiche/src/spdy/platform/api/spdy_containers.h"
#include "net/third_party/quiche/src/spdy/platform/api/spdy_estimate_memory_usage.h"
+#include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h"
namespace spdy {
@@ -202,9 +202,9 @@
if (!index_result.second) {
// An entry with the same name and value already exists in the dynamic
// index. We should replace it with the newly added entry.
- DVLOG(1) << "Found existing entry: "
- << (*index_result.first)->GetDebugString()
- << " replacing with: " << new_entry->GetDebugString();
+ SPDY_DVLOG(1) << "Found existing entry: "
+ << (*index_result.first)->GetDebugString()
+ << " replacing with: " << new_entry->GetDebugString();
DCHECK_GT(new_entry->InsertionIndex(),
(*index_result.first)->InsertionIndex());
dynamic_index_.erase(index_result.first);
@@ -216,9 +216,9 @@
if (!name_result.second) {
// An entry with the same name already exists in the dynamic index. We
// should replace it with the newly added entry.
- DVLOG(1) << "Found existing entry: "
- << name_result.first->second->GetDebugString()
- << " replacing with: " << new_entry->GetDebugString();
+ SPDY_DVLOG(1) << "Found existing entry: "
+ << name_result.first->second->GetDebugString()
+ << " replacing with: " << new_entry->GetDebugString();
DCHECK_GT(new_entry->InsertionIndex(),
name_result.first->second->InsertionIndex());
dynamic_name_index_.erase(name_result.first);
@@ -233,35 +233,35 @@
// Call |debug_visitor_->OnNewEntry()| to get the current time.
HpackEntry& entry = dynamic_entries_.front();
entry.set_time_added(debug_visitor_->OnNewEntry(entry));
- DVLOG(2) << "HpackHeaderTable::OnNewEntry: name=" << entry.name()
- << ", value=" << entry.value()
- << ", insert_index=" << entry.InsertionIndex()
- << ", time_added=" << entry.time_added();
+ SPDY_DVLOG(2) << "HpackHeaderTable::OnNewEntry: name=" << entry.name()
+ << ", value=" << entry.value()
+ << ", insert_index=" << entry.InsertionIndex()
+ << ", time_added=" << entry.time_added();
}
return &dynamic_entries_.front();
}
void HpackHeaderTable::DebugLogTableState() const {
- DVLOG(2) << "Dynamic table:";
+ SPDY_DVLOG(2) << "Dynamic table:";
for (auto it = dynamic_entries_.begin(); it != dynamic_entries_.end(); ++it) {
- DVLOG(2) << " " << it->GetDebugString();
+ SPDY_DVLOG(2) << " " << it->GetDebugString();
}
- DVLOG(2) << "Full Static Index:";
+ SPDY_DVLOG(2) << "Full Static Index:";
for (const auto* entry : static_index_) {
- DVLOG(2) << " " << entry->GetDebugString();
+ SPDY_DVLOG(2) << " " << entry->GetDebugString();
}
- DVLOG(2) << "Full Static Name Index:";
+ SPDY_DVLOG(2) << "Full Static Name Index:";
for (const auto it : static_name_index_) {
- DVLOG(2) << " " << it.first << ": " << it.second->GetDebugString();
+ SPDY_DVLOG(2) << " " << it.first << ": " << it.second->GetDebugString();
}
- DVLOG(2) << "Full Dynamic Index:";
+ SPDY_DVLOG(2) << "Full Dynamic Index:";
for (const auto* entry : dynamic_index_) {
- DVLOG(2) << " " << entry->GetDebugString();
+ SPDY_DVLOG(2) << " " << entry->GetDebugString();
}
- DVLOG(2) << "Full Dynamic Name Index:";
+ SPDY_DVLOG(2) << "Full Dynamic Name Index:";
for (const auto it : dynamic_name_index_) {
- DVLOG(2) << " " << it.first << ": " << it.second->GetDebugString();
+ SPDY_DVLOG(2) << " " << it.first << ": " << it.second->GetDebugString();
}
}
diff --git a/spdy/core/hpack/hpack_header_table.h b/spdy/core/hpack/hpack_header_table.h
index e85edb7..7ff49f3 100644
--- a/spdy/core/hpack/hpack_header_table.h
+++ b/spdy/core/hpack/hpack_header_table.h
@@ -10,7 +10,6 @@
#include <deque>
#include <memory>
-#include "base/macros.h"
#include "net/third_party/quiche/src/spdy/core/hpack/hpack_entry.h"
#include "net/third_party/quiche/src/spdy/platform/api/spdy_containers.h"
#include "net/third_party/quiche/src/spdy/platform/api/spdy_export.h"
diff --git a/spdy/core/hpack/hpack_header_table_test.cc b/spdy/core/hpack/hpack_header_table_test.cc
index b032aba..6649cc2 100644
--- a/spdy/core/hpack/hpack_header_table_test.cc
+++ b/spdy/core/hpack/hpack_header_table_test.cc
@@ -9,7 +9,6 @@
#include <set>
#include <vector>
-#include "base/macros.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "net/third_party/quiche/src/spdy/core/hpack/hpack_constants.h"
#include "net/third_party/quiche/src/spdy/core/hpack/hpack_entry.h"
diff --git a/spdy/core/hpack/hpack_huffman_table.cc b/spdy/core/hpack/hpack_huffman_table.cc
index c917767..3c637a4 100644
--- a/spdy/core/hpack/hpack_huffman_table.cc
+++ b/spdy/core/hpack/hpack_huffman_table.cc
@@ -9,9 +9,9 @@
#include <limits>
#include <memory>
-#include "base/logging.h"
#include "net/third_party/quiche/src/spdy/core/hpack/hpack_output_stream.h"
#include "net/third_party/quiche/src/spdy/platform/api/spdy_estimate_memory_usage.h"
+#include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h"
namespace spdy {
diff --git a/spdy/core/hpack/hpack_huffman_table_test.cc b/spdy/core/hpack/hpack_huffman_table_test.cc
index f30926c..2febbd8 100644
--- a/spdy/core/hpack/hpack_huffman_table_test.cc
+++ b/spdy/core/hpack/hpack_huffman_table_test.cc
@@ -6,7 +6,6 @@
#include <utility>
-#include "base/macros.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "net/third_party/quiche/src/http2/hpack/huffman/hpack_huffman_decoder.h"
diff --git a/spdy/core/hpack/hpack_output_stream.cc b/spdy/core/hpack/hpack_output_stream.cc
index 30b5662..fc01c3f 100644
--- a/spdy/core/hpack/hpack_output_stream.cc
+++ b/spdy/core/hpack/hpack_output_stream.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/logging.h"
#include "net/third_party/quiche/src/spdy/platform/api/spdy_estimate_memory_usage.h"
+#include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h"
namespace spdy {
diff --git a/spdy/core/hpack/hpack_output_stream.h b/spdy/core/hpack/hpack_output_stream.h
index 450803f..0163146 100644
--- a/spdy/core/hpack/hpack_output_stream.h
+++ b/spdy/core/hpack/hpack_output_stream.h
@@ -8,7 +8,6 @@
#include <cstdint>
#include <map>
-#include "base/macros.h"
#include "net/third_party/quiche/src/spdy/core/hpack/hpack_constants.h"
#include "net/third_party/quiche/src/spdy/platform/api/spdy_export.h"
#include "net/third_party/quiche/src/spdy/platform/api/spdy_string.h"
diff --git a/spdy/core/hpack/hpack_round_trip_test.cc b/spdy/core/hpack/hpack_round_trip_test.cc
index bd4d6ee..17477a7 100644
--- a/spdy/core/hpack/hpack_round_trip_test.cc
+++ b/spdy/core/hpack/hpack_round_trip_test.cc
@@ -78,8 +78,10 @@
HpackDecoderAdapter decoder_;
};
-INSTANTIATE_TEST_SUITE_P(Tests, HpackRoundTripTest,
- ::testing::Values(ALL_INPUT, ONE_BYTE,
+INSTANTIATE_TEST_SUITE_P(Tests,
+ HpackRoundTripTest,
+ ::testing::Values(ALL_INPUT,
+ ONE_BYTE,
ZERO_THEN_ONE_BYTE));
TEST_P(HpackRoundTripTest, ResponseFixtures) {
diff --git a/spdy/core/hpack/hpack_static_table.cc b/spdy/core/hpack/hpack_static_table.cc
index 14e282e..eea1d9e 100644
--- a/spdy/core/hpack/hpack_static_table.cc
+++ b/spdy/core/hpack/hpack_static_table.cc
@@ -4,10 +4,10 @@
#include "net/third_party/quiche/src/spdy/core/hpack/hpack_static_table.h"
-#include "base/logging.h"
#include "net/third_party/quiche/src/spdy/core/hpack/hpack_constants.h"
#include "net/third_party/quiche/src/spdy/core/hpack/hpack_entry.h"
#include "net/third_party/quiche/src/spdy/platform/api/spdy_estimate_memory_usage.h"
+#include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h"
#include "net/third_party/quiche/src/spdy/platform/api/spdy_string_piece.h"
namespace spdy {
