Track pending ICE restarts independently for different media sections.

talk/session/media/mediasession.cc

Index: talk/session/media/mediasession.cc
diff --git a/talk/session/media/mediasession.cc b/talk/session/media/mediasession.cc
index b6f52c2b62155e1a8917e7073eabe1df1e810d9b..0461571d1fc67a1e13cc10b48b5dc1bec6c529b5 100644
--- a/talk/session/media/mediasession.cc
+++ b/talk/session/media/mediasession.cc
@@ -1925,15 +1925,15 @@ bool IsDataContent(const ContentInfo* content) {
   return IsMediaContentOfType(content, MEDIA_TYPE_DATA);
 }
 
-static const ContentInfo* GetFirstMediaContent(const ContentInfos& contents,
-                                               MediaType media_type) {
+const ContentInfo* GetFirstMediaContent(const ContentInfos& contents,
+                                        MediaType media_type) {
   for (ContentInfos::const_iterator content = contents.begin();
        content != contents.end(); content++) {
     if (IsMediaContentOfType(&*content, media_type)) {
       return &*content;
     }
   }
-  return NULL;
+  return nullptr;
 }
 
 const ContentInfo* GetFirstAudioContent(const ContentInfos& contents) {
@@ -1950,8 +1950,9 @@ const ContentInfo* GetFirstDataContent(const ContentInfos& contents) {
 
 static const ContentInfo* GetFirstMediaContent(const SessionDescription* sdesc,
                                                MediaType media_type) {
-  if (sdesc == NULL)
-    return NULL;
+  if (sdesc == nullptr) {
+    return nullptr;
+  }
 
   return GetFirstMediaContent(sdesc->contents(), media_type);
 }