Track pending ICE restarts independently for different media sections.

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 17a2c1be6f4d6b8ac3c413891f35d9b46984e803..4ee0119cefa7e048371eb119f29216894ab9acb9 100644
--- a/talk/session/media/mediasession.h
+++ b/talk/session/media/mediasession.h
@@ -31,6 +31,7 @@
 #define TALK_SESSION_MEDIA_MEDIASESSION_H_
 
 #include <algorithm>
+#include <map>
 #include <string>
 #include <vector>
 
@@ -148,9 +149,8 @@ struct MediaSessionOptions {
   // bps. -1 == auto.
   int video_bandwidth;
   int data_bandwidth;
-  TransportOptions audio_transport_options;
-  TransportOptions video_transport_options;
-  TransportOptions data_transport_options;
+  // content name ("mid") => options.
+  std::map<std::string, TransportOptions> transport_options;
 
   struct Stream {
     Stream(MediaType type,
@@ -536,6 +536,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);