Make the default value of rtcp-mux policy to required.

webrtc/api/webrtcsession_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 364 matching lines @@
   }
   void RemoveInterface(const SocketAddress& addr) {
     network_manager_.RemoveInterface(addr);
   }
 
   // If |cert_generator| != null or |rtc_configuration| contains |certificates|
   // then DTLS will be enabled unless explicitly disabled by |rtc_configuration|
   // options. When DTLS is enabled a certificate will be used if provided,
   // otherwise one will be generated using the |cert_generator|.
   void Init(
-      std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator) {
+      std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator,
+      PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy) {
     ASSERT_TRUE(session_.get() == NULL);
     session_.reset(new WebRtcSessionForTest(
         media_controller_.get(), rtc::Thread::Current(), rtc::Thread::Current(),
         rtc::Thread::Current(), allocator_.get(), &observer_));
     session_->SignalDataChannelOpenMessage.connect(
         this, &WebRtcSessionTest::OnDataChannelOpenMessage);
     session_->GetOnDestroyedSignal()->connect(
         this, &WebRtcSessionTest::OnSessionDestroyed);
 
+    configuration_.rtcp_mux_policy = rtcp_mux_policy;
     EXPECT_EQ(PeerConnectionInterface::kIceConnectionNew,
         observer_.ice_connection_state_);
     EXPECT_EQ(PeerConnectionInterface::kIceGatheringNew,
         observer_.ice_gathering_state_);
 
     EXPECT_TRUE(session_->Initialize(options_, std::move(cert_generator),
                                      configuration_));
     session_->set_metrics_observer(metrics_observer_);
   }
 
   void OnDataChannelOpenMessage(const std::string& label,
                                 const InternalDataChannelInit& config) {
     last_data_channel_label_ = label;
     last_data_channel_config_ = config;
   }
 
   void OnSessionDestroyed() { session_destroyed_ = true; }
 
-  void Init() { Init(nullptr); }
+  void Init() {
+    Init(nullptr, PeerConnectionInterface::kRtcpMuxPolicyNegotiate);
+  }

[Zhi Huang, 2016/06/22 00:23:06]

In the unit test, the default value for Init() is still Negotiate so that we do
not have to modify each test cases. I think this would be fine because this unit
test should have covered both Negotiate and Require no mater what the default
one is.

+
+  void Init(PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy) {
+    Init(nullptr, rtcp_mux_policy);
+  }
 
   void InitWithBundlePolicy(
       PeerConnectionInterface::BundlePolicy bundle_policy) {
     configuration_.bundle_policy = bundle_policy;
     Init();
   }
 
   void InitWithRtcpMuxPolicy(
       PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy) {
     PeerConnectionInterface::RTCConfiguration configuration;
-    configuration_.rtcp_mux_policy = rtcp_mux_policy;
-    Init();
+    Init(rtcp_mux_policy);
   }
 
   // Successfully init with DTLS; with a certificate generated and supplied or
   // with a store that generates it for us.
   void InitWithDtls(RTCCertificateGenerationMethod cert_gen_method) {
     std::unique_ptr<FakeRTCCertificateGenerator> cert_generator;
     if (cert_gen_method == ALREADY_GENERATED) {
       configuration_.certificates.push_back(
           FakeRTCCertificateGenerator::GenerateCertificate());
     } else if (cert_gen_method == DTLS_IDENTITY_STORE) {
       cert_generator.reset(new FakeRTCCertificateGenerator());
       cert_generator->set_should_fail(false);
     } else {
       RTC_CHECK(false);
     }
-    Init(std::move(cert_generator));
+    Init(std::move(cert_generator),
+         PeerConnectionInterface::kRtcpMuxPolicyNegotiate);
   }
 
   // Init with DTLS with a store that will fail to generate a certificate.
   void InitWithDtlsIdentityGenFail() {
     std::unique_ptr<FakeRTCCertificateGenerator> cert_generator(
         new FakeRTCCertificateGenerator());
     cert_generator->set_should_fail(true);
-    Init(std::move(cert_generator));
+    Init(std::move(cert_generator),
+         PeerConnectionInterface::kRtcpMuxPolicyNegotiate);
   }
 
   void InitWithDtmfCodec() {
     // Add kTelephoneEventCodec for dtmf test.
     const cricket::AudioCodec kTelephoneEventCodec(106, "telephone-event", 8000,
                                                    0, 1);
     std::vector<cricket::AudioCodec> codecs;
     codecs.push_back(kTelephoneEventCodec);
     media_engine_->SetAudioCodecs(codecs);
     desc_factory_->set_audio_codecs(codecs);
@@ skipping 2812 matching lines @@
 // should not receive any changes in the ICE state.
 TEST_F(WebRtcSessionTest, TestAddChannelToConnectedBundle) {
   LoopbackNetworkConfiguration config;
   LoopbackNetworkManager loopback_network_manager(this, config);
   // Both BUNDLE and RTCP-mux need to be enabled for the ICE state to remain
   // connected. Disabling either of these two means that we need to wait for the
   // answer to find out if more transports are needed.
   configuration_.bundle_policy =
       PeerConnectionInterface::kBundlePolicyMaxBundle;
   configuration_.rtcp_mux_policy =
       PeerConnectionInterface::kRtcpMuxPolicyRequire;

[Taylor Brandstetter, 2016/06/22 17:01:09]

If we're passing the policy into Init, we probably don't need to set it here.
Someone reading the test may be confused.

[Zhi Huang, 2016/06/22 21:41:28]

I agree.

   options_.disable_encryption = true;
-  Init();
+  Init(PeerConnectionInterface::kRtcpMuxPolicyRequire);
 
   // Negotiate an audio channel with MAX_BUNDLE enabled.
   SendAudioOnlyStream2();
   SessionDescriptionInterface* offer = CreateOffer();
   SetLocalDescriptionWithoutError(offer);
   EXPECT_EQ_WAIT(PeerConnectionInterface::kIceGatheringComplete,
                  observer_.ice_gathering_state_, kIceCandidatesTimeout);
   std::string sdp;
   offer->ToString(&sdp);
   SessionDescriptionInterface* answer = webrtc::CreateSessionDescription(
@@ skipping 1122 matching lines @@
 }
 
 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled.  That test
 // currently fails because upon disconnection and reconnection OnIceComplete is
 // called more than once without returning to IceGatheringGathering.
 
 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests,
                         WebRtcSessionTest,
                         testing::Values(ALREADY_GENERATED,
                                         DTLS_IDENTITY_STORE));