Fixing some issues with ICE restart signaling.

talk/app/webrtc/webrtcsession.h

Index: talk/app/webrtc/webrtcsession.h
diff --git a/talk/app/webrtc/webrtcsession.h b/talk/app/webrtc/webrtcsession.h
index d9c40d1a83b9e2df2195798c103275529befba48..f0e021f64fa81bdb9521af63f97dde0268194a11 100644
--- a/talk/app/webrtc/webrtcsession.h
+++ b/talk/app/webrtc/webrtcsession.h
@@ -294,9 +294,9 @@ class WebRtcSession : public AudioProviderInterface,
 
   cricket::DataChannelType data_channel_type() const;
 
-  bool IceRestartPending() const;
-
-  void ResetIceRestartLatch();
+  bool AudioIceRestartPending() const;
+  bool VideoIceRestartPending() const;
+  bool DataIceRestartPending() const;
 
   // Called when an RTCCertificate is generated or retrieved by
   // WebRTCSessionDescriptionFactory. Should happen before setLocalDescription.
@@ -494,7 +494,9 @@ class WebRtcSession : public AudioProviderInterface,
   // 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_;