Track pending ICE restarts independently for different media sections.

talk/app/webrtc/webrtcsession.h

 /*
  * libjingle
  * Copyright 2012 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 283 matching lines @@
   virtual bool GetLocalCertificate(
       const std::string& transport_name,
       rtc::scoped_refptr<rtc::RTCCertificate>* certificate);
 
   // Caller owns returned certificate
   virtual bool GetRemoteSSLCertificate(const std::string& transport_name,
                                        rtc::SSLCertificate** cert);
 
   cricket::DataChannelType data_channel_type() const;
 
-  bool IceRestartPending() const;
-
-  void ResetIceRestartLatch();
+  // TODO(deadbeef): Replace these with:
+  // bool IceRestartPending(const std::string& mid) const;

[honghaiz3, 2016/02/10 01:01:48]

Does this need a lot of work?
If not, maybe it can be done in this CL. 

[Taylor Brandstetter, 2016/02/10 21:18:32]

I couldn't do this before because there was an issue with mids not matching up
between successive offer/answer exchanges. But since that's fixed, I went ahead
and did the necessary refactoring.

+  bool AudioIceRestartPending() const;
+  bool VideoIceRestartPending() const;
+  bool DataIceRestartPending() const;
 
   // Called when an RTCCertificate is generated or retrieved by
   // WebRTCSessionDescriptionFactory. Should happen before setLocalDescription.
   void OnCertificateReady(
       const rtc::scoped_refptr<rtc::RTCCertificate>& certificate);
   void OnDtlsSetupFailure(cricket::BaseChannel*, bool rtcp);
 
   // For unit test.
   bool waiting_for_certificate_for_testing() const;
   const rtc::scoped_refptr<rtc::RTCCertificate>& certificate_for_testing();
@@ skipping 179 matching lines @@
   bool older_version_remote_peer_;
   bool dtls_enabled_;
   // Specifies which kind of data channel is allowed. This is controlled
   // by the chrome command-line flag and constraints:
   // 1. If chrome command-line switch 'enable-sctp-data-channels' is enabled,
   // constraint kEnableDtlsSrtp is true, and constaint kEnableRtpDataChannels is
   // not set or false, SCTP is allowed (DCT_SCTP);
   // 2. If constraint kEnableRtpDataChannels is true, RTP is allowed (DCT_RTP);
   // 3. If both 1&2 are false, data channel is not allowed (DCT_NONE).
   cricket::DataChannelType data_channel_type_;
-  rtc::scoped_ptr<IceRestartAnswerLatch> ice_restart_latch_;
+  rtc::scoped_ptr<IceRestartAnswerLatch> audio_ice_restart_latch_;
+  rtc::scoped_ptr<IceRestartAnswerLatch> video_ice_restart_latch_;
+  rtc::scoped_ptr<IceRestartAnswerLatch> data_ice_restart_latch_;
 
   rtc::scoped_ptr<WebRtcSessionDescriptionFactory>
       webrtc_session_desc_factory_;
 
   // Member variables for caching global options.
   cricket::AudioOptions audio_options_;
   cricket::VideoOptions video_options_;
   MetricsObserverInterface* metrics_observer_;
 
   // Declares the bundle policy for the WebRTCSession.
   PeerConnectionInterface::BundlePolicy bundle_policy_;
 
   // Declares the RTCP mux policy for the WebRTCSession.
   PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
 };
 }  // namespace webrtc
 
 #endif  // TALK_APP_WEBRTC_WEBRTCSESSION_H_