Pass in a non-null CertVerifier into SSLClientSocket.

remoting/protocol/fake_stream_socket.cc

 // Copyright 2014 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 "remoting/protocol/fake_stream_socket.h"
 
 #include "base/bind.h"
+#include "base/callback_helpers.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "net/base/address_list.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace remoting {
 namespace protocol {
@@ skipping 20 matching lines @@
   // Complete pending read if any.
   if (!read_callback_.is_null()) {
     int result = std::min(read_buffer_size_,
                           static_cast<int>(input_data_.size() - input_pos_));
     EXPECT_GT(result, 0);
     memcpy(read_buffer_->data(),
            &(*input_data_.begin()) + input_pos_, result);
     input_pos_ += result;
     read_buffer_ = nullptr;
 
-    net::CompletionCallback callback = read_callback_;
-    read_callback_.Reset();
-    callback.Run(result);
+    base::ResetAndReturn(&read_callback_).Run(result);
   }
 }
 
+void FakeStreamSocket::AppendReadError(int error) {
+  EXPECT_TRUE(task_runner_->BelongsToCurrentThread());
+  // Complete pending ead if any.

[Sergey Ulanov, 2015/04/24 00:34:45]

typo: ead

[davidben, 2015/04/24 20:52:44]

Done.

+  if (!read_callback_.is_null()) {
+    base::ResetAndReturn(&read_callback_).Run(error);
+  } else {
+    next_read_error_ = error;
+  }
+}
+
 void FakeStreamSocket::PairWith(FakeStreamSocket* peer_socket) {
   EXPECT_TRUE(task_runner_->BelongsToCurrentThread());
   peer_socket_ = peer_socket->GetWeakPtr();
   peer_socket->peer_socket_ = GetWeakPtr();
 }
 
 base::WeakPtr<FakeStreamSocket> FakeStreamSocket::GetWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
 int FakeStreamSocket::Read(net::IOBuffer* buf, int buf_len,
                            const net::CompletionCallback& callback) {
   EXPECT_TRUE(task_runner_->BelongsToCurrentThread());
 
-  if (next_read_error_ != net::OK) {
-    int r = next_read_error_;
-    next_read_error_ = net::OK;
-    return r;
-  }
-
   if (input_pos_ < static_cast<int>(input_data_.size())) {
     int result = std::min(buf_len,
                           static_cast<int>(input_data_.size()) - input_pos_);
     memcpy(buf->data(), &(*input_data_.begin()) + input_pos_, result);
     input_pos_ += result;
     return result;
+  } else if (next_read_error_ != net::OK) {
+    int r = next_read_error_;
+    next_read_error_ = net::OK;
+    return r;
   } else {
     read_buffer_ = buf;
     read_buffer_size_ = buf_len;
     read_callback_ = callback;
     return net::ERR_IO_PENDING;
   }
 }
 
 int FakeStreamSocket::Write(net::IOBuffer* buf, int buf_len,
                       const net::CompletionCallback& callback) {
@@ skipping 62 matching lines @@
   return net::ERR_NOT_IMPLEMENTED;
 }
 
 int FakeStreamSocket::Connect(const net::CompletionCallback& callback) {
   EXPECT_TRUE(task_runner_->BelongsToCurrentThread());
   return net::OK;
 }
 
 void FakeStreamSocket::Disconnect() {
   EXPECT_TRUE(task_runner_->BelongsToCurrentThread());
+
+  if (peer_socket_.get()) {
+    task_runner_->PostTask(
+        FROM_HERE,
+        base::Bind(&FakeStreamSocket::AppendReadError,
+                   peer_socket_,
+                   net::ERR_CONNECTION_CLOSED));
+  }
   peer_socket_.reset();
 }
 
 bool FakeStreamSocket::IsConnected() const {
   EXPECT_TRUE(task_runner_->BelongsToCurrentThread());
   return true;
 }
 
 bool FakeStreamSocket::IsConnectedAndIdle() const {
   EXPECT_TRUE(task_runner_->BelongsToCurrentThread());
@@ skipping 96 matching lines @@
   if (channels_.find(name) != channels_.end())
     callback.Run(owned_channel.Pass());
 }
 
 void FakeStreamChannelFactory::CancelChannelCreation(const std::string& name) {
   channels_.erase(name);
 }
 
 }  // namespace protocol
 }  // namespace remoting