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

Unified Diff: net/socket/socket_test_util.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
Index: net/socket/socket_test_util.cc
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index ef21477adc6b9e7f54b0cdc032f16d34ef74427c..8468e32394726fb2b32e7e00ae5239a217df30a4 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -233,7 +233,8 @@ const MockWrite& StaticSocketDataHelper::PeekRealWrite() const {
return writes_[i];
}
- CHECK(false) << "No write data available.";
+ // No write data available.
+ CHECK(false);
return writes_[0]; // Avoid warning about unreachable missing return.
}
@@ -337,16 +338,14 @@ SequencedSocketData::SequencedSocketData(MockRead* reads,
// Check if this is a pause.
if (reads[next_read].mode == ASYNC &&
reads[next_read].result == ERR_IO_PENDING) {
- CHECK(!last_event_was_pause) << "Two pauses in a row are not allowed: "
- << next_sequence_number;
+ // Two pauses in a row are not allowed.
+ CHECK(!last_event_was_pause);
last_event_was_pause = true;
} else if (last_event_was_pause) {
- CHECK_EQ(ASYNC, reads[next_read].mode)
- << "A sync event after a pause makes no sense: "
- << next_sequence_number;
- CHECK_NE(ERR_IO_PENDING, reads[next_read].result)
- << "A pause event after a pause makes no sense: "
- << next_sequence_number;
+ // A sync event after a pause makes no sense.
+ CHECK_EQ(ASYNC, reads[next_read].mode);
+ // A pause event after a pause makes no sense.
+ CHECK_NE(ERR_IO_PENDING, reads[next_read].result);
last_event_was_pause = false;
}
@@ -359,16 +358,14 @@ SequencedSocketData::SequencedSocketData(MockRead* reads,
// Check if this is a pause.
if (writes[next_write].mode == ASYNC &&
writes[next_write].result == ERR_IO_PENDING) {
- CHECK(!last_event_was_pause) << "Two pauses in a row are not allowed: "
- << next_sequence_number;
+ // Two pauses in a row are not allowed.
+ CHECK(!last_event_was_pause);
last_event_was_pause = true;
} else if (last_event_was_pause) {
- CHECK_EQ(ASYNC, writes[next_write].mode)
- << "A sync event after a pause makes no sense: "
- << next_sequence_number;
- CHECK_NE(ERR_IO_PENDING, writes[next_write].result)
- << "A pause event after a pause makes no sense: "
- << next_sequence_number;
+ // A sync event after a pause makes no sense.
+ CHECK_EQ(ASYNC, writes[next_write].mode);
+ // A pause event after a pause makes no sense.
+ CHECK_NE(ERR_IO_PENDING, writes[next_write].result);
last_event_was_pause = false;
}
@@ -376,8 +373,8 @@ SequencedSocketData::SequencedSocketData(MockRead* reads,
++next_sequence_number;
continue;
}
- CHECK(false) << "Sequence number not found where expected: "
- << next_sequence_number;
+ // Sequence number not found where expected.
+ CHECK(false);
return;
}

Powered by Google App Engine
This is Rietveld 408576698