Convert DnsTransactionTest to use SequencedSocketData

net/socket/socket_test_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/socket_test_util.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 645 matching lines @@
   base::MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(&SequencedSocketData::OnWriteComplete,
                             weak_factory_.GetWeakPtr()));
   CHECK_NE(COMPLETING, read_state_);
   write_state_ = COMPLETING;
 }
 
 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);
   sequence_number_++;
   read_state_ = IDLE;
 
   // The result of this read completing might trigger the completion
   // of a pending write. If so, post a task to complete the write later.
   // Since the socket may call back into the SequencedSocketData
   // from socket()->OnReadComplete(), trigger the write task to be posted
   // 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);
   NET_TRACE(1, " *** ") << "Done";
 }
 
 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);
   sequence_number_++;
   write_state_ = IDLE;
   int rv = data.result == OK ? data.data_len : data.result;
 
   // The result of this write completing might trigger the completion
   // of a pending read. If so, post a task to complete the read later.
   // Since the socket may call back into the SequencedSocketData
   // from socket()->OnWriteComplete(), trigger the write task to be posted
   // 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";
 }
 
 SequencedSocketData::~SequencedSocketData() {
 }
 
 DeterministicSocketData::DeterministicSocketData(MockRead* reads,
     size_t reads_count, MockWrite* writes, size_t writes_count)
@@ skipping 991 matching lines @@
       source_port_(123),
       pending_read_buf_(NULL),
       pending_read_buf_len_(0),
       net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_NONE)),
       weak_factory_(this) {
   DCHECK(data_);
   data_->Reset();
   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,
                               const CompletionCallback& callback) {
   if (!connected_)
     return ERR_UNEXPECTED;
 
   // If the buffer is already in use, a read is already in progress!
   DCHECK(pending_read_buf_.get() == NULL);
 
@@ skipping 463 matching lines @@
 
 const char kSOCKS5OkRequest[] =
     { 0x05, 0x01, 0x00, 0x03, 0x04, 'h', 'o', 's', 't', 0x00, 0x50 };
 const int kSOCKS5OkRequestLength = arraysize(kSOCKS5OkRequest);
 
 const char kSOCKS5OkResponse[] =
     { 0x05, 0x00, 0x00, 0x01, 127, 0, 0, 1, 0x00, 0x50 };
 const int kSOCKS5OkResponseLength = arraysize(kSOCKS5OkResponse);
 
 }  // namespace net