| Index: net/dns/mock_mdns_socket_factory.h
|
| diff --git a/net/dns/mock_mdns_socket_factory.h b/net/dns/mock_mdns_socket_factory.h
|
| index af54e32e533790238b0cf84a2180973f39ab7e07..2bd4aef522083e6936a941d967fad886c1d8a7bc 100644
|
| --- a/net/dns/mock_mdns_socket_factory.h
|
| +++ b/net/dns/mock_mdns_socket_factory.h
|
| @@ -12,53 +12,20 @@
|
|
|
| namespace net {
|
|
|
| -class MockMDnsDatagramServerSocket : public DatagramServerSocket {
|
| +class MockMDnsDatagramServerSocket : public MDnsConnection::Socket {
|
| public:
|
| MockMDnsDatagramServerSocket();
|
| ~MockMDnsDatagramServerSocket();
|
|
|
| - // DatagramServerSocket implementation:
|
| - int Listen(const IPEndPoint& address);
|
| -
|
| - MOCK_METHOD1(ListenInternal, int(const std::string& address));
|
| -
|
| + // MDnsConnection::Socket implementation:
|
| MOCK_METHOD4(RecvFrom, int(IOBuffer* buffer, int size,
|
| IPEndPoint* address,
|
| const CompletionCallback& callback));
|
| + int SendTo(IOBuffer* buf, int buf_len, const CompletionCallback& callback);
|
|
|
| - int SendTo(IOBuffer* buf, int buf_len, const IPEndPoint& address,
|
| - const CompletionCallback& callback);
|
| -
|
| - MOCK_METHOD3(SendToInternal, int(const std::string& packet,
|
| - const std::string address,
|
| + MOCK_METHOD2(SendToInternal, int(const std::string& packet,
|
| const CompletionCallback& callback));
|
|
|
| - MOCK_METHOD1(SetReceiveBufferSize, bool(int32 size));
|
| - MOCK_METHOD1(SetSendBufferSize, bool(int32 size));
|
| -
|
| - MOCK_METHOD0(Close, void());
|
| -
|
| - MOCK_CONST_METHOD1(GetPeerAddress, int(IPEndPoint* address));
|
| - MOCK_CONST_METHOD1(GetLocalAddress, int(IPEndPoint* address));
|
| - MOCK_CONST_METHOD0(NetLog, const BoundNetLog&());
|
| -
|
| - MOCK_METHOD0(AllowAddressReuse, void());
|
| - MOCK_METHOD0(AllowBroadcast, void());
|
| -
|
| - int JoinGroup(const IPAddressNumber& group_address) const;
|
| -
|
| - MOCK_CONST_METHOD1(JoinGroupInternal, int(const std::string& group));
|
| -
|
| - int LeaveGroup(const IPAddressNumber& group_address) const;
|
| -
|
| - MOCK_CONST_METHOD1(LeaveGroupInternal, int(const std::string& group));
|
| -
|
| - MOCK_METHOD1(SetMulticastTimeToLive, int(int ttl));
|
| -
|
| - MOCK_METHOD1(SetMulticastLoopbackMode, int(bool loopback));
|
| -
|
| - MOCK_METHOD1(SetDiffServCodePoint, int(DiffServCodePoint dscp));
|
| -
|
| void SetResponsePacket(std::string response_packet);
|
|
|
| int HandleRecvNow(IOBuffer* buffer, int size, IPEndPoint* address,
|
| @@ -74,17 +41,17 @@ class MockMDnsDatagramServerSocket : public DatagramServerSocket {
|
| class MockMDnsSocketFactory : public MDnsConnection::SocketFactory {
|
| public:
|
| MockMDnsSocketFactory();
|
| -
|
| virtual ~MockMDnsSocketFactory();
|
|
|
| - virtual scoped_ptr<DatagramServerSocket> CreateSocket() OVERRIDE;
|
| + virtual void CreateSockets(
|
| + ScopedVector<MDnsConnection::Socket>* sockets) OVERRIDE;
|
|
|
| void SimulateReceive(const uint8* packet, int size);
|
|
|
| MOCK_METHOD1(OnSendTo, void(const std::string&));
|
|
|
| private:
|
| - int SendToInternal(const std::string& packet, const std::string& address,
|
| + int SendToInternal(const std::string& packet,
|
| const CompletionCallback& callback);
|
|
|
| // The latest receive callback is always saved, since the MDnsConnection
|
|
|