Fixing some issues with ICE restart signaling.

talk/app/webrtc/peerconnection.cc

Index: talk/app/webrtc/peerconnection.cc
diff --git a/talk/app/webrtc/peerconnection.cc b/talk/app/webrtc/peerconnection.cc
index caa892d00b9b04802c15908b04f97bd4ddf3cfb1..011b9c8c71dbf66479ca5cd0874b25ff5be77081 100644
--- a/talk/app/webrtc/peerconnection.cc
+++ b/talk/app/webrtc/peerconnection.cc
@@ -506,7 +506,9 @@ bool ConvertRtcOptionsForOffer(
   }
 
   session_options->vad_enabled = rtc_options.voice_activity_detection;
-  session_options->transport_options.ice_restart = rtc_options.ice_restart;
+  session_options->audio_ice_restart = rtc_options.ice_restart;
+  session_options->video_ice_restart = rtc_options.ice_restart;
+  session_options->data_ice_restart = rtc_options.ice_restart;
   session_options->bundle_enabled = rtc_options.use_rtp_mux;
 
   return true;
@@ -552,10 +554,14 @@ bool ParseConstraintsForAnswer(const MediaConstraintsInterface* constraints,
 
   if (FindConstraint(constraints, MediaConstraintsInterface::kIceRestart,
                      &value, &mandatory_constraints_satisfied)) {
-    session_options->transport_options.ice_restart = value;
+    session_options->audio_ice_restart = value;
+    session_options->video_ice_restart = value;
+    session_options->data_ice_restart = value;
   } else {
     // kIceRestart defaults to false according to spec.
-    session_options->transport_options.ice_restart = false;
+    session_options->audio_ice_restart = false;
+    session_options->video_ice_restart = false;
+    session_options->data_ice_restart = false;
   }
 
   if (!constraints) {