Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(663)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/spdy/spdy_deframer_visitor.cc

Issue 2561963002: base: Remove the string logging from CHECK(). (Closed)
Patch Set: checkstring: rebase Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/autofill/form_structure_browsertest.cc ('K') | « net/spdy/fuzzing/hpack_fuzz_mutator.cc ('k') | net/spdy/spdy_stream.cc » ('j') | remoting/host/curtain_mode_mac.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_deframer_visitor.cc
diff --git a/net/spdy/spdy_deframer_visitor.cc b/net/spdy/spdy_deframer_visitor.cc
index 40ff7f522269dc0857d27da4c537aedca39bbb8f..2f541f3fe798325a75f2b9b7a8ea989aee15767f 100644
--- a/net/spdy/spdy_deframer_visitor.cc
+++ b/net/spdy/spdy_deframer_visitor.cc
@@ -285,9 +285,8 @@ void SpdyTestDeframerImpl::AtGoAwayEnd() {
void SpdyTestDeframerImpl::AtHeadersEnd() {
DVLOG(1) << "AtDataEnd";
- CHECK(frame_type_ == HEADERS || frame_type_ == CONTINUATION)
- << " frame_type_=" << Http2FrameTypeToString(frame_type_);
- CHECK(end_) << " frame_type_=" << Http2FrameTypeToString(frame_type_);
+ CHECK(frame_type_ == HEADERS || frame_type_ == CONTINUATION);
+ CHECK(end_);
CHECK(got_hpack_end_);
CHECK(headers_ir_);
@@ -313,9 +312,8 @@ void SpdyTestDeframerImpl::AtHeadersEnd() {
void SpdyTestDeframerImpl::AtPushPromiseEnd() {
DVLOG(1) << "AtDataEnd";
- CHECK(frame_type_ == PUSH_PROMISE || frame_type_ == CONTINUATION)
- << " frame_type_=" << Http2FrameTypeToString(frame_type_);
- CHECK(end_) << " frame_type_=" << Http2FrameTypeToString(frame_type_);
+ CHECK(frame_type_ == PUSH_PROMISE || frame_type_ == CONTINUATION);
+ CHECK(end_);
CHECK(push_promise_ir_);
CHECK(headers_);
@@ -416,8 +414,7 @@ void SpdyTestDeframerImpl::OnAltSvc(
StringPiece origin,
const SpdyAltSvcWireFormat::AlternativeServiceVector& altsvc_vector) {
DVLOG(1) << "OnAltSvc stream_id: " << stream_id;
- CHECK_EQ(frame_type_, UNSET) << " frame_type_="
- << Http2FrameTypeToString(frame_type_);
+ CHECK_EQ(frame_type_, UNSET);
CHECK_GT(stream_id, 0u);
auto ptr = MakeUnique<SpdyAltSvcIR>(stream_id);
ptr->set_origin(origin.as_string());
@@ -436,8 +433,7 @@ void SpdyTestDeframerImpl::OnAltSvc(
// other backends can take more input.
void SpdyTestDeframerImpl::OnBlocked(SpdyStreamId stream_id) {
LOG(FATAL) << "OnBlocked stream_id: " << stream_id;
- CHECK_EQ(frame_type_, UNSET) << " frame_type_="
- << Http2FrameTypeToString(frame_type_);
+ CHECK_EQ(frame_type_, UNSET);
CHECK_GT(stream_id, 0u);
frame_type_ = UNSET;
stream_id_ = stream_id;
@@ -449,8 +445,7 @@ void SpdyTestDeframerImpl::OnBlocked(SpdyStreamId stream_id) {
// SpdyFramer ensures that the behavior is correct before calling the visitor.
void SpdyTestDeframerImpl::OnContinuation(SpdyStreamId stream_id, bool end) {
DVLOG(1) << "OnContinuation stream_id: " << stream_id;
- CHECK_EQ(frame_type_, UNSET) << " frame_type_="
- << Http2FrameTypeToString(frame_type_);
+ CHECK_EQ(frame_type_, UNSET);
CHECK_GT(stream_id, 0u);
CHECK_NE(nullptr, headers_.get());
frame_type_ = CONTINUATION;
@@ -466,8 +461,7 @@ void SpdyTestDeframerImpl::OnDataFrameHeader(SpdyStreamId stream_id,
size_t length,
bool fin) {
DVLOG(1) << "OnDataFrameHeader stream_id: " << stream_id;
- CHECK_EQ(frame_type_, UNSET) << " frame_type_="
- << Http2FrameTypeToString(frame_type_);
+ CHECK_EQ(frame_type_, UNSET);
CHECK_GT(stream_id, 0u);
CHECK_EQ(data_.get(), nullptr);
frame_type_ = DATA;
@@ -495,8 +489,7 @@ void SpdyTestDeframerImpl::OnGoAway(SpdyStreamId last_good_stream_id,
SpdyGoAwayStatus status) {
DVLOG(1) << "OnGoAway last_good_stream_id: " << last_good_stream_id
<< " status: " << status;
- CHECK_EQ(frame_type_, UNSET) << " frame_type_="
- << Http2FrameTypeToString(frame_type_);
+ CHECK_EQ(frame_type_, UNSET);
frame_type_ = GOAWAY;
goaway_ir_ = MakeUnique<SpdyGoAwayIR>(last_good_stream_id, status, "");
goaway_description_.reset(new string());
@@ -506,8 +499,7 @@ void SpdyTestDeframerImpl::OnGoAway(SpdyStreamId last_good_stream_id,
bool SpdyTestDeframerImpl::OnGoAwayFrameData(const char* goaway_data,
size_t len) {
DVLOG(1) << "OnGoAwayFrameData";
- CHECK_EQ(frame_type_, GOAWAY) << " frame_type_="
- << Http2FrameTypeToString(frame_type_);
+ CHECK_EQ(frame_type_, GOAWAY);
CHECK(goaway_description_);
StringPiece(goaway_data, len).AppendToString(goaway_description_.get());
return true;
@@ -539,8 +531,7 @@ void SpdyTestDeframerImpl::OnHeaders(SpdyStreamId stream_id,
bool fin,
bool end) {
DVLOG(1) << "OnHeaders stream_id: " << stream_id;
- CHECK_EQ(frame_type_, UNSET) << " frame_type_="
- << Http2FrameTypeToString(frame_type_);
+ CHECK_EQ(frame_type_, UNSET);
CHECK_GT(stream_id, 0u);
frame_type_ = HEADERS;
@@ -568,8 +559,7 @@ void SpdyTestDeframerImpl::OnHeaders(SpdyStreamId stream_id,
void SpdyTestDeframerImpl::OnPing(uint64_t unique_id, bool is_ack) {
DVLOG(1) << "OnPing unique_id: " << unique_id
<< " is_ack: " << (is_ack ? "true" : "false");
- CHECK_EQ(frame_type_, UNSET) << " frame_type_="
- << Http2FrameTypeToString(frame_type_);
+ CHECK_EQ(frame_type_, UNSET);
auto ptr = MakeUnique<SpdyPingIR>(unique_id);
if (is_ack) {
ptr->set_is_ack(is_ack);
@@ -584,8 +574,7 @@ void SpdyTestDeframerImpl::OnPriority(SpdyStreamId stream_id,
int weight,
bool exclusive) {
DVLOG(1) << "OnPriority stream_id: " << stream_id;
- CHECK_EQ(frame_type_, UNSET) << " frame_type_="
- << Http2FrameTypeToString(frame_type_);
+ CHECK_EQ(frame_type_, UNSET);
CHECK_GT(stream_id, 0u);
listener_->OnPriority(MakeUnique<SpdyPriorityIR>(stream_id, parent_stream_id,
@@ -596,8 +585,7 @@ void SpdyTestDeframerImpl::OnPushPromise(SpdyStreamId stream_id,
SpdyStreamId promised_stream_id,
bool end) {
DVLOG(1) << "OnPushPromise stream_id: " << stream_id;
- CHECK_EQ(frame_type_, UNSET) << " frame_type_="
- << Http2FrameTypeToString(frame_type_);
+ CHECK_EQ(frame_type_, UNSET);
CHECK_GT(stream_id, 0u);
frame_type_ = PUSH_PROMISE;
@@ -616,8 +604,7 @@ void SpdyTestDeframerImpl::OnRstStream(SpdyStreamId stream_id,
SpdyRstStreamStatus status) {
DVLOG(1) << "OnRstStream stream_id: " << stream_id
<< " status: " << status;
- CHECK_EQ(frame_type_, UNSET) << " frame_type_="
- << Http2FrameTypeToString(frame_type_);
+ CHECK_EQ(frame_type_, UNSET);
CHECK_GT(stream_id, 0u);
listener_->OnRstStream(MakeUnique<SpdyRstStreamIR>(stream_id, status));
@@ -641,8 +628,7 @@ void SpdyTestDeframerImpl::OnSetting(SpdySettingsIds id,
uint32_t value) {
DVLOG(1) << "OnSetting id: " << id << std::hex << " flags: " << flags
<< " value: " << value;
- CHECK_EQ(frame_type_, SETTINGS) << " frame_type_="
- << Http2FrameTypeToString(frame_type_);
+ CHECK_EQ(frame_type_, SETTINGS);
CHECK(settings_);
settings_->push_back(std::make_pair(id, value));
settings_ir_->AddSetting(id, true, true, value);
@@ -654,8 +640,7 @@ void SpdyTestDeframerImpl::OnSetting(SpdySettingsIds id,
// The |clear_persisted| flag is a pre-HTTP/2 remnant.
void SpdyTestDeframerImpl::OnSettings(bool /*clear_persisted*/) {
DVLOG(1) << "OnSettings";
- CHECK_EQ(frame_type_, UNSET) << " frame_type_="
- << Http2FrameTypeToString(frame_type_);
+ CHECK_EQ(frame_type_, UNSET);
CHECK_EQ(nullptr, settings_ir_.get());
CHECK_EQ(nullptr, settings_.get());
frame_type_ = SETTINGS;
@@ -667,8 +652,7 @@ void SpdyTestDeframerImpl::OnSettings(bool /*clear_persisted*/) {
void SpdyTestDeframerImpl::OnSettingsAck() {
DVLOG(1) << "OnSettingsAck";
- CHECK_EQ(frame_type_, UNSET) << " frame_type_="
- << Http2FrameTypeToString(frame_type_);
+ CHECK_EQ(frame_type_, UNSET);
auto ptr = MakeUnique<SpdySettingsIR>();
ptr->set_is_ack(true);
listener_->OnSettingsAck(std::move(ptr));
@@ -676,8 +660,7 @@ void SpdyTestDeframerImpl::OnSettingsAck() {
void SpdyTestDeframerImpl::OnSettingsEnd() {
DVLOG(1) << "OnSettingsEnd";
- CHECK_EQ(frame_type_, SETTINGS) << " frame_type_="
- << Http2FrameTypeToString(frame_type_);
+ CHECK_EQ(frame_type_, SETTINGS);
CHECK(!ack_);
CHECK_NE(nullptr, settings_ir_.get());
CHECK_NE(nullptr, settings_.get());
@@ -693,8 +676,7 @@ void SpdyTestDeframerImpl::OnStreamEnd(SpdyStreamId stream_id) {
DVLOG(1) << "OnStreamEnd stream_id: " << stream_id;
CHECK_EQ(stream_id_, stream_id);
CHECK(frame_type_ == DATA || frame_type_ == HEADERS ||
- frame_type_ == CONTINUATION)
- << " frame_type_=" << Http2FrameTypeToString(frame_type_);
+ frame_type_ == CONTINUATION);
CHECK(fin_);
}
@@ -719,13 +701,12 @@ void SpdyTestDeframerImpl::OnStreamFrameData(SpdyStreamId stream_id,
void SpdyTestDeframerImpl::OnStreamPadding(SpdyStreamId stream_id, size_t len) {
DVLOG(1) << "OnStreamPadding stream_id: " << stream_id << " len: " << len;
CHECK(frame_type_ == DATA || frame_type_ == HEADERS ||
- frame_type_ == PUSH_PROMISE)
- << " frame_type_=" << Http2FrameTypeToString(frame_type_);
+ frame_type_ == PUSH_PROMISE);
CHECK_EQ(stream_id_, stream_id);
CHECK_LE(1u, len);
CHECK_GE(255u, len);
padding_len_ += len;
- CHECK_LE(padding_len_, 256u) << "len=" << len;
+ CHECK_LE(padding_len_, 256u);
}
// WINDOW_UPDATE is supposed to be hop-by-hop, according to the spec.
@@ -736,8 +717,7 @@ void SpdyTestDeframerImpl::OnWindowUpdate(SpdyStreamId stream_id,
int delta_window_size) {
DVLOG(1) << "OnWindowUpdate stream_id: " << stream_id
<< " delta_window_size: " << delta_window_size;
- CHECK_EQ(frame_type_, UNSET) << " frame_type_="
- << Http2FrameTypeToString(frame_type_);
+ CHECK_EQ(frame_type_, UNSET);
CHECK_NE(0, delta_window_size);
listener_->OnWindowUpdate(
@@ -751,8 +731,7 @@ void SpdyTestDeframerImpl::OnWindowUpdate(SpdyStreamId stream_id,
bool SpdyTestDeframerImpl::OnUnknownFrame(SpdyStreamId stream_id,
int frame_type) {
DVLOG(1) << "OnAltSvc stream_id: " << stream_id;
- CHECK_EQ(frame_type_, UNSET) << " frame_type_="
- << Http2FrameTypeToString(frame_type_);
+ CHECK_EQ(frame_type_, UNSET);
frame_type_ = UNKNOWN;
stream_id_ = stream_id;
@@ -762,8 +741,7 @@ bool SpdyTestDeframerImpl::OnUnknownFrame(SpdyStreamId stream_id,
// Callbacks defined in SpdyHeadersHandlerInterface.
void SpdyTestDeframerImpl::OnHeaderBlockStart() {
- CHECK(frame_type_ == HEADERS || frame_type_ == PUSH_PROMISE)
- << " frame_type_=" << Http2FrameTypeToString(frame_type_);
+ CHECK(frame_type_ == HEADERS || frame_type_ == PUSH_PROMISE);
CHECK(headers_);
CHECK_EQ(0u, headers_->size());
got_hpack_end_ = false;
@@ -771,8 +749,7 @@ void SpdyTestDeframerImpl::OnHeaderBlockStart() {
void SpdyTestDeframerImpl::OnHeader(StringPiece key, StringPiece value) {
CHECK(frame_type_ == HEADERS || frame_type_ == CONTINUATION ||
- frame_type_ == PUSH_PROMISE)
- << " frame_type_=" << Http2FrameTypeToString(frame_type_);
+ frame_type_ == PUSH_PROMISE);
CHECK(!got_hpack_end_);
CHECK(headers_);
headers_->emplace_back(key.as_string(), value.as_string());
@@ -783,8 +760,7 @@ void SpdyTestDeframerImpl::OnHeader(StringPiece key, StringPiece value) {
void SpdyTestDeframerImpl::OnHeaderBlockEnd(size_t header_bytes_parsed) {
CHECK(headers_);
CHECK(frame_type_ == HEADERS || frame_type_ == CONTINUATION ||
- frame_type_ == PUSH_PROMISE)
- << " frame_type_=" << Http2FrameTypeToString(frame_type_);
+ frame_type_ == PUSH_PROMISE);
CHECK(end_);
CHECK(!got_hpack_end_);
got_hpack_end_ = true;
@@ -795,8 +771,7 @@ void SpdyTestDeframerImpl::OnHeaderBlockEnd(
size_t /* compressed_header_bytes_parsed */) {
CHECK(headers_);
CHECK(frame_type_ == HEADERS || frame_type_ == CONTINUATION ||
- frame_type_ == PUSH_PROMISE)
- << " frame_type_=" << Http2FrameTypeToString(frame_type_);
+ frame_type_ == PUSH_PROMISE);
CHECK(end_);
CHECK(!got_hpack_end_);
got_hpack_end_ = true;
« chrome/browser/autofill/form_structure_browsertest.cc ('K') | « net/spdy/fuzzing/hpack_fuzz_mutator.cc ('k') | net/spdy/spdy_stream.cc » ('j') | remoting/host/curtain_mode_mac.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698