Fixing some issues with ICE restart signaling.

talk/app/webrtc/peerconnectioninterface_unittest.cc

 /*
  * 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 2219 matching lines @@
 // the default OfferOptions are used.
 TEST(CreateSessionOptionsTest, GetDefaultMediaSessionOptionsForOffer) {
   RTCOfferAnswerOptions rtc_options;
 
   cricket::MediaSessionOptions options;
   EXPECT_TRUE(ConvertRtcOptionsForOffer(rtc_options, &options));
   EXPECT_TRUE(options.has_audio());
   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
 // OfferToReceiveVideo is set.
 TEST(CreateSessionOptionsTest, GetMediaSessionOptionsForOfferWithVideo) {
   RTCOfferAnswerOptions rtc_options;
   rtc_options.offer_to_receive_audio = 0;
   rtc_options.offer_to_receive_video = 1;
 
   cricket::MediaSessionOptions options;
@@ skipping 21 matching lines @@
 
 // Test that a correct MediaSessionOptions is created to restart ice if
 // IceRestart is set. It also tests that subsequent MediaSessionOptions don't
 // have |transport_options.ice_restart| set.
 TEST(CreateSessionOptionsTest, GetMediaSessionOptionsForOfferWithIceRestart) {
   RTCOfferAnswerOptions rtc_options;
   rtc_options.ice_restart = true;
 
   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
 // is offered in an offer but that if kOfferToReceiveAudio or
 // kOfferToReceiveVideo constraints are true in an offer, the media type will be
 // included in subsequent answers.
 TEST(CreateSessionOptionsTest, MediaConstraintsInAnswer) {
   FakeConstraints answer_c;
   answer_c.SetMandatoryReceiveAudio(true);
   answer_c.SetMandatoryReceiveVideo(true);
@@ skipping 28 matching lines @@
   FakeConstraints updated_answer_c;
   answer_c.SetMandatoryReceiveAudio(false);
   answer_c.SetMandatoryReceiveVideo(false);
 
   cricket::MediaSessionOptions updated_answer_options;
   EXPECT_TRUE(
       ParseConstraintsForAnswer(&updated_answer_c, &updated_answer_options));
   EXPECT_TRUE(updated_answer_options.has_audio());
   EXPECT_TRUE(updated_answer_options.has_video());
 }