| Index: net/dns/mock_mdns_socket_factory.cc
|
| diff --git a/net/dns/mock_mdns_socket_factory.cc b/net/dns/mock_mdns_socket_factory.cc
|
| index 0bb8c5401dd8a8c7fb663fb2ec9bc298bac9bb73..60e6e29339a92140ac59e3d83c3a23aea88cc2bf 100644
|
| --- a/net/dns/mock_mdns_socket_factory.cc
|
| +++ b/net/dns/mock_mdns_socket_factory.cc
|
| @@ -20,11 +20,12 @@ MockMDnsDatagramServerSocket::MockMDnsDatagramServerSocket(
|
| MockMDnsDatagramServerSocket::~MockMDnsDatagramServerSocket() {
|
| }
|
|
|
| -int MockMDnsDatagramServerSocket::SendTo(IOBuffer* buf, int buf_len,
|
| +int MockMDnsDatagramServerSocket::SendTo(IOBuffer* buf,
|
| + int buf_len,
|
| const IPEndPoint& address,
|
| const CompletionCallback& callback) {
|
| - return SendToInternal(std::string(buf->data(), buf_len), address.ToString(),
|
| - callback);
|
| + return SendToInternal(
|
| + std::string(buf->data(), buf_len), address.ToString(), callback);
|
| }
|
|
|
| int MockMDnsDatagramServerSocket::GetLocalAddress(IPEndPoint* address) const {
|
| @@ -38,7 +39,9 @@ void MockMDnsDatagramServerSocket::SetResponsePacket(
|
| }
|
|
|
| int MockMDnsDatagramServerSocket::HandleRecvNow(
|
| - IOBuffer* buffer, int size, IPEndPoint* address,
|
| + IOBuffer* buffer,
|
| + int size,
|
| + IPEndPoint* address,
|
| const CompletionCallback& callback) {
|
| int size_returned =
|
| std::min(response_packet_.size(), static_cast<size_t>(size));
|
| @@ -47,7 +50,9 @@ int MockMDnsDatagramServerSocket::HandleRecvNow(
|
| }
|
|
|
| int MockMDnsDatagramServerSocket::HandleRecvLater(
|
| - IOBuffer* buffer, int size, IPEndPoint* address,
|
| + IOBuffer* buffer,
|
| + int size,
|
| + IPEndPoint* address,
|
| const CompletionCallback& callback) {
|
| int rv = HandleRecvNow(buffer, size, address, callback);
|
| base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback, rv));
|
| @@ -73,14 +78,10 @@ void MockMDnsSocketFactory::CreateSocket(
|
| new testing::NiceMock<MockMDnsDatagramServerSocket>(address_family));
|
|
|
| ON_CALL(*new_socket, SendToInternal(_, _, _))
|
| - .WillByDefault(Invoke(
|
| - this,
|
| - &MockMDnsSocketFactory::SendToInternal));
|
| + .WillByDefault(Invoke(this, &MockMDnsSocketFactory::SendToInternal));
|
|
|
| ON_CALL(*new_socket, RecvFrom(_, _, _, _))
|
| - .WillByDefault(Invoke(
|
| - this,
|
| - &MockMDnsSocketFactory::RecvFromInternal));
|
| + .WillByDefault(Invoke(this, &MockMDnsSocketFactory::RecvFromInternal));
|
|
|
| sockets->push_back(new_socket.release());
|
| }
|
| @@ -97,18 +98,19 @@ void MockMDnsSocketFactory::SimulateReceive(const uint8* packet, int size) {
|
| }
|
|
|
| int MockMDnsSocketFactory::RecvFromInternal(
|
| - IOBuffer* buffer, int size,
|
| + IOBuffer* buffer,
|
| + int size,
|
| IPEndPoint* address,
|
| const CompletionCallback& callback) {
|
| - recv_buffer_ = buffer;
|
| - recv_buffer_size_ = size;
|
| - recv_callback_ = callback;
|
| - return ERR_IO_PENDING;
|
| + recv_buffer_ = buffer;
|
| + recv_buffer_size_ = size;
|
| + recv_callback_ = callback;
|
| + return ERR_IO_PENDING;
|
| }
|
|
|
| -int MockMDnsSocketFactory::SendToInternal(
|
| - const std::string& packet, const std::string& address,
|
| - const CompletionCallback& callback) {
|
| +int MockMDnsSocketFactory::SendToInternal(const std::string& packet,
|
| + const std::string& address,
|
| + const CompletionCallback& callback) {
|
| OnSendTo(packet);
|
| return packet.size();
|
| }
|
|
|