Refactored to make MDnsSocketFactory return array of sockets.

net/dns/mock_mdns_socket_factory.cc

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 8c08c150cd1dfa7a50556a7dc0991bd67965e594..a8c1d5facce97d4ad4a296934540c7e012186b05 100644
--- a/net/dns/mock_mdns_socket_factory.cc
+++ b/net/dns/mock_mdns_socket_factory.cc
@@ -19,24 +19,8 @@ MockMDnsDatagramServerSocket::~MockMDnsDatagramServerSocket() {
 }
 
 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);
-}
-
-int MockMDnsDatagramServerSocket::Listen(const IPEndPoint& address) {
-    return ListenInternal(address.ToString());
-}
-
-int MockMDnsDatagramServerSocket::JoinGroup(
-    const IPAddressNumber& group_address) const {
-  return JoinGroupInternal(IPAddressToString(group_address));
-}
-
-int MockMDnsDatagramServerSocket::LeaveGroup(
-    const IPAddressNumber& group_address) const {
-  return LeaveGroupInternal(IPAddressToString(group_address));
+                                         const CompletionCallback& callback) {
+  return SendToInternal(std::string(buf->data(), buf_len), callback);
 }
 
 void MockMDnsDatagramServerSocket::SetResponsePacket(
@@ -67,21 +51,24 @@ MockMDnsSocketFactory::MockMDnsSocketFactory() {
 MockMDnsSocketFactory::~MockMDnsSocketFactory() {
 }
 
-scoped_ptr<DatagramServerSocket> MockMDnsSocketFactory::CreateSocket() {
-  scoped_ptr<MockMDnsDatagramServerSocket> new_socket(
-      new testing:: NiceMock<MockMDnsDatagramServerSocket>);
+void MockMDnsSocketFactory::CreateSockets(
+    ScopedVector<MDnsConnection::Socket>* sockets) {
+  for (size_t i = 0; i < 2; ++i) {
+    scoped_ptr<MockMDnsDatagramServerSocket> new_socket(
+        new testing::NiceMock<MockMDnsDatagramServerSocket>());
 
-  ON_CALL(*new_socket, SendToInternal(_, _, _))
-      .WillByDefault(Invoke(
-          this,
-          &MockMDnsSocketFactory::SendToInternal));
+    ON_CALL(*new_socket, SendToInternal(_, _))
+        .WillByDefault(Invoke(
+            this,
+            &MockMDnsSocketFactory::SendToInternal));
 
-  ON_CALL(*new_socket, RecvFrom(_, _, _, _))
-      .WillByDefault(Invoke(
-          this,
-          &MockMDnsSocketFactory::RecvFromInternal));
+    ON_CALL(*new_socket, RecvFrom(_, _, _, _))
+        .WillByDefault(Invoke(
+            this,
+            &MockMDnsSocketFactory::RecvFromInternal));
 
-  return new_socket.PassAs<DatagramServerSocket>();
+    sockets->push_back(new_socket.release());
+  }
 }
 
 void MockMDnsSocketFactory::SimulateReceive(const uint8* packet, int size) {
@@ -105,9 +92,8 @@ int MockMDnsSocketFactory::RecvFromInternal(
     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 CompletionCallback& callback) {
   OnSendTo(packet);
   return packet.size();
 }