gfe-relnote: (n/a) Platformize logging for http2. Refactor only, no behavior change.
Note on merge: http2/platform/impl/http2_logging_impl.h also needs to be merged to Chromium.
PiperOrigin-RevId: 237381363
Change-Id: I98a69eaeca7ac1353054120681e18e99a73c63c4
diff --git a/http2/test_tools/frame_parts.cc b/http2/test_tools/frame_parts.cc
index 3d0453e..d550788 100644
--- a/http2/test_tools/frame_parts.cc
+++ b/http2/test_tools/frame_parts.cc
@@ -6,10 +6,10 @@
#include <type_traits>
-#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/http2_structures_test_util.h"
+#include "net/third_party/quiche/src/http2/platform/api/http2_logging.h"
#include "net/third_party/quiche/src/http2/platform/api/http2_string_utils.h"
#include "net/third_party/quiche/src/http2/platform/api/http2_test_helpers.h"
@@ -48,12 +48,12 @@
} // namespace
FrameParts::FrameParts(const Http2FrameHeader& header) : frame_header_(header) {
- VLOG(1) << "FrameParts, header: " << frame_header_;
+ HTTP2_VLOG(1) << "FrameParts, header: " << frame_header_;
}
FrameParts::FrameParts(const Http2FrameHeader& header, Http2StringPiece payload)
: FrameParts(header) {
- VLOG(1) << "FrameParts with payload.size() = " << payload.size();
+ HTTP2_VLOG(1) << "FrameParts with payload.size() = " << payload.size();
this->payload_.append(payload.data(), payload.size());
opt_payload_length_ = payload.size();
}
@@ -61,7 +61,7 @@
Http2StringPiece payload,
size_t total_pad_length)
: FrameParts(header, payload) {
- VLOG(1) << "FrameParts with total_pad_length=" << total_pad_length;
+ HTTP2_VLOG(1) << "FrameParts with total_pad_length=" << total_pad_length;
SetTotalPadLength(total_pad_length);
}
@@ -110,9 +110,10 @@
}
if (opt_pad_length_) {
- VLOG(1) << "SetTotalPadLength: pad_length=" << opt_pad_length_.value();
+ HTTP2_VLOG(1) << "SetTotalPadLength: pad_length="
+ << opt_pad_length_.value();
} else {
- VLOG(1) << "SetTotalPadLength: has no pad length";
+ HTTP2_VLOG(1) << "SetTotalPadLength: has no pad length";
}
}
@@ -130,33 +131,33 @@
}
void FrameParts::OnDataStart(const Http2FrameHeader& header) {
- VLOG(1) << "OnDataStart: " << header;
+ HTTP2_VLOG(1) << "OnDataStart: " << header;
ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::DATA)) << *this;
opt_payload_length_ = header.payload_length;
}
void FrameParts::OnDataPayload(const char* data, size_t len) {
- VLOG(1) << "OnDataPayload: len=" << len
- << "; frame_header_: " << frame_header_;
+ HTTP2_VLOG(1) << "OnDataPayload: len=" << len
+ << "; frame_header_: " << frame_header_;
ASSERT_TRUE(InFrameOfType(Http2FrameType::DATA)) << *this;
ASSERT_TRUE(AppendString(Http2StringPiece(data, len), &payload_,
&opt_payload_length_));
}
void FrameParts::OnDataEnd() {
- VLOG(1) << "OnDataEnd; frame_header_: " << frame_header_;
+ HTTP2_VLOG(1) << "OnDataEnd; frame_header_: " << frame_header_;
ASSERT_TRUE(EndFrameOfType(Http2FrameType::DATA)) << *this;
}
void FrameParts::OnHeadersStart(const Http2FrameHeader& header) {
- VLOG(1) << "OnHeadersStart: " << header;
+ HTTP2_VLOG(1) << "OnHeadersStart: " << header;
ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::HEADERS)) << *this;
opt_payload_length_ = header.payload_length;
}
void FrameParts::OnHeadersPriority(const Http2PriorityFields& priority) {
- VLOG(1) << "OnHeadersPriority: priority: " << priority
- << "; frame_header_: " << frame_header_;
+ HTTP2_VLOG(1) << "OnHeadersPriority: priority: " << priority
+ << "; frame_header_: " << frame_header_;
ASSERT_TRUE(InFrameOfType(Http2FrameType::HEADERS)) << *this;
ASSERT_FALSE(opt_priority_);
opt_priority_ = priority;
@@ -166,8 +167,8 @@
}
void FrameParts::OnHpackFragment(const char* data, size_t len) {
- VLOG(1) << "OnHpackFragment: len=" << len
- << "; frame_header_: " << frame_header_;
+ HTTP2_VLOG(1) << "OnHpackFragment: len=" << len
+ << "; frame_header_: " << frame_header_;
ASSERT_TRUE(got_start_callback_);
ASSERT_FALSE(got_end_callback_);
ASSERT_TRUE(FrameCanHaveHpackPayload(frame_header_)) << *this;
@@ -176,13 +177,13 @@
}
void FrameParts::OnHeadersEnd() {
- VLOG(1) << "OnHeadersEnd; frame_header_: " << frame_header_;
+ HTTP2_VLOG(1) << "OnHeadersEnd; frame_header_: " << frame_header_;
ASSERT_TRUE(EndFrameOfType(Http2FrameType::HEADERS)) << *this;
}
void FrameParts::OnPriorityFrame(const Http2FrameHeader& header,
const Http2PriorityFields& priority) {
- VLOG(1) << "OnPriorityFrame: " << header << "; priority: " << priority;
+ HTTP2_VLOG(1) << "OnPriorityFrame: " << header << "; priority: " << priority;
ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::PRIORITY)) << *this;
ASSERT_FALSE(opt_priority_);
opt_priority_ = priority;
@@ -190,18 +191,18 @@
}
void FrameParts::OnContinuationStart(const Http2FrameHeader& header) {
- VLOG(1) << "OnContinuationStart: " << header;
+ HTTP2_VLOG(1) << "OnContinuationStart: " << header;
ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::CONTINUATION)) << *this;
opt_payload_length_ = header.payload_length;
}
void FrameParts::OnContinuationEnd() {
- VLOG(1) << "OnContinuationEnd; frame_header_: " << frame_header_;
+ HTTP2_VLOG(1) << "OnContinuationEnd; frame_header_: " << frame_header_;
ASSERT_TRUE(EndFrameOfType(Http2FrameType::CONTINUATION)) << *this;
}
void FrameParts::OnPadLength(size_t trailing_length) {
- VLOG(1) << "OnPadLength: trailing_length=" << trailing_length;
+ HTTP2_VLOG(1) << "OnPadLength: trailing_length=" << trailing_length;
ASSERT_TRUE(InPaddedFrame()) << *this;
ASSERT_FALSE(opt_pad_length_);
ASSERT_TRUE(opt_payload_length_);
@@ -212,7 +213,7 @@
}
void FrameParts::OnPadding(const char* pad, size_t skipped_length) {
- VLOG(1) << "OnPadding: skipped_length=" << skipped_length;
+ HTTP2_VLOG(1) << "OnPadding: skipped_length=" << skipped_length;
ASSERT_TRUE(InPaddedFrame()) << *this;
ASSERT_TRUE(opt_pad_length_);
ASSERT_TRUE(AppendString(Http2StringPiece(pad, skipped_length), &padding_,
@@ -221,7 +222,7 @@
void FrameParts::OnRstStream(const Http2FrameHeader& header,
Http2ErrorCode error_code) {
- VLOG(1) << "OnRstStream: " << header << "; code=" << error_code;
+ HTTP2_VLOG(1) << "OnRstStream: " << header << "; code=" << error_code;
ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::RST_STREAM)) << *this;
ASSERT_FALSE(opt_rst_stream_error_code_);
opt_rst_stream_error_code_ = error_code;
@@ -229,25 +230,25 @@
}
void FrameParts::OnSettingsStart(const Http2FrameHeader& header) {
- VLOG(1) << "OnSettingsStart: " << header;
+ HTTP2_VLOG(1) << "OnSettingsStart: " << header;
ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::SETTINGS)) << *this;
ASSERT_EQ(0u, settings_.size());
ASSERT_FALSE(header.IsAck()) << header;
}
void FrameParts::OnSetting(const Http2SettingFields& setting_fields) {
- VLOG(1) << "OnSetting: " << setting_fields;
+ HTTP2_VLOG(1) << "OnSetting: " << setting_fields;
ASSERT_TRUE(InFrameOfType(Http2FrameType::SETTINGS)) << *this;
settings_.push_back(setting_fields);
}
void FrameParts::OnSettingsEnd() {
- VLOG(1) << "OnSettingsEnd; frame_header_: " << frame_header_;
+ HTTP2_VLOG(1) << "OnSettingsEnd; frame_header_: " << frame_header_;
ASSERT_TRUE(EndFrameOfType(Http2FrameType::SETTINGS)) << *this;
}
void FrameParts::OnSettingsAck(const Http2FrameHeader& header) {
- VLOG(1) << "OnSettingsAck: " << header;
+ HTTP2_VLOG(1) << "OnSettingsAck: " << header;
ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::SETTINGS)) << *this;
ASSERT_EQ(0u, settings_.size());
ASSERT_TRUE(header.IsAck());
@@ -257,8 +258,9 @@
void FrameParts::OnPushPromiseStart(const Http2FrameHeader& header,
const Http2PushPromiseFields& promise,
size_t total_padding_length) {
- VLOG(1) << "OnPushPromiseStart header: " << header << "; promise: " << promise
- << "; total_padding_length: " << total_padding_length;
+ HTTP2_VLOG(1) << "OnPushPromiseStart header: " << header
+ << "; promise: " << promise
+ << "; total_padding_length: " << total_padding_length;
ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::PUSH_PROMISE)) << *this;
ASSERT_GE(header.payload_length, Http2PushPromiseFields::EncodedSize());
opt_payload_length_ =
@@ -274,13 +276,13 @@
}
void FrameParts::OnPushPromiseEnd() {
- VLOG(1) << "OnPushPromiseEnd; frame_header_: " << frame_header_;
+ HTTP2_VLOG(1) << "OnPushPromiseEnd; frame_header_: " << frame_header_;
ASSERT_TRUE(EndFrameOfType(Http2FrameType::PUSH_PROMISE)) << *this;
}
void FrameParts::OnPing(const Http2FrameHeader& header,
const Http2PingFields& ping) {
- VLOG(1) << "OnPing header: " << header << " ping: " << ping;
+ HTTP2_VLOG(1) << "OnPing header: " << header << " ping: " << ping;
ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::PING)) << *this;
ASSERT_FALSE(header.IsAck());
ASSERT_FALSE(opt_ping_);
@@ -290,7 +292,7 @@
void FrameParts::OnPingAck(const Http2FrameHeader& header,
const Http2PingFields& ping) {
- VLOG(1) << "OnPingAck header: " << header << " ping: " << ping;
+ HTTP2_VLOG(1) << "OnPingAck header: " << header << " ping: " << ping;
ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::PING)) << *this;
ASSERT_TRUE(header.IsAck());
ASSERT_FALSE(opt_ping_);
@@ -300,7 +302,7 @@
void FrameParts::OnGoAwayStart(const Http2FrameHeader& header,
const Http2GoAwayFields& goaway) {
- VLOG(1) << "OnGoAwayStart: " << goaway;
+ HTTP2_VLOG(1) << "OnGoAwayStart: " << goaway;
ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::GOAWAY)) << *this;
ASSERT_FALSE(opt_goaway_);
opt_goaway_ = goaway;
@@ -309,21 +311,21 @@
}
void FrameParts::OnGoAwayOpaqueData(const char* data, size_t len) {
- VLOG(1) << "OnGoAwayOpaqueData: len=" << len;
+ HTTP2_VLOG(1) << "OnGoAwayOpaqueData: len=" << len;
ASSERT_TRUE(InFrameOfType(Http2FrameType::GOAWAY)) << *this;
ASSERT_TRUE(AppendString(Http2StringPiece(data, len), &payload_,
&opt_payload_length_));
}
void FrameParts::OnGoAwayEnd() {
- VLOG(1) << "OnGoAwayEnd; frame_header_: " << frame_header_;
+ HTTP2_VLOG(1) << "OnGoAwayEnd; frame_header_: " << frame_header_;
ASSERT_TRUE(EndFrameOfType(Http2FrameType::GOAWAY)) << *this;
}
void FrameParts::OnWindowUpdate(const Http2FrameHeader& header,
uint32_t increment) {
- VLOG(1) << "OnWindowUpdate header: " << header
- << " increment=" << increment;
+ HTTP2_VLOG(1) << "OnWindowUpdate header: " << header
+ << " increment=" << increment;
ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::WINDOW_UPDATE)) << *this;
ASSERT_FALSE(opt_window_update_increment_);
opt_window_update_increment_ = increment;
@@ -333,9 +335,9 @@
void FrameParts::OnAltSvcStart(const Http2FrameHeader& header,
size_t origin_length,
size_t value_length) {
- VLOG(1) << "OnAltSvcStart: " << header
- << " origin_length: " << origin_length
- << " value_length: " << value_length;
+ HTTP2_VLOG(1) << "OnAltSvcStart: " << header
+ << " origin_length: " << origin_length
+ << " value_length: " << value_length;
ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::ALTSVC)) << *this;
ASSERT_FALSE(opt_altsvc_origin_length_);
opt_altsvc_origin_length_ = origin_length;
@@ -344,26 +346,26 @@
}
void FrameParts::OnAltSvcOriginData(const char* data, size_t len) {
- VLOG(1) << "OnAltSvcOriginData: len=" << len;
+ HTTP2_VLOG(1) << "OnAltSvcOriginData: len=" << len;
ASSERT_TRUE(InFrameOfType(Http2FrameType::ALTSVC)) << *this;
ASSERT_TRUE(AppendString(Http2StringPiece(data, len), &altsvc_origin_,
&opt_altsvc_origin_length_));
}
void FrameParts::OnAltSvcValueData(const char* data, size_t len) {
- VLOG(1) << "OnAltSvcValueData: len=" << len;
+ HTTP2_VLOG(1) << "OnAltSvcValueData: len=" << len;
ASSERT_TRUE(InFrameOfType(Http2FrameType::ALTSVC)) << *this;
ASSERT_TRUE(AppendString(Http2StringPiece(data, len), &altsvc_value_,
&opt_altsvc_value_length_));
}
void FrameParts::OnAltSvcEnd() {
- VLOG(1) << "OnAltSvcEnd; frame_header_: " << frame_header_;
+ HTTP2_VLOG(1) << "OnAltSvcEnd; frame_header_: " << frame_header_;
ASSERT_TRUE(EndFrameOfType(Http2FrameType::ALTSVC)) << *this;
}
void FrameParts::OnUnknownStart(const Http2FrameHeader& header) {
- VLOG(1) << "OnUnknownStart: " << header;
+ HTTP2_VLOG(1) << "OnUnknownStart: " << header;
ASSERT_FALSE(IsSupportedHttp2FrameType(header.type)) << header;
ASSERT_FALSE(got_start_callback_);
ASSERT_EQ(frame_header_, header);
@@ -372,7 +374,7 @@
}
void FrameParts::OnUnknownPayload(const char* data, size_t len) {
- VLOG(1) << "OnUnknownPayload: len=" << len;
+ HTTP2_VLOG(1) << "OnUnknownPayload: len=" << len;
ASSERT_FALSE(IsSupportedHttp2FrameType(frame_header_.type)) << *this;
ASSERT_TRUE(got_start_callback_);
ASSERT_FALSE(got_end_callback_);
@@ -381,7 +383,7 @@
}
void FrameParts::OnUnknownEnd() {
- VLOG(1) << "OnUnknownEnd; frame_header_: " << frame_header_;
+ HTTP2_VLOG(1) << "OnUnknownEnd; frame_header_: " << frame_header_;
ASSERT_FALSE(IsSupportedHttp2FrameType(frame_header_.type)) << *this;
ASSERT_TRUE(got_start_callback_);
ASSERT_FALSE(got_end_callback_);
@@ -390,8 +392,8 @@
void FrameParts::OnPaddingTooLong(const Http2FrameHeader& header,
size_t missing_length) {
- VLOG(1) << "OnPaddingTooLong: " << header
- << "; missing_length: " << missing_length;
+ HTTP2_VLOG(1) << "OnPaddingTooLong: " << header
+ << "; missing_length: " << missing_length;
ASSERT_EQ(frame_header_, header);
ASSERT_FALSE(got_end_callback_);
ASSERT_TRUE(FrameIsPadded(header));
@@ -403,7 +405,7 @@
}
void FrameParts::OnFrameSizeError(const Http2FrameHeader& header) {
- VLOG(1) << "OnFrameSizeError: " << header;
+ HTTP2_VLOG(1) << "OnFrameSizeError: " << header;
ASSERT_EQ(frame_header_, header);
ASSERT_FALSE(got_end_callback_);
ASSERT_FALSE(has_frame_size_error_);
diff --git a/http2/test_tools/frame_parts.h b/http2/test_tools/frame_parts.h
index b531174..5a7d872 100644
--- a/http2/test_tools/frame_parts.h
+++ b/http2/test_tools/frame_parts.h
@@ -15,11 +15,11 @@
#include <cstdint>
#include <vector>
-#include "base/logging.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "net/third_party/quiche/src/http2/decoder/http2_frame_decoder_listener.h"
#include "net/third_party/quiche/src/http2/http2_constants.h"
#include "net/third_party/quiche/src/http2/http2_structures.h"
+#include "net/third_party/quiche/src/http2/platform/api/http2_logging.h"
#include "net/third_party/quiche/src/http2/platform/api/http2_optional.h"
#include "net/third_party/quiche/src/http2/platform/api/http2_string.h"
#include "net/third_party/quiche/src/http2/platform/api/http2_string_piece.h"
diff --git a/http2/test_tools/frame_parts_collector.cc b/http2/test_tools/frame_parts_collector.cc
index be4d986..cb0e32b 100644
--- a/http2/test_tools/frame_parts_collector.cc
+++ b/http2/test_tools/frame_parts_collector.cc
@@ -6,9 +6,9 @@
#include <utility>
-#include "base/logging.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "net/third_party/quiche/src/http2/http2_structures_test_util.h"
+#include "net/third_party/quiche/src/http2/platform/api/http2_logging.h"
#include "net/third_party/quiche/src/http2/platform/api/http2_ptr_util.h"
namespace http2 {
diff --git a/http2/test_tools/frame_parts_collector_listener.cc b/http2/test_tools/frame_parts_collector_listener.cc
index 8d9da78..a7c3ecc 100644
--- a/http2/test_tools/frame_parts_collector_listener.cc
+++ b/http2/test_tools/frame_parts_collector_listener.cc
@@ -4,95 +4,95 @@
#include "net/third_party/quiche/src/http2/test_tools/frame_parts_collector_listener.h"
-#include "base/logging.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "net/third_party/quiche/src/http2/platform/api/http2_logging.h"
namespace http2 {
namespace test {
bool FramePartsCollectorListener::OnFrameHeader(
const Http2FrameHeader& header) {
- VLOG(1) << "OnFrameHeader: " << header;
+ HTTP2_VLOG(1) << "OnFrameHeader: " << header;
ExpectFrameHeader(header);
return true;
}
void FramePartsCollectorListener::OnDataStart(const Http2FrameHeader& header) {
- VLOG(1) << "OnDataStart: " << header;
+ HTTP2_VLOG(1) << "OnDataStart: " << header;
StartFrame(header)->OnDataStart(header);
}
void FramePartsCollectorListener::OnDataPayload(const char* data, size_t len) {
- VLOG(1) << "OnDataPayload: len=" << len;
+ HTTP2_VLOG(1) << "OnDataPayload: len=" << len;
CurrentFrame()->OnDataPayload(data, len);
}
void FramePartsCollectorListener::OnDataEnd() {
- VLOG(1) << "OnDataEnd";
+ HTTP2_VLOG(1) << "OnDataEnd";
EndFrame()->OnDataEnd();
}
void FramePartsCollectorListener::OnHeadersStart(
const Http2FrameHeader& header) {
- VLOG(1) << "OnHeadersStart: " << header;
+ HTTP2_VLOG(1) << "OnHeadersStart: " << header;
StartFrame(header)->OnHeadersStart(header);
}
void FramePartsCollectorListener::OnHeadersPriority(
const Http2PriorityFields& priority) {
- VLOG(1) << "OnHeadersPriority: " << priority;
+ HTTP2_VLOG(1) << "OnHeadersPriority: " << priority;
CurrentFrame()->OnHeadersPriority(priority);
}
void FramePartsCollectorListener::OnHpackFragment(const char* data,
size_t len) {
- VLOG(1) << "OnHpackFragment: len=" << len;
+ HTTP2_VLOG(1) << "OnHpackFragment: len=" << len;
CurrentFrame()->OnHpackFragment(data, len);
}
void FramePartsCollectorListener::OnHeadersEnd() {
- VLOG(1) << "OnHeadersEnd";
+ HTTP2_VLOG(1) << "OnHeadersEnd";
EndFrame()->OnHeadersEnd();
}
void FramePartsCollectorListener::OnPriorityFrame(
const Http2FrameHeader& header,
const Http2PriorityFields& priority_fields) {
- VLOG(1) << "OnPriority: " << header << "; " << priority_fields;
+ HTTP2_VLOG(1) << "OnPriority: " << header << "; " << priority_fields;
StartAndEndFrame(header)->OnPriorityFrame(header, priority_fields);
}
void FramePartsCollectorListener::OnContinuationStart(
const Http2FrameHeader& header) {
- VLOG(1) << "OnContinuationStart: " << header;
+ HTTP2_VLOG(1) << "OnContinuationStart: " << header;
StartFrame(header)->OnContinuationStart(header);
}
void FramePartsCollectorListener::OnContinuationEnd() {
- VLOG(1) << "OnContinuationEnd";
+ HTTP2_VLOG(1) << "OnContinuationEnd";
EndFrame()->OnContinuationEnd();
}
void FramePartsCollectorListener::OnPadLength(size_t pad_length) {
- VLOG(1) << "OnPadLength: " << pad_length;
+ HTTP2_VLOG(1) << "OnPadLength: " << pad_length;
CurrentFrame()->OnPadLength(pad_length);
}
void FramePartsCollectorListener::OnPadding(const char* padding,
size_t skipped_length) {
- VLOG(1) << "OnPadding: " << skipped_length;
+ HTTP2_VLOG(1) << "OnPadding: " << skipped_length;
CurrentFrame()->OnPadding(padding, skipped_length);
}
void FramePartsCollectorListener::OnRstStream(const Http2FrameHeader& header,
Http2ErrorCode error_code) {
- VLOG(1) << "OnRstStream: " << header << "; error_code=" << error_code;
+ HTTP2_VLOG(1) << "OnRstStream: " << header << "; error_code=" << error_code;
StartAndEndFrame(header)->OnRstStream(header, error_code);
}
void FramePartsCollectorListener::OnSettingsStart(
const Http2FrameHeader& header) {
- VLOG(1) << "OnSettingsStart: " << header;
+ HTTP2_VLOG(1) << "OnSettingsStart: " << header;
EXPECT_EQ(Http2FrameType::SETTINGS, header.type) << header;
EXPECT_EQ(Http2FrameFlag(), header.flags) << header;
StartFrame(header)->OnSettingsStart(header);
@@ -100,18 +100,18 @@
void FramePartsCollectorListener::OnSetting(
const Http2SettingFields& setting_fields) {
- VLOG(1) << "Http2SettingFields: setting_fields=" << setting_fields;
+ HTTP2_VLOG(1) << "Http2SettingFields: setting_fields=" << setting_fields;
CurrentFrame()->OnSetting(setting_fields);
}
void FramePartsCollectorListener::OnSettingsEnd() {
- VLOG(1) << "OnSettingsEnd";
+ HTTP2_VLOG(1) << "OnSettingsEnd";
EndFrame()->OnSettingsEnd();
}
void FramePartsCollectorListener::OnSettingsAck(
const Http2FrameHeader& header) {
- VLOG(1) << "OnSettingsAck: " << header;
+ HTTP2_VLOG(1) << "OnSettingsAck: " << header;
StartAndEndFrame(header)->OnSettingsAck(header);
}
@@ -119,52 +119,53 @@
const Http2FrameHeader& header,
const Http2PushPromiseFields& promise,
size_t total_padding_length) {
- VLOG(1) << "OnPushPromiseStart header: " << header << " promise: " << promise
- << " total_padding_length: " << total_padding_length;
+ HTTP2_VLOG(1) << "OnPushPromiseStart header: " << header
+ << " promise: " << promise
+ << " total_padding_length: " << total_padding_length;
EXPECT_EQ(Http2FrameType::PUSH_PROMISE, header.type);
StartFrame(header)->OnPushPromiseStart(header, promise, total_padding_length);
}
void FramePartsCollectorListener::OnPushPromiseEnd() {
- VLOG(1) << "OnPushPromiseEnd";
+ HTTP2_VLOG(1) << "OnPushPromiseEnd";
EndFrame()->OnPushPromiseEnd();
}
void FramePartsCollectorListener::OnPing(const Http2FrameHeader& header,
const Http2PingFields& ping) {
- VLOG(1) << "OnPing: " << header << "; " << ping;
+ HTTP2_VLOG(1) << "OnPing: " << header << "; " << ping;
StartAndEndFrame(header)->OnPing(header, ping);
}
void FramePartsCollectorListener::OnPingAck(const Http2FrameHeader& header,
const Http2PingFields& ping) {
- VLOG(1) << "OnPingAck: " << header << "; " << ping;
+ HTTP2_VLOG(1) << "OnPingAck: " << header << "; " << ping;
StartAndEndFrame(header)->OnPingAck(header, ping);
}
void FramePartsCollectorListener::OnGoAwayStart(
const Http2FrameHeader& header,
const Http2GoAwayFields& goaway) {
- VLOG(1) << "OnGoAwayStart header: " << header << "; goaway: " << goaway;
+ HTTP2_VLOG(1) << "OnGoAwayStart header: " << header << "; goaway: " << goaway;
StartFrame(header)->OnGoAwayStart(header, goaway);
}
void FramePartsCollectorListener::OnGoAwayOpaqueData(const char* data,
size_t len) {
- VLOG(1) << "OnGoAwayOpaqueData: len=" << len;
+ HTTP2_VLOG(1) << "OnGoAwayOpaqueData: len=" << len;
CurrentFrame()->OnGoAwayOpaqueData(data, len);
}
void FramePartsCollectorListener::OnGoAwayEnd() {
- VLOG(1) << "OnGoAwayEnd";
+ HTTP2_VLOG(1) << "OnGoAwayEnd";
EndFrame()->OnGoAwayEnd();
}
void FramePartsCollectorListener::OnWindowUpdate(
const Http2FrameHeader& header,
uint32_t window_size_increment) {
- VLOG(1) << "OnWindowUpdate: " << header
- << "; window_size_increment=" << window_size_increment;
+ HTTP2_VLOG(1) << "OnWindowUpdate: " << header
+ << "; window_size_increment=" << window_size_increment;
EXPECT_EQ(Http2FrameType::WINDOW_UPDATE, header.type);
StartAndEndFrame(header)->OnWindowUpdate(header, window_size_increment);
}
@@ -172,57 +173,57 @@
void FramePartsCollectorListener::OnAltSvcStart(const Http2FrameHeader& header,
size_t origin_length,
size_t value_length) {
- VLOG(1) << "OnAltSvcStart header: " << header
- << "; origin_length=" << origin_length
- << "; value_length=" << value_length;
+ HTTP2_VLOG(1) << "OnAltSvcStart header: " << header
+ << "; origin_length=" << origin_length
+ << "; value_length=" << value_length;
StartFrame(header)->OnAltSvcStart(header, origin_length, value_length);
}
void FramePartsCollectorListener::OnAltSvcOriginData(const char* data,
size_t len) {
- VLOG(1) << "OnAltSvcOriginData: len=" << len;
+ HTTP2_VLOG(1) << "OnAltSvcOriginData: len=" << len;
CurrentFrame()->OnAltSvcOriginData(data, len);
}
void FramePartsCollectorListener::OnAltSvcValueData(const char* data,
size_t len) {
- VLOG(1) << "OnAltSvcValueData: len=" << len;
+ HTTP2_VLOG(1) << "OnAltSvcValueData: len=" << len;
CurrentFrame()->OnAltSvcValueData(data, len);
}
void FramePartsCollectorListener::OnAltSvcEnd() {
- VLOG(1) << "OnAltSvcEnd";
+ HTTP2_VLOG(1) << "OnAltSvcEnd";
EndFrame()->OnAltSvcEnd();
}
void FramePartsCollectorListener::OnUnknownStart(
const Http2FrameHeader& header) {
- VLOG(1) << "OnUnknownStart: " << header;
+ HTTP2_VLOG(1) << "OnUnknownStart: " << header;
StartFrame(header)->OnUnknownStart(header);
}
void FramePartsCollectorListener::OnUnknownPayload(const char* data,
size_t len) {
- VLOG(1) << "OnUnknownPayload: len=" << len;
+ HTTP2_VLOG(1) << "OnUnknownPayload: len=" << len;
CurrentFrame()->OnUnknownPayload(data, len);
}
void FramePartsCollectorListener::OnUnknownEnd() {
- VLOG(1) << "OnUnknownEnd";
+ HTTP2_VLOG(1) << "OnUnknownEnd";
EndFrame()->OnUnknownEnd();
}
void FramePartsCollectorListener::OnPaddingTooLong(
const Http2FrameHeader& header,
size_t missing_length) {
- VLOG(1) << "OnPaddingTooLong: " << header
- << " missing_length: " << missing_length;
+ HTTP2_VLOG(1) << "OnPaddingTooLong: " << header
+ << " missing_length: " << missing_length;
EndFrame()->OnPaddingTooLong(header, missing_length);
}
void FramePartsCollectorListener::OnFrameSizeError(
const Http2FrameHeader& header) {
- VLOG(1) << "OnFrameSizeError: " << header;
+ HTTP2_VLOG(1) << "OnFrameSizeError: " << header;
FrameError(header)->OnFrameSizeError(header);
}
diff --git a/http2/test_tools/http2_random.cc b/http2/test_tools/http2_random.cc
index fc577f4..81c0366 100644
--- a/http2/test_tools/http2_random.cc
+++ b/http2/test_tools/http2_random.cc
@@ -1,6 +1,6 @@
#include "net/third_party/quiche/src/http2/test_tools/http2_random.h"
-#include "base/logging.h"
+#include "net/third_party/quiche/src/http2/platform/api/http2_logging.h"
#include "net/third_party/quiche/src/http2/platform/api/http2_string_utils.h"
#include "third_party/boringssl/src/include/openssl/chacha.h"
#include "third_party/boringssl/src/include/openssl/rand.h"
@@ -13,7 +13,7 @@
Http2Random::Http2Random() {
RAND_bytes(key_, sizeof(key_));
- LOG(INFO) << "Initialized test RNG with the following key: " << Key();
+ HTTP2_LOG(INFO) << "Initialized test RNG with the following key: " << Key();
}
Http2Random::Http2Random(Http2StringPiece key) {
