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

chrome/browser/extensions/api/dial/dial_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_DIAL_DIAL_SERVICE_H_
 #define CHROME_BROWSER_EXTENSIONS_API_DIAL_DIAL_SERVICE_H_
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
@@ skipping 108 matching lines @@
     // here.
     DialSocket(
         const base::Closure& discovery_request_cb,
         const base::Callback<void(const DialDeviceData&)>& device_discovered_cb,
         const base::Closure& on_error_cb);
     ~DialSocket();
 
     // Creates a socket using |net_log| and |net_log_source| and binds it to
     // |bind_ip_address|.
     bool CreateAndBindSocket(const net::IPAddressNumber& bind_ip_address,
-                    net::NetLog* net_log,
-                    net::NetLog::Source net_log_source);
+                             net::NetLog* net_log,
+                             net::NetLog::Source net_log_source);
 
     // Sends a single discovery request |send_buffer| to |send_address|
     // over the socket.
     void SendOneRequest(const net::IPEndPoint& send_address,
                         const scoped_refptr<net::StringIOBuffer>& send_buffer);
 
     // Returns true if the socket is closed.
     bool IsClosed();
 
    private:
@@ skipping 47 matching lines @@
 
     // The callback to be invoked when there is an error with socket operations.
     base::Closure on_error_cb_;
 
     // Marks whether there is an active write callback.
     bool is_writing_;
 
     // Marks whether there is an active read callback.
     bool is_reading_;
 
+    FRIEND_TEST_ALL_PREFIXES(DialServiceTest, TestNotifyOnError);
     FRIEND_TEST_ALL_PREFIXES(DialServiceTest, TestOnDeviceDiscovered);
     FRIEND_TEST_ALL_PREFIXES(DialServiceTest, TestOnDiscoveryRequest);
     FRIEND_TEST_ALL_PREFIXES(DialServiceTest, TestResponseParsing);
     DISALLOW_COPY_AND_ASSIGN(DialSocket);
   };
 
   // Starts the control flow for one discovery cycle.
   void StartDiscovery();
 
-  // Send the network list to IO thread.
+  // For each network interface in |list|, finds all unqiue IPv4 network
+  // interfaces and call |DiscoverOnAddresses()| with their IP addresses.
   void SendNetworkList(const net::NetworkInterfaceList& list);
 
   // Calls |BindAndAddSocket()| for each address in |ip_addresses|, calls
   // |SendOneRequest()|, and start the timer to finish discovery if needed.
+  // The (Address family, interface index) of each address in |ip_addresses|
+  // must be unique. If |ip_address| is empty, calls |FinishDiscovery()|.
   void DiscoverOnAddresses(
       const std::vector<net::IPAddressNumber>& ip_addresses);
 
   // Creates a DialSocket, binds it to |bind_ip_address| and if
   // successful, add the DialSocket to |dial_sockets_|.
   void BindAndAddSocket(const net::IPAddressNumber& bind_ip_address);
 
   // Creates a DialSocket with callbacks to this object.
   scoped_ptr<DialSocket> CreateDialSocket();
 
@@ skipping 56 matching lines @@
   base::TimeDelta request_interval_;
 
   // List of observers.
   ObserverList<Observer> observer_list_;
 
   // Thread checker.
   base::ThreadChecker thread_checker_;
 
   friend class DialServiceTest;
   FRIEND_TEST_ALL_PREFIXES(DialServiceTest, TestSendMultipleRequests);
+  FRIEND_TEST_ALL_PREFIXES(DialServiceTest, TestMultipleNetworkInterfaces);
+  FRIEND_TEST_ALL_PREFIXES(DialServiceTest, TestNotifyOnError);
   FRIEND_TEST_ALL_PREFIXES(DialServiceTest, TestOnDeviceDiscovered);
   FRIEND_TEST_ALL_PREFIXES(DialServiceTest, TestOnDiscoveryFinished);
   FRIEND_TEST_ALL_PREFIXES(DialServiceTest, TestOnDiscoveryRequest);
   FRIEND_TEST_ALL_PREFIXES(DialServiceTest, TestResponseParsing);
   DISALLOW_COPY_AND_ASSIGN(DialServiceImpl);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_DIAL_DIAL_SERVICE_H_