Fixing some issues with ICE restart signaling.

talk/session/media/mediasession.h

Index: talk/session/media/mediasession.h
diff --git a/talk/session/media/mediasession.h b/talk/session/media/mediasession.h
index e92628e71183b3db281c4664ec82f186ff73bb76..c91d0011818f93d34cb93828d9ce91d9cb744491 100644
--- a/talk/session/media/mediasession.h
+++ b/talk/session/media/mediasession.h
@@ -146,6 +146,10 @@ struct MediaSessionOptions {
   int data_bandwidth;
   TransportOptions transport_options;
 
+  bool audio_ice_restart = false;
+  bool video_ice_restart = false;
+  bool data_ice_restart = false;
+
   struct Stream {
     Stream(MediaType type,
            const std::string& id,
@@ -453,16 +457,17 @@ class MediaSessionDescriptionFactory {
   void GetRtpHdrExtsToOffer(const SessionDescription* current_description,
                             RtpHeaderExtensions* audio_extensions,
                             RtpHeaderExtensions* video_extensions) const;
-  bool AddTransportOffer(
-      const std::string& content_name,
-      const TransportOptions& transport_options,
-      const SessionDescription* current_desc,
-      SessionDescription* offer) const;
+  bool AddTransportOffer(const std::string& content_name,
+                         const TransportOptions& transport_options,
+                         bool ice_restart,
+                         const SessionDescription* current_desc,
+                         SessionDescription* offer) const;
 
   TransportDescription* CreateTransportAnswer(
       const std::string& content_name,
       const SessionDescription* offer_desc,
       const TransportOptions& transport_options,
+      bool ice_restart,
       const SessionDescription* current_desc) const;
 
   bool AddTransportAnswer(
@@ -534,6 +539,8 @@ bool IsMediaContent(const ContentInfo* content);
 bool IsAudioContent(const ContentInfo* content);
 bool IsVideoContent(const ContentInfo* content);
 bool IsDataContent(const ContentInfo* content);
+const ContentInfo* GetFirstMediaContent(const ContentInfos& contents,
+                                        MediaType media_type);
 const ContentInfo* GetFirstAudioContent(const ContentInfos& contents);
 const ContentInfo* GetFirstVideoContent(const ContentInfos& contents);
 const ContentInfo* GetFirstDataContent(const ContentInfos& contents);