SPDY - Re-land greedy read support for SpdySession

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 706 matching lines @@
 
 bool MockClientSocket::IsConnected() const {
   return connected_;
 }
 
 bool MockClientSocket::IsConnectedAndIdle() const {
   return connected_;
 }
 
 int MockClientSocket::GetPeerAddress(IPEndPoint* address) const {
+  if (!IsConnected())
+    return ERR_SOCKET_NOT_CONNECTED;
   *address = peer_addr_;
   return OK;
 }
 
 int MockClientSocket::GetLocalAddress(IPEndPoint* address) const {
   IPAddressNumber ip;
   bool rv = ParseIPLiteralToNumber("192.0.2.33", &ip);
   CHECK(rv);
   *address = IPEndPoint(ip, 123);
   return OK;
@@ skipping 76 matching lines @@
   // If the buffer is already in use, a read is already in progress!
   DCHECK(pending_buf_ == NULL);
 
   // Store our async IO data.
   pending_buf_ = buf;
   pending_buf_len_ = buf_len;
   pending_callback_ = callback;
 
   if (need_read_data_) {
     read_data_ = data_->GetNextRead();
+    if (read_data_.result == ERR_CONNECTION_CLOSED) {
+      // This MockRead is just a marker to instruct us to set
+      // peer_closed_connection_.
+      peer_closed_connection_ = true;
+    }
     if (read_data_.result == ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ) {
       // This MockRead is just a marker to instruct us to set
       // peer_closed_connection_.  Skip it and get the next one.
       read_data_ = data_->GetNextRead();
       peer_closed_connection_ = true;
     }
     // ERR_IO_PENDING means that the SocketDataProvider is taking responsibility
     // to complete the async IO manually later (via OnReadComplete).
     if (read_data_.result == ERR_IO_PENDING) {
       // We need to be using async IO in this case.
@@ skipping 138 matching lines @@
 DeterministicMockTCPClientSocket::DeterministicMockTCPClientSocket(
     net::NetLog* net_log, DeterministicSocketData* data)
     : MockClientSocket(BoundNetLog::Make(net_log, net::NetLog::SOURCE_NONE)),
       write_pending_(false),
       write_result_(0),
       read_data_(),
       read_buf_(NULL),
       read_buf_len_(0),
       read_pending_(false),
       data_(data),
-      was_used_to_convey_data_(false) {
+      was_used_to_convey_data_(false),
+      peer_closed_connection_(false) {
   peer_addr_ = data->connect_data().peer_addr;
 }
 
 DeterministicMockTCPClientSocket::~DeterministicMockTCPClientSocket() {}
 
 void DeterministicMockTCPClientSocket::CompleteWrite() {
   was_used_to_convey_data_ = true;
   write_pending_ = false;
   write_callback_.Run(write_result_);
 }
@@ skipping 53 matching lines @@
 int DeterministicMockTCPClientSocket::Read(
     IOBuffer* buf, int buf_len, const CompletionCallback& callback) {
   if (!connected_)
     return ERR_UNEXPECTED;
 
   read_data_ = data_->GetNextRead();
   // The buffer should always be big enough to contain all the MockRead data. To
   // use small buffers, split the data into multiple MockReads.
   DCHECK_LE(read_data_.data_len, buf_len);
 
+  if (read_data_.result == ERR_CONNECTION_CLOSED) {

[Ryan Hamilton, 2013/04/12 02:50:31]

This should probably be the same error code used in the MockTcpClientSocket,
just to be consistent.

[ramant (doing other things), 2013/04/12 03:23:09]

Done.

+    // This MockRead is just a marker to instruct us to set
+    // peer_closed_connection_.
+    peer_closed_connection_ = true;
+  }
+
   read_buf_ = buf;
   read_buf_len_ = buf_len;
   read_callback_ = callback;
 
   if (read_data_.mode == ASYNC || (read_data_.result == ERR_IO_PENDING)) {
     read_pending_ = true;
     DCHECK(!read_callback_.is_null());
     return ERR_IO_PENDING;
   }
 
@@ skipping 12 matching lines @@
     return ERR_IO_PENDING;
   }
   return data_->connect_data().result;
 }
 
 void DeterministicMockTCPClientSocket::Disconnect() {
   MockClientSocket::Disconnect();
 }
 
 bool DeterministicMockTCPClientSocket::IsConnected() const {
-  return connected_;
+  return connected_ && !peer_closed_connection_;
 }
 
 bool DeterministicMockTCPClientSocket::IsConnectedAndIdle() const {
   return IsConnected();
 }
 
 bool DeterministicMockTCPClientSocket::WasEverUsed() const {
   return was_used_to_convey_data_;
 }
 
@@ skipping 588 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