Fixing some issues with ICE restart signaling.

talk/app/webrtc/peerconnectioninterface_unittest.cc

Index: talk/app/webrtc/peerconnectioninterface_unittest.cc
diff --git a/talk/app/webrtc/peerconnectioninterface_unittest.cc b/talk/app/webrtc/peerconnectioninterface_unittest.cc
index 13fcbc8f14de58246b16cf10e0cfa04c75f729f4..5a8887c80cdec3b6e2740fb1f7c9ec24f2e47d62 100644
--- a/talk/app/webrtc/peerconnectioninterface_unittest.cc
+++ b/talk/app/webrtc/peerconnectioninterface_unittest.cc
@@ -2237,7 +2237,9 @@ TEST(CreateSessionOptionsTest, GetDefaultMediaSessionOptionsForOffer) {
   EXPECT_FALSE(options.has_video());
   EXPECT_TRUE(options.bundle_enabled);
   EXPECT_TRUE(options.vad_enabled);
-  EXPECT_FALSE(options.transport_options.ice_restart);
+  EXPECT_FALSE(options.audio_ice_restart);
+  EXPECT_FALSE(options.video_ice_restart);
+  EXPECT_FALSE(options.data_ice_restart);
 }
 
 // Test that a correct MediaSessionOptions is created for an offer if
@@ -2279,11 +2281,15 @@ TEST(CreateSessionOptionsTest, GetMediaSessionOptionsForOfferWithIceRestart) {
 
   cricket::MediaSessionOptions options;
   EXPECT_TRUE(ConvertRtcOptionsForOffer(rtc_options, &options));
-  EXPECT_TRUE(options.transport_options.ice_restart);
+  EXPECT_TRUE(options.audio_ice_restart);
+  EXPECT_TRUE(options.video_ice_restart);
+  EXPECT_TRUE(options.data_ice_restart);
 
   rtc_options = RTCOfferAnswerOptions();
   EXPECT_TRUE(ConvertRtcOptionsForOffer(rtc_options, &options));
-  EXPECT_FALSE(options.transport_options.ice_restart);
+  EXPECT_FALSE(options.audio_ice_restart);
+  EXPECT_FALSE(options.video_ice_restart);
+  EXPECT_FALSE(options.data_ice_restart);
 }
 
 // Test that the MediaConstraints in an answer don't affect if audio and video