Update prflx candidates' generation when setting ICE credentials.

webrtc/api/peerconnection_unittest.cc

 /*
  *  Copyright 2012 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 1169 matching lines @@
   }
 
   void EnableVideoDecoderFactory() {
     initiating_client_->EnableVideoDecoderFactory();
     receiving_client_->EnableVideoDecoderFactory();
   }
 
   // This test sets up a call between two parties. Both parties send static
   // frames to each other. Once the test is finished the number of sent frames
   // is compared to the number of received frames.
-  void LocalP2PTest() { LocalP2PTest(false); }
-  // TODO(perkj); Remove the flag bug5752 when
-  // https://bugs.chromium.org/p/webrtc/issues/detail?id=5752 is fixed.
-  void LocalP2PTest(bool bug5752) {
+  void LocalP2PTest() {
     if (initiating_client_->NumberOfLocalMediaStreams() == 0) {
       initiating_client_->AddMediaStream(true, true);
     }
     initiating_client_->Negotiate();
     // Assert true is used here since next tests are guaranteed to fail and
     // would eat up 5 seconds.
     ASSERT_TRUE_WAIT(SessionActive(), kMaxWaitForActivationMs);
     VerifySessionDescriptions();
 
     int audio_frame_count = kEndAudioFrameCount;
     int video_frame_count = kEndVideoFrameCount;
     // TODO(ronghuawu): Add test to cover the case of sendonly and recvonly.
 
     if ((!initiating_client_->can_receive_audio() &&
          !initiating_client_->can_receive_video()) ||
         (!receiving_client_->can_receive_audio() &&
          !receiving_client_->can_receive_video())) {
       // Neither audio nor video will flow, so connections won't be
       // established. There's nothing more to check.
       // TODO(hta): Check connection if there's a data channel.
       return;
     }
 
     // Audio or video is expected to flow, so both clients should reach the
     // Connected state, and the offerer (ICE controller) should proceed to
     // Completed.
     // Note: These tests have been observed to fail under heavy load at
     // shorter timeouts, so they may be flaky.
-    if (bug5752) {
-      EXPECT_TRUE_WAIT(
-          initiating_client_->ice_connection_state() ==
-                  webrtc::PeerConnectionInterface::kIceConnectionCompleted ||
-              initiating_client_->ice_connection_state() ==
-                  webrtc::PeerConnectionInterface::kIceConnectionConnected,
-          kMaxWaitForFramesMs);
-    } else {
-      EXPECT_EQ_WAIT(webrtc::PeerConnectionInterface::kIceConnectionCompleted,
-                     initiating_client_->ice_connection_state(),
-                     kMaxWaitForFramesMs);
-    }
+    EXPECT_EQ_WAIT(webrtc::PeerConnectionInterface::kIceConnectionCompleted,
+                   initiating_client_->ice_connection_state(),
+                   kMaxWaitForFramesMs);
     EXPECT_EQ_WAIT(webrtc::PeerConnectionInterface::kIceConnectionConnected,
                    receiving_client_->ice_connection_state(),
                    kMaxWaitForFramesMs);
 
     // The ICE gathering state should end up in kIceGatheringComplete,
     // but there's a bug that prevents this at the moment, and the state
     // machine is being updated by the WEBRTC WG.
     // TODO(hta): Update this check when spec revisions finish.
     EXPECT_NE(webrtc::PeerConnectionInterface::kIceGatheringNew,
               initiating_client_->ice_gathering_state());
@@ skipping 210 matching lines @@
   SetupAndVerifyDtlsCall();
 
   // Keeping the original peer around which will still send packets to the
   // receiving client. These SRTP packets will be dropped.
   rtc::scoped_ptr<PeerConnectionTestClient> original_peer(
       set_receiving_client(CreateDtlsClientWithAlternateKey()));
   original_peer->pc()->Close();
 
   SetSignalingReceivers();
   initializing_client()->IceRestart();
-  // TODO(perkj): Remove the flag bug5752 when
-  // https://bugs.chromium.org/p/webrtc/issues/detail?id=5752 is fixed.
-  LocalP2PTest(true /* bug5752 */);
+  LocalP2PTest();
   VerifyRenderedSize(640, 480);
 }
 
 TEST_F(P2PTestConductor, LocalP2PTestCVO) {
   ASSERT_TRUE(CreateTestClients());
   SetCaptureRotation(webrtc::kVideoRotation_90);
   LocalP2PTest();
   VerifyRenderedSize(640, 480, webrtc::kVideoRotation_90);
 }
 
@@ skipping 703 matching lines @@
   server.urls.push_back("turn:hostname2");
   servers.push_back(server);
   EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_));
   EXPECT_EQ(2U, turn_servers_.size());
   EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority);
 }
 
 #endif // if !defined(THREAD_SANITIZER)
 
 }  // namespace