Index: remoting/protocol/fake_stream_socket.cc |
diff --git a/remoting/protocol/fake_stream_socket.cc b/remoting/protocol/fake_stream_socket.cc |
index fc7f31e52dfecaf6f35266a9992f4e6159c2b7dc..e03dfe9858c928adcdd40b211f5c129f52edfc57 100644 |
--- a/remoting/protocol/fake_stream_socket.cc |
+++ b/remoting/protocol/fake_stream_socket.cc |
@@ -31,6 +31,11 @@ FakeStreamSocket::FakeStreamSocket() |
FakeStreamSocket::~FakeStreamSocket() { |
EXPECT_TRUE(task_runner_->BelongsToCurrentThread()); |
+ if (peer_socket_) { |
+ task_runner_->PostTask( |
+ FROM_HERE, base::Bind(&FakeStreamSocket::AppendReadError, peer_socket_, |
+ net::ERR_CONNECTION_CLOSED)); |
+ } |
} |
void FakeStreamSocket::AppendInputData(const std::string& data) { |
@@ -138,7 +143,7 @@ void FakeStreamSocket::DoWrite(net::IOBuffer* buf, int buf_len) { |
written_data_.insert(written_data_.end(), |
buf->data(), buf->data() + buf_len); |
- if (peer_socket_.get()) { |
+ if (peer_socket_) { |
task_runner_->PostTask( |
FROM_HERE, |
base::Bind(&FakeStreamSocket::AppendInputData, |
@@ -147,109 +152,6 @@ void FakeStreamSocket::DoWrite(net::IOBuffer* buf, int buf_len) { |
} |
} |
-int FakeStreamSocket::SetReceiveBufferSize(int32 size) { |
- EXPECT_TRUE(task_runner_->BelongsToCurrentThread()); |
- NOTIMPLEMENTED(); |
- return net::ERR_NOT_IMPLEMENTED; |
-} |
- |
-int FakeStreamSocket::SetSendBufferSize(int32 size) { |
- EXPECT_TRUE(task_runner_->BelongsToCurrentThread()); |
- NOTIMPLEMENTED(); |
- 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()); |
- NOTIMPLEMENTED(); |
- return false; |
-} |
- |
-int FakeStreamSocket::GetPeerAddress(net::IPEndPoint* address) const { |
- EXPECT_TRUE(task_runner_->BelongsToCurrentThread()); |
- net::IPAddressNumber ip(net::kIPv4AddressSize); |
- *address = net::IPEndPoint(ip, 0); |
- return net::OK; |
-} |
- |
-int FakeStreamSocket::GetLocalAddress(net::IPEndPoint* address) const { |
- EXPECT_TRUE(task_runner_->BelongsToCurrentThread()); |
- NOTIMPLEMENTED(); |
- return net::ERR_NOT_IMPLEMENTED; |
-} |
- |
-const net::BoundNetLog& FakeStreamSocket::NetLog() const { |
- EXPECT_TRUE(task_runner_->BelongsToCurrentThread()); |
- return net_log_; |
-} |
- |
-void FakeStreamSocket::SetSubresourceSpeculation() { |
- EXPECT_TRUE(task_runner_->BelongsToCurrentThread()); |
- NOTIMPLEMENTED(); |
-} |
- |
-void FakeStreamSocket::SetOmniboxSpeculation() { |
- EXPECT_TRUE(task_runner_->BelongsToCurrentThread()); |
- NOTIMPLEMENTED(); |
-} |
- |
-bool FakeStreamSocket::WasEverUsed() const { |
- EXPECT_TRUE(task_runner_->BelongsToCurrentThread()); |
- NOTIMPLEMENTED(); |
- return true; |
-} |
- |
-bool FakeStreamSocket::UsingTCPFastOpen() const { |
- EXPECT_TRUE(task_runner_->BelongsToCurrentThread()); |
- NOTIMPLEMENTED(); |
- return true; |
-} |
- |
-bool FakeStreamSocket::WasNpnNegotiated() const { |
- EXPECT_TRUE(task_runner_->BelongsToCurrentThread()); |
- return false; |
-} |
- |
-net::NextProto FakeStreamSocket::GetNegotiatedProtocol() const { |
- EXPECT_TRUE(task_runner_->BelongsToCurrentThread()); |
- NOTIMPLEMENTED(); |
- return net::kProtoUnknown; |
-} |
- |
-bool FakeStreamSocket::GetSSLInfo(net::SSLInfo* ssl_info) { |
- EXPECT_TRUE(task_runner_->BelongsToCurrentThread()); |
- return false; |
-} |
- |
-void FakeStreamSocket::GetConnectionAttempts( |
- net::ConnectionAttempts* out) const { |
- EXPECT_TRUE(task_runner_->BelongsToCurrentThread()); |
- out->clear(); |
-} |
- |
FakeStreamChannelFactory::FakeStreamChannelFactory() |
: task_runner_(base::ThreadTaskRunnerHandle::Get()), |
asynchronous_create_(false), |