Fixing invalid operator< implementation.

webrtc/p2p/client/basicportallocator_unittest.cc

 /*
  *  Copyright 2009 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 1273 matching lines @@
   // |candidates_|, although |ready_candidates| only includes the candidates
   // in |ready_ports|.
   EXPECT_LE(3U, candidates_.size());
   const std::vector<Candidate>& ready_candidates = session_->ReadyCandidates();
   EXPECT_EQ(3U, ready_candidates.size());
   EXPECT_PRED4(HasCandidate, ready_candidates, "local", "udp", kClientAddr);
   EXPECT_PRED4(HasCandidate, ready_candidates, "relay", "udp",
                rtc::SocketAddress(kTurnUdpExtAddr.ipaddr(), 0));
 }
 
-// Test has an assert error on win_x64_dbg and win_dbg. See: webrtc:6068
-#if defined(WEBRTC_WIN)
-#define MAYBE_TestEachInterfaceHasItsOwnTurnPorts \
-  DISABLED_TestEachInterfaceHasItsOwnTurnPort
-#else
-#define MAYBE_TestEachInterfaceHasItsOwnTurnPorts \
-  TestEachInterfaceHasItsOwnTurnPorts
-#endif
 // Tests that if prune_turn_ports is set, each network interface
 // will has its own set of TurnPorts based on their priorities.
-TEST_F(BasicPortAllocatorTest, MAYBE_TestEachInterfaceHasItsOwnTurnPorts) {
+TEST_F(BasicPortAllocatorTest, TestEachInterfaceHasItsOwnTurnPorts) {
   turn_server_.AddInternalSocket(kTurnTcpIntAddr, PROTO_TCP);
   turn_server_.AddInternalSocket(kTurnUdpIntIPv6Addr, PROTO_UDP);
   turn_server_.AddInternalSocket(kTurnTcpIntIPv6Addr, PROTO_TCP);
   // Add two interfaces both having IPv4 and IPv6 addresses.
   AddInterface(kClientAddr, "net1", rtc::ADAPTER_TYPE_WIFI);
   AddInterface(kClientIPv6Addr, "net1", rtc::ADAPTER_TYPE_WIFI);
   AddInterface(kClientAddr2, "net2", rtc::ADAPTER_TYPE_CELLULAR);
   AddInterface(kClientIPv6Addr2, "net2", rtc::ADAPTER_TYPE_CELLULAR);
   allocator_.reset(new BasicPortAllocator(&network_manager_));
   allocator_->SetConfiguration(allocator_->stun_servers(),
@@ skipping 398 matching lines @@
   for (const Candidate& candidate : candidates) {
     // Expect only relay candidates now that the filter is applied.
     EXPECT_EQ(std::string(RELAY_PORT_TYPE), candidate.type());
     // Expect that the raddr is emptied due to the CF_RELAY filter.
     EXPECT_EQ(candidate.related_address(),
               rtc::EmptySocketAddressWithFamily(candidate.address().family()));
   }
 }
 
 }  // namespace cricket