Convert DnsTransactionTest to use SequencedSocketData

net/socket/socket_test_util.cc

Index: net/socket/socket_test_util.cc
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index 4df69d2fa1ccfe46bed35f6bf2e6e54d87fe2f47..960979fc9805572f80bcee6130d7fa0b4c521504 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -663,10 +663,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);
@@ -680,6 +676,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: " << sequence_number_;
   DumpMockReadWrite(data);
   socket()->OnReadComplete(data);
@@ -689,10 +690,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);
@@ -707,6 +704,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: " << sequence_number_;
   socket()->OnWriteComplete(rv);
   NET_TRACE(1, " *** ") << "Done";
@@ -1718,7 +1720,9 @@ MockUDPClientSocket::MockUDPClientSocket(SocketDataProvider* data,
   peer_addr_ = data->connect_data().peer_addr;
 }
 
-MockUDPClientSocket::~MockUDPClientSocket() {}
+MockUDPClientSocket::~MockUDPClientSocket() {
+  data_->set_socket(nullptr);

[mmenke, 2015/05/04 20:08:32]

This seems reasonable.  Should probably do it in ~MockTCPClientSocket as well.

[Ryan Hamilton, 2015/05/04 20:12:33]

Done.

[Ryan Hamilton, 2015/05/04 20:15:09]

Actually, I take it back. Doing that causes other tests to crash.

I think we have some lifetime issues between sockets and socket data which is
under specified. Perhaps something to fix in a followup.

+}
 
 int MockUDPClientSocket::Read(IOBuffer* buf,
                               int buf_len,