summaryrefslogtreecommitdiffstats
path: root/net/socket
diff options
context:
space:
mode:
Diffstat (limited to 'net/socket')
-rw-r--r--net/socket/socket_test_util.cc10
-rw-r--r--net/socket/socket_test_util.h5
2 files changed, 12 insertions, 3 deletions
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index c32d6bb..2a11ec0 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -594,7 +594,7 @@ DatagramClientSocket* MockClientSocketFactory::CreateDatagramClientSocket(
NetLog* net_log,
const NetLog::Source& source) {
SocketDataProvider* data_provider = mock_data_.GetNext();
- MockUDPClientSocket* socket = new MockUDPClientSocket(data_provider);
+ MockUDPClientSocket* socket = new MockUDPClientSocket(data_provider, net_log);
data_provider->set_socket(socket);
udp_client_sockets_.push_back(socket);
return socket;
@@ -1162,7 +1162,8 @@ void MockSSLClientSocket::OnReadComplete(const MockRead& data) {
NOTIMPLEMENTED();
}
-MockUDPClientSocket::MockUDPClientSocket(SocketDataProvider* data)
+MockUDPClientSocket::MockUDPClientSocket(SocketDataProvider* data,
+ net::NetLog* net_log)
: connected_(false),
data_(data),
read_offset_(0),
@@ -1171,6 +1172,7 @@ MockUDPClientSocket::MockUDPClientSocket(SocketDataProvider* data)
pending_buf_(NULL),
pending_buf_len_(0),
pending_callback_(NULL),
+ net_log_(NetLog::Source(), net_log),
ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
DCHECK(data_);
data_->Reset();
@@ -1245,6 +1247,10 @@ int MockUDPClientSocket::GetLocalAddress(IPEndPoint* address) const {
return OK;
}
+const BoundNetLog& MockUDPClientSocket::NetLog() const {
+ return net_log_;
+}
+
int MockUDPClientSocket::Connect(const IPEndPoint& address) {
connected_ = true;
return OK;
diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h
index 3de7c75..ae4014c 100644
--- a/net/socket/socket_test_util.h
+++ b/net/socket/socket_test_util.h
@@ -768,7 +768,7 @@ class MockSSLClientSocket : public MockClientSocket, public AsyncSocket {
class MockUDPClientSocket : public DatagramClientSocket,
public AsyncSocket {
public:
- explicit MockUDPClientSocket(SocketDataProvider* data);
+ MockUDPClientSocket(SocketDataProvider* data, net::NetLog* net_log);
virtual ~MockUDPClientSocket();
// Socket interface
@@ -783,6 +783,7 @@ class MockUDPClientSocket : public DatagramClientSocket,
virtual void Close();
virtual int GetPeerAddress(IPEndPoint* address) const;
virtual int GetLocalAddress(IPEndPoint* address) const;
+ virtual const BoundNetLog& NetLog() const;
// DatagramClientSocket interface
virtual int Connect(const IPEndPoint& address);
@@ -807,6 +808,8 @@ class MockUDPClientSocket : public DatagramClientSocket,
int pending_buf_len_;
net::CompletionCallback* pending_callback_;
+ BoundNetLog net_log_;
+
ScopedRunnableMethodFactory<MockUDPClientSocket> method_factory_;
DISALLOW_COPY_AND_ASSIGN(MockUDPClientSocket);