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

Unified Diff: net/socket/socket_test_util.cc

Issue 1113203002: Convert DnsTransactionTest to use SequencedSocketData (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and tweak Created 5 years, 7 months 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
« no previous file with comments | « net/dns/dns_transaction_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/socket_test_util.cc
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index 807d31b2fddbd6d94b9dec741c9f70e99f16dab4..20d13e60bf1db0fcae66b8d713cc55ebfd1b9736 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -687,10 +687,6 @@ void SequencedSocketData::MaybePostWriteCompleteTask() {
void SequencedSocketData::OnReadComplete() {
CHECK_EQ(COMPLETING, read_state_);
NET_TRACE(1, " *** ") << "Completing read for: " << sequence_number_;
- if (!socket()) {
- NET_TRACE(1, " *** ") << "No socket available to complete read";
- return;
- }
MockRead data = helper_.AdvanceRead();
DCHECK_EQ(sequence_number_, data.sequence_number);
@@ -704,6 +700,11 @@ void SequencedSocketData::OnReadComplete() {
// before calling that.
MaybePostWriteCompleteTask();
+ if (!socket()) {
+ NET_TRACE(1, " *** ") << "No socket available to complete read";
+ return;
+ }
+
NET_TRACE(1, " *** ") << "Completing socket read for: "
<< data.sequence_number;
DumpMockReadWrite(data);
@@ -714,10 +715,6 @@ void SequencedSocketData::OnReadComplete() {
void SequencedSocketData::OnWriteComplete() {
CHECK_EQ(COMPLETING, write_state_);
NET_TRACE(1, " *** ") << " Completing write for: " << sequence_number_;
- if (!socket()) {
- NET_TRACE(1, " *** ") << "No socket available to complete write.";
- return;
- }
const MockWrite& data = helper_.AdvanceWrite();
DCHECK_EQ(sequence_number_, data.sequence_number);
@@ -732,6 +729,11 @@ void SequencedSocketData::OnWriteComplete() {
// before calling that.
MaybePostReadCompleteTask();
+ if (!socket()) {
+ NET_TRACE(1, " *** ") << "No socket available to complete write";
+ return;
+ }
+
NET_TRACE(1, " *** ") << " Completing socket write for: "
<< data.sequence_number;
socket()->OnWriteComplete(rv);
« no previous file with comments | « net/dns/dns_transaction_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698