summaryrefslogtreecommitdiffstats
path: root/remoting/protocol
diff options
context:
space:
mode:
Diffstat (limited to 'remoting/protocol')
-rw-r--r--remoting/protocol/buffered_socket_writer.h2
-rw-r--r--remoting/protocol/channel_authenticator.h4
-rw-r--r--remoting/protocol/fake_session.cc10
-rw-r--r--remoting/protocol/fake_session.h14
-rw-r--r--remoting/protocol/jingle_session_unittest.cc8
-rw-r--r--remoting/protocol/jingle_stream_connector.h4
-rw-r--r--remoting/protocol/message_reader.h2
-rw-r--r--remoting/protocol/pepper_stream_channel.h4
-rw-r--r--remoting/protocol/pepper_transport_socket_adapter.cc12
-rw-r--r--remoting/protocol/pepper_transport_socket_adapter.h12
-rw-r--r--remoting/protocol/protocol_test_client.cc4
-rw-r--r--remoting/protocol/secure_p2p_socket.cc10
-rw-r--r--remoting/protocol/secure_p2p_socket.h12
-rw-r--r--remoting/protocol/secure_p2p_socket_unittest.cc4
-rw-r--r--remoting/protocol/socket_reader_base.h2
15 files changed, 52 insertions, 52 deletions
diff --git a/remoting/protocol/buffered_socket_writer.h b/remoting/protocol/buffered_socket_writer.h
index 424c4dc..ebdc200 100644
--- a/remoting/protocol/buffered_socket_writer.h
+++ b/remoting/protocol/buffered_socket_writer.h
@@ -99,7 +99,7 @@ class BufferedSocketWriterBase
bool write_pending_;
- net::CompletionCallbackImpl<BufferedSocketWriterBase> written_callback_;
+ net::OldCompletionCallbackImpl<BufferedSocketWriterBase> written_callback_;
bool closed_;
};
diff --git a/remoting/protocol/channel_authenticator.h b/remoting/protocol/channel_authenticator.h
index 9fe2700..4d2dc05 100644
--- a/remoting/protocol/channel_authenticator.h
+++ b/remoting/protocol/channel_authenticator.h
@@ -66,7 +66,7 @@ class HostChannelAuthenticator : public ChannelAuthenticator {
scoped_refptr<net::GrowableIOBuffer> auth_read_buf_;
- net::CompletionCallbackImpl<HostChannelAuthenticator> auth_read_callback_;
+ net::OldCompletionCallbackImpl<HostChannelAuthenticator> auth_read_callback_;
DISALLOW_COPY_AND_ASSIGN(HostChannelAuthenticator);
};
@@ -90,7 +90,7 @@ class ClientChannelAuthenticator : public ChannelAuthenticator {
scoped_refptr<net::DrainableIOBuffer> auth_write_buf_;
- net::CompletionCallbackImpl<ClientChannelAuthenticator> auth_write_callback_;
+ net::OldCompletionCallbackImpl<ClientChannelAuthenticator> auth_write_callback_;
DISALLOW_COPY_AND_ASSIGN(ClientChannelAuthenticator);
};
diff --git a/remoting/protocol/fake_session.cc b/remoting/protocol/fake_session.cc
index a6ed4fd..0cda8bb 100644
--- a/remoting/protocol/fake_session.cc
+++ b/remoting/protocol/fake_session.cc
@@ -42,7 +42,7 @@ void FakeSocket::AppendInputData(const char* data, int data_size) {
}
int FakeSocket::Read(net::IOBuffer* buf, int buf_len,
- net::CompletionCallback* callback) {
+ net::OldCompletionCallback* callback) {
EXPECT_EQ(message_loop_, MessageLoop::current());
if (input_pos_ < static_cast<int>(input_data_.size())) {
int result = std::min(buf_len,
@@ -60,7 +60,7 @@ int FakeSocket::Read(net::IOBuffer* buf, int buf_len,
}
int FakeSocket::Write(net::IOBuffer* buf, int buf_len,
- net::CompletionCallback* callback) {
+ net::OldCompletionCallback* callback) {
EXPECT_EQ(message_loop_, MessageLoop::current());
written_data_.insert(written_data_.end(),
buf->data(), buf->data() + buf_len);
@@ -76,7 +76,7 @@ bool FakeSocket::SetSendBufferSize(int32 size) {
return false;
}
-int FakeSocket::Connect(net::CompletionCallback* callback) {
+int FakeSocket::Connect(net::OldCompletionCallback* callback) {
EXPECT_EQ(message_loop_, MessageLoop::current());
return net::OK;
}
@@ -167,7 +167,7 @@ void FakeUdpSocket::AppendInputPacket(const char* data, int data_size) {
}
int FakeUdpSocket::Read(net::IOBuffer* buf, int buf_len,
- net::CompletionCallback* callback) {
+ net::OldCompletionCallback* callback) {
EXPECT_EQ(message_loop_, MessageLoop::current());
if (input_pos_ < static_cast<int>(input_packets_.size())) {
int result = std::min(
@@ -185,7 +185,7 @@ int FakeUdpSocket::Read(net::IOBuffer* buf, int buf_len,
}
int FakeUdpSocket::Write(net::IOBuffer* buf, int buf_len,
- net::CompletionCallback* callback) {
+ net::OldCompletionCallback* callback) {
EXPECT_EQ(message_loop_, MessageLoop::current());
written_packets_.push_back(std::string());
written_packets_.back().assign(buf->data(), buf->data() + buf_len);
diff --git a/remoting/protocol/fake_session.h b/remoting/protocol/fake_session.h
index d415ab1..0e098b4 100644
--- a/remoting/protocol/fake_session.h
+++ b/remoting/protocol/fake_session.h
@@ -39,15 +39,15 @@ class FakeSocket : public net::StreamSocket {
// net::Socket interface.
virtual int Read(net::IOBuffer* buf, int buf_len,
- net::CompletionCallback* callback);
+ net::OldCompletionCallback* callback);
virtual int Write(net::IOBuffer* buf, int buf_len,
- net::CompletionCallback* callback);
+ net::OldCompletionCallback* callback);
virtual bool SetReceiveBufferSize(int32 size);
virtual bool SetSendBufferSize(int32 size);
// net::StreamSocket interface.
- virtual int Connect(net::CompletionCallback* callback) OVERRIDE;
+ virtual int Connect(net::OldCompletionCallback* callback) OVERRIDE;
virtual void Disconnect() OVERRIDE;
virtual bool IsConnected() const OVERRIDE;
virtual bool IsConnectedAndIdle() const OVERRIDE;
@@ -65,7 +65,7 @@ class FakeSocket : public net::StreamSocket {
bool read_pending_;
scoped_refptr<net::IOBuffer> read_buffer_;
int read_buffer_size_;
- net::CompletionCallback* read_callback_;
+ net::OldCompletionCallback* read_callback_;
std::string written_data_;
std::string input_data_;
@@ -95,9 +95,9 @@ class FakeUdpSocket : public net::Socket {
// net::Socket interface.
virtual int Read(net::IOBuffer* buf, int buf_len,
- net::CompletionCallback* callback);
+ net::OldCompletionCallback* callback);
virtual int Write(net::IOBuffer* buf, int buf_len,
- net::CompletionCallback* callback);
+ net::OldCompletionCallback* callback);
virtual bool SetReceiveBufferSize(int32 size);
virtual bool SetSendBufferSize(int32 size);
@@ -106,7 +106,7 @@ class FakeUdpSocket : public net::Socket {
bool read_pending_;
scoped_refptr<net::IOBuffer> read_buffer_;
int read_buffer_size_;
- net::CompletionCallback* read_callback_;
+ net::OldCompletionCallback* read_callback_;
std::vector<std::string> written_packets_;
std::vector<std::string> input_packets_;
diff --git a/remoting/protocol/jingle_session_unittest.cc b/remoting/protocol/jingle_session_unittest.cc
index e55b91c..35e4181 100644
--- a/remoting/protocol/jingle_session_unittest.cc
+++ b/remoting/protocol/jingle_session_unittest.cc
@@ -478,8 +478,8 @@ class TCPChannelTester : public ChannelTesterBase {
scoped_refptr<net::DrainableIOBuffer> output_buffer_;
scoped_refptr<net::GrowableIOBuffer> input_buffer_;
- net::CompletionCallbackImpl<TCPChannelTester> write_cb_;
- net::CompletionCallbackImpl<TCPChannelTester> read_cb_;
+ net::OldCompletionCallbackImpl<TCPChannelTester> write_cb_;
+ net::OldCompletionCallbackImpl<TCPChannelTester> read_cb_;
int write_errors_;
int read_errors_;
int message_size_;
@@ -660,8 +660,8 @@ class UDPChannelTester : public ChannelTesterBase {
scoped_refptr<net::IOBuffer> sent_packets_[kMessages];
scoped_refptr<net::IOBuffer> read_buffer_;
- net::CompletionCallbackImpl<UDPChannelTester> write_cb_;
- net::CompletionCallbackImpl<UDPChannelTester> read_cb_;
+ net::OldCompletionCallbackImpl<UDPChannelTester> write_cb_;
+ net::OldCompletionCallbackImpl<UDPChannelTester> read_cb_;
int write_errors_;
int read_errors_;
int packets_sent_;
diff --git a/remoting/protocol/jingle_stream_connector.h b/remoting/protocol/jingle_stream_connector.h
index 6f7ce3b..d443ffd 100644
--- a/remoting/protocol/jingle_stream_connector.h
+++ b/remoting/protocol/jingle_stream_connector.h
@@ -88,8 +88,8 @@ class JingleStreamConnector : public JingleChannelConnector {
scoped_ptr<ChannelAuthenticator> authenticator_;
// Callback called by the TCP and SSL layers.
- net::CompletionCallbackImpl<JingleStreamConnector> tcp_connect_callback_;
- net::CompletionCallbackImpl<JingleStreamConnector> ssl_connect_callback_;
+ net::OldCompletionCallbackImpl<JingleStreamConnector> tcp_connect_callback_;
+ net::OldCompletionCallbackImpl<JingleStreamConnector> ssl_connect_callback_;
DISALLOW_COPY_AND_ASSIGN(JingleStreamConnector);
};
diff --git a/remoting/protocol/message_reader.h b/remoting/protocol/message_reader.h
index c8d214c..8a8abda 100644
--- a/remoting/protocol/message_reader.h
+++ b/remoting/protocol/message_reader.h
@@ -72,7 +72,7 @@ class MessageReader : public base::RefCountedThreadSafe<MessageReader> {
bool closed_;
scoped_refptr<net::IOBuffer> read_buffer_;
- net::CompletionCallbackImpl<MessageReader> read_callback_;
+ net::OldCompletionCallbackImpl<MessageReader> read_callback_;
MessageDecoder message_decoder_;
diff --git a/remoting/protocol/pepper_stream_channel.h b/remoting/protocol/pepper_stream_channel.h
index d5afe27..d0f7bb2 100644
--- a/remoting/protocol/pepper_stream_channel.h
+++ b/remoting/protocol/pepper_stream_channel.h
@@ -80,8 +80,8 @@ class PepperStreamChannel : public PepperChannel,
scoped_ptr<ChannelAuthenticator> authenticator_;
// Callback called by the TCP and SSL layers.
- net::CompletionCallbackImpl<PepperStreamChannel> p2p_connect_callback_;
- net::CompletionCallbackImpl<PepperStreamChannel> ssl_connect_callback_;
+ net::OldCompletionCallbackImpl<PepperStreamChannel> p2p_connect_callback_;
+ net::OldCompletionCallbackImpl<PepperStreamChannel> ssl_connect_callback_;
DISALLOW_COPY_AND_ASSIGN(PepperStreamChannel);
};
diff --git a/remoting/protocol/pepper_transport_socket_adapter.cc b/remoting/protocol/pepper_transport_socket_adapter.cc
index 1b8084f..6acb8e3 100644
--- a/remoting/protocol/pepper_transport_socket_adapter.cc
+++ b/remoting/protocol/pepper_transport_socket_adapter.cc
@@ -66,7 +66,7 @@ void PepperTransportSocketAdapter::AddRemoteCandidate(
}
int PepperTransportSocketAdapter::Read(net::IOBuffer* buf, int buf_len,
- net::CompletionCallback* callback) {
+ net::OldCompletionCallback* callback) {
DCHECK(CalledOnValidThread());
DCHECK(!read_callback_);
DCHECK(!read_buffer_);
@@ -88,7 +88,7 @@ int PepperTransportSocketAdapter::Read(net::IOBuffer* buf, int buf_len,
}
int PepperTransportSocketAdapter::Write(net::IOBuffer* buf, int buf_len,
- net::CompletionCallback* callback) {
+ net::OldCompletionCallback* callback) {
DCHECK(CalledOnValidThread());
DCHECK(!write_callback_);
DCHECK(!write_buffer_);
@@ -123,7 +123,7 @@ bool PepperTransportSocketAdapter::SetSendBufferSize(int32 size) {
return false;
}
-int PepperTransportSocketAdapter::Connect(net::CompletionCallback* callback) {
+int PepperTransportSocketAdapter::Connect(net::OldCompletionCallback* callback) {
DCHECK(CalledOnValidThread());
if (!transport_.get())
@@ -259,7 +259,7 @@ void PepperTransportSocketAdapter::OnConnect(int result) {
if (result == PP_OK)
connected_ = true;
- net::CompletionCallback* callback = connect_callback_;
+ net::OldCompletionCallback* callback = connect_callback_;
connect_callback_ = NULL;
callback->Run(PPErrorToNetError(result));
}
@@ -269,7 +269,7 @@ void PepperTransportSocketAdapter::OnRead(int32_t result) {
DCHECK(read_callback_);
DCHECK(read_buffer_);
- net::CompletionCallback* callback = read_callback_;
+ net::OldCompletionCallback* callback = read_callback_;
read_callback_ = NULL;
read_buffer_ = NULL;
callback->Run(PPErrorToNetError(result));
@@ -280,7 +280,7 @@ void PepperTransportSocketAdapter::OnWrite(int32_t result) {
DCHECK(write_callback_);
DCHECK(write_buffer_);
- net::CompletionCallback* callback = write_callback_;
+ net::OldCompletionCallback* callback = write_callback_;
write_callback_ = NULL;
write_buffer_ = NULL;
callback->Run(PPErrorToNetError(result));
diff --git a/remoting/protocol/pepper_transport_socket_adapter.h b/remoting/protocol/pepper_transport_socket_adapter.h
index 92cc410..d7e49c9 100644
--- a/remoting/protocol/pepper_transport_socket_adapter.h
+++ b/remoting/protocol/pepper_transport_socket_adapter.h
@@ -50,14 +50,14 @@ class PepperTransportSocketAdapter : public base::NonThreadSafe,
// net::Socket interface.
virtual int Read(net::IOBuffer* buf, int buf_len,
- net::CompletionCallback* callback) OVERRIDE;
+ net::OldCompletionCallback* callback) OVERRIDE;
virtual int Write(net::IOBuffer* buf, int buf_len,
- net::CompletionCallback* callback) OVERRIDE;
+ net::OldCompletionCallback* callback) OVERRIDE;
virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
virtual bool SetSendBufferSize(int32 size) OVERRIDE;
// net::StreamSocket interface.
- virtual int Connect(net::CompletionCallback* callback) OVERRIDE;
+ virtual int Connect(net::OldCompletionCallback* callback) OVERRIDE;
virtual void Disconnect() OVERRIDE;
virtual bool IsConnected() const OVERRIDE;
virtual bool IsConnectedAndIdle() const OVERRIDE;
@@ -85,15 +85,15 @@ class PepperTransportSocketAdapter : public base::NonThreadSafe,
scoped_ptr<pp::Transport_Dev> transport_;
- net::CompletionCallback* connect_callback_;
+ net::OldCompletionCallback* connect_callback_;
bool connected_;
bool get_address_pending_;
- net::CompletionCallback* read_callback_;
+ net::OldCompletionCallback* read_callback_;
scoped_refptr<net::IOBuffer> read_buffer_;
- net::CompletionCallback* write_callback_;
+ net::OldCompletionCallback* write_callback_;
scoped_refptr<net::IOBuffer> write_buffer_;
net::BoundNetLog net_log_;
diff --git a/remoting/protocol/protocol_test_client.cc b/remoting/protocol/protocol_test_client.cc
index 2029e31..bfcb496 100644
--- a/remoting/protocol/protocol_test_client.cc
+++ b/remoting/protocol/protocol_test_client.cc
@@ -74,9 +74,9 @@ class ProtocolTestConnection
ProtocolTestClient* client_;
MessageLoop* message_loop_;
scoped_ptr<Session> session_;
- net::CompletionCallbackImpl<ProtocolTestConnection> write_cb_;
+ net::OldCompletionCallbackImpl<ProtocolTestConnection> write_cb_;
bool pending_write_;
- net::CompletionCallbackImpl<ProtocolTestConnection> read_cb_;
+ net::OldCompletionCallbackImpl<ProtocolTestConnection> read_cb_;
scoped_refptr<net::IOBuffer> read_buffer_;
};
diff --git a/remoting/protocol/secure_p2p_socket.cc b/remoting/protocol/secure_p2p_socket.cc
index c980775..8bc939e 100644
--- a/remoting/protocol/secure_p2p_socket.cc
+++ b/remoting/protocol/secure_p2p_socket.cc
@@ -10,7 +10,7 @@
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
-using net::CompletionCallback;
+using net::OldCompletionCallback;
using net::IOBuffer;
namespace remoting {
@@ -120,7 +120,7 @@ SecureP2PSocket::~SecureP2PSocket() {
}
int SecureP2PSocket::Read(IOBuffer* buf, int buf_len,
- CompletionCallback* callback) {
+ OldCompletionCallback* callback) {
DCHECK(!user_read_buf_);
DCHECK(!user_read_buf_len_);
DCHECK(!user_read_callback_);
@@ -132,7 +132,7 @@ int SecureP2PSocket::Read(IOBuffer* buf, int buf_len,
}
int SecureP2PSocket::Write(IOBuffer* buf, int buf_len,
- CompletionCallback* callback) {
+ OldCompletionCallback* callback) {
// See the spec for the steps taken in this method:
// http://www.whatwg.org/specs/web-apps/current-work/complete/video-conferencing-and-peer-to-peer-communication.html#peer-to-peer-connections
// 4. Increment sequence number by one.
@@ -215,7 +215,7 @@ int SecureP2PSocket::ReadInternal() {
}
void SecureP2PSocket::ReadDone(int err) {
- net::CompletionCallback* callback = user_read_callback_;
+ net::OldCompletionCallback* callback = user_read_callback_;
user_read_callback_ = NULL;
if (err < 0) {
@@ -237,7 +237,7 @@ void SecureP2PSocket::ReadDone(int err) {
}
void SecureP2PSocket::WriteDone(int err) {
- net::CompletionCallback* callback = user_write_callback_;
+ net::OldCompletionCallback* callback = user_write_callback_;
int buf_len = user_write_buf_len_;
user_write_callback_ = NULL;
diff --git a/remoting/protocol/secure_p2p_socket.h b/remoting/protocol/secure_p2p_socket.h
index 67b1638..5691b6a 100644
--- a/remoting/protocol/secure_p2p_socket.h
+++ b/remoting/protocol/secure_p2p_socket.h
@@ -43,9 +43,9 @@ class SecureP2PSocket : public net::Socket {
// Socket implementation.
virtual int Read(net::IOBuffer* buf, int buf_len,
- net::CompletionCallback* callback);
+ net::OldCompletionCallback* callback);
virtual int Write(net::IOBuffer* buf, int buf_len,
- net::CompletionCallback* callback);
+ net::OldCompletionCallback* callback);
virtual bool SetReceiveBufferSize(int32 size);
virtual bool SetSendBufferSize(int32 size);
@@ -60,17 +60,17 @@ class SecureP2PSocket : public net::Socket {
uint64 write_seq_;
uint64 read_seq_;
- net::CompletionCallback* user_read_callback_;
+ net::OldCompletionCallback* user_read_callback_;
scoped_refptr<net::IOBuffer> user_read_buf_;
int user_read_buf_len_;
- net::CompletionCallback* user_write_callback_;
+ net::OldCompletionCallback* user_write_callback_;
int user_write_buf_len_;
- scoped_ptr<net::CompletionCallback> read_callback_;
+ scoped_ptr<net::OldCompletionCallback> read_callback_;
scoped_refptr<net::IOBufferWithSize> read_buf_;
- scoped_ptr<net::CompletionCallback> write_callback_;
+ scoped_ptr<net::OldCompletionCallback> write_callback_;
scoped_ptr<crypto::SymmetricKey> mask_key_;
crypto::HMAC msg_hasher_;
diff --git a/remoting/protocol/secure_p2p_socket_unittest.cc b/remoting/protocol/secure_p2p_socket_unittest.cc
index 2d46794..4fd2f29 100644
--- a/remoting/protocol/secure_p2p_socket_unittest.cc
+++ b/remoting/protocol/secure_p2p_socket_unittest.cc
@@ -22,7 +22,7 @@ class TestSocket : public net::Socket {
// Socket implementation.
virtual int Read(net::IOBuffer* buf, int buf_len,
- net::CompletionCallback* callback) {
+ net::OldCompletionCallback* callback) {
std::string buffer = buffer_.front();
buffer_.pop();
@@ -32,7 +32,7 @@ class TestSocket : public net::Socket {
}
virtual int Write(net::IOBuffer* buf, int buf_len,
- net::CompletionCallback* callback) {
+ net::OldCompletionCallback* callback) {
buffer_.push(std::string(buf->data(), buf_len));
return buf_len;
}
diff --git a/remoting/protocol/socket_reader_base.h b/remoting/protocol/socket_reader_base.h
index 63e4e81..a315217 100644
--- a/remoting/protocol/socket_reader_base.h
+++ b/remoting/protocol/socket_reader_base.h
@@ -32,7 +32,7 @@ class SocketReaderBase {
net::Socket* socket_;
bool closed_;
scoped_refptr<net::IOBuffer> read_buffer_;
- net::CompletionCallbackImpl<SocketReaderBase> read_callback_;
+ net::OldCompletionCallbackImpl<SocketReaderBase> read_callback_;
};
} // namespace remoting
generated by cgit v1.1 at 2025-02-09 19:27:51 +0000