Update ICE protocol to handle closed channel

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 <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "net/base/address_list.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace remoting {
 namespace protocol {
 
 FakeStreamSocket::FakeStreamSocket()
     : task_runner_(base::ThreadTaskRunnerHandle::Get()), weak_factory_(this) {}
 
 FakeStreamSocket::~FakeStreamSocket() {
   EXPECT_TRUE(task_runner_->BelongsToCurrentThread());
   if (peer_socket_) {
     task_runner_->PostTask(
-        FROM_HERE, base::Bind(&FakeStreamSocket::AppendReadError, peer_socket_,
+        FROM_HERE, base::Bind(&FakeStreamSocket::SetReadError, peer_socket_,
                               net::ERR_CONNECTION_CLOSED));
   }
 }
 
 void FakeStreamSocket::AppendInputData(const std::string& data) {
   EXPECT_TRUE(task_runner_->BelongsToCurrentThread());
   input_data_.insert(input_data_.end(), data.begin(), data.end());
   // 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;
 
     base::ResetAndReturn(&read_callback_).Run(result);
   }
 }
 
-void FakeStreamSocket::AppendReadError(int error) {
+void FakeStreamSocket::SetReadError(int error) {
   EXPECT_TRUE(task_runner_->BelongsToCurrentThread());
   // Complete pending read if any.
   if (!read_callback_.is_null()) {
     base::ResetAndReturn(&read_callback_).Run(error);
   } else {
     next_read_error_ = error;
   }
 }
 
 void FakeStreamSocket::PairWith(FakeStreamSocket* peer_socket) {
@@ skipping 10 matching lines @@
                            int buf_len,
                            const net::CompletionCallback& callback) {
   EXPECT_TRUE(task_runner_->BelongsToCurrentThread());
 
   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;
+  } else if (next_read_error_.has_value()) {
+    int r = next_read_error_.value();
+    next_read_error_.reset();
     return r;
   } else {
     read_buffer_ = buf;
     read_buffer_size_ = buf_len;
     read_callback_ = callback;
     return net::ERR_IO_PENDING;
   }
 }
 
 int FakeStreamSocket::Write(const scoped_refptr<net::IOBuffer>& buf,
@@ skipping 103 matching lines @@
   if (channels_.find(name) != channels_.end())
     callback.Run(std::move(owned_channel));
 }
 
 void FakeStreamChannelFactory::CancelChannelCreation(const std::string& name) {
   channels_.erase(name);
 }
 
 }  // namespace protocol
 }  // namespace remoting