"Reland" of r241209. DialServiceImpl now binds to all ipv4 and interfaces instead of just the first

chrome/browser/extensions/api/dial/dial_service_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/extensions/api/dial/dial_device_data.h"
 #include "chrome/browser/extensions/api/dial/dial_service.h"
 #include "net/base/capturing_net_log.h"
@@ skipping 49 matching lines @@
   base::MessageLoop loop(base::MessageLoop::TYPE_IO);
   // Setting the finish delay to zero disables the timer that invokes
   // FinishDiscovery().
   dial_service_.finish_delay_ = TimeDelta::FromSeconds(0);
   dial_service_.request_interval_ = TimeDelta::FromSeconds(0);
   dial_service_.max_requests_ = 4;
   dial_service_.discovery_active_ = true;
   EXPECT_CALL(mock_observer_, OnDiscoveryRequest(A<DialService*>())).Times(4);
   EXPECT_CALL(mock_observer_, OnDiscoveryFinished(A<DialService*>())).Times(1);
   dial_service_.BindAndAddSocket(mock_ip_);
+  EXPECT_EQ(1u, dial_service_.dial_sockets_.size());

[mark a. foltz, 2013/12/19 17:27:41]

I don't think it's necessary to designate constants as unsigned here.

   dial_service_.SendOneRequest();
   loop.RunUntilIdle();
   dial_service_.FinishDiscovery();
 }
 
+TEST_F(DialServiceTest, TestMultipleNetworkInterfaces) {
+  base::MessageLoop loop(base::MessageLoop::TYPE_IO);
+  // Setting the finish delay to zero disables the timer that invokes
+  // FinishDiscovery().
+  dial_service_.finish_delay_ = TimeDelta::FromSeconds(0);
+  dial_service_.request_interval_ = TimeDelta::FromSeconds(0);
+  dial_service_.max_requests_ = 4;
+  dial_service_.discovery_active_ = true;
+  net::NetworkInterfaceList interface_list;
+  interface_list.push_back(net::NetworkInterface("network1", 0, mock_ip_, 0));
+  interface_list.push_back(net::NetworkInterface("network2", 1, mock_ip_, 0));
+  interface_list.push_back(net::NetworkInterface("network3", 2, mock_ip_, 0));
+
+  // "network4" is equivalent to "network2" because both the address family
+  // and interface index are the same.
+  interface_list.push_back(net::NetworkInterface("network4", 1, mock_ip_, 0));
+
+  // 3 sockets * 4 requests per socket = 12 requests
+  EXPECT_CALL(mock_observer_, OnDiscoveryRequest(A<DialService*>())).Times(12);
+  EXPECT_CALL(mock_observer_, OnDiscoveryFinished(A<DialService*>())).Times(1);
+
+  dial_service_.SendNetworkList(interface_list);
+  EXPECT_EQ(3u, dial_service_.dial_sockets_.size());

[mark a. foltz, 2013/12/19 17:27:41]

Ditto.

+
+  loop.RunUntilIdle();
+  dial_service_.FinishDiscovery();
+}
+
 TEST_F(DialServiceTest, TestOnDiscoveryRequest) {
   dial_service_.discovery_active_ = true;
   dial_service_.num_requests_sent_ = 1;
   dial_service_.max_requests_ = 1;
   size_t num_bytes = dial_service_.send_buffer_->size();
   EXPECT_CALL(mock_observer_, OnDiscoveryRequest(A<DialService*>())).Times(1);
   dial_socket_->OnSocketWrite(num_bytes, num_bytes);
 }
 
 TEST_F(DialServiceTest, TestOnDeviceDiscovered) {
@@ skipping 74 matching lines @@
 
   // Empty USN
   EXPECT_FALSE(DialServiceImpl::DialSocket::ParseResponse(
       "HTTP/1.1 OK\r\n"
       "LOCATION: http://127.0.0.1/dd.xml\r\n"
       "USN:\r\n\r\n",
       now, &not_parsed));
 }
 
 }  // namespace extensions