Make Port (and subclasses) fully "Network"-based, instead of IP-based.

webrtc/p2p/base/fakeportallocator.h

 /*
  *  Copyright 2010 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 14 matching lines @@
 class Thread;
 }
 
 namespace cricket {
 
 class TestUDPPort : public UDPPort {
  public:
   static TestUDPPort* Create(rtc::Thread* thread,
                              rtc::PacketSocketFactory* factory,
                              rtc::Network* network,
-                             const rtc::IPAddress& ip,
                              uint16_t min_port,
                              uint16_t max_port,
                              const std::string& username,
                              const std::string& password,
                              const std::string& origin,
                              bool emit_localhost_for_anyaddress) {
-    TestUDPPort* port = new TestUDPPort(thread, factory, network, ip, min_port,
-                                        max_port, username, password, origin,
-                                        emit_localhost_for_anyaddress);
+    TestUDPPort* port =
+        new TestUDPPort(thread, factory, network, min_port, max_port, username,
+                        password, origin, emit_localhost_for_anyaddress);
     if (!port->Init()) {
       delete port;
       port = nullptr;
     }
     return port;
   }
   void SendBindingResponse(StunMessage* request,
                            const rtc::SocketAddress& addr) override {
     UDPPort::SendBindingResponse(request, addr);
     sent_binding_response_ = true;
   }
   bool sent_binding_response() { return sent_binding_response_; }
   void set_sent_binding_response(bool response) {
     sent_binding_response_ = response;
   }
 
  protected:
   TestUDPPort(rtc::Thread* thread,
               rtc::PacketSocketFactory* factory,
               rtc::Network* network,
-              const rtc::IPAddress& ip,
               uint16_t min_port,
               uint16_t max_port,
               const std::string& username,
               const std::string& password,
               const std::string& origin,
               bool emit_localhost_for_anyaddress)
       : UDPPort(thread,
                 factory,
                 network,
-                ip,
                 min_port,
                 max_port,
                 username,
                 password,
                 origin,
                 emit_localhost_for_anyaddress) {}
 
   bool sent_binding_response_ = false;
 };
 
@@ skipping 35 matching lines @@
   void SetCandidateFilter(uint32_t filter) override {
     candidate_filter_ = filter;
   }
 
   void StartGettingPorts() override {
     if (!port_) {
       rtc::Network& network =
           (rtc::HasIPv6Enabled() && (flags() & PORTALLOCATOR_ENABLE_IPV6))
               ? ipv6_network_
               : ipv4_network_;
-      port_.reset(TestUDPPort::Create(network_thread_, factory_, &network,
-                                      network.GetBestIP(), 0, 0, username(),
-                                      password(), std::string(), false));
+      port_.reset(TestUDPPort::Create(network_thread_, factory_, &network, 0, 0,
+                                      username(), password(), std::string(),
+                                      false));
       port_->SignalDestroyed.connect(
           this, &FakePortAllocatorSession::OnPortDestroyed);
       AddPort(port_.get());
     }
     ++port_config_count_;
     running_ = true;
   }
 
   void StopGettingPorts() override { running_ = false; }
   bool IsGettingPorts() override { return running_; }
@@ skipping 103 matching lines @@
  private:
   rtc::Thread* network_thread_;
   rtc::PacketSocketFactory* factory_;
   std::unique_ptr<rtc::BasicPacketSocketFactory> owned_factory_;
   bool initialized_ = false;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_FAKEPORTALLOCATOR_H_