Refactoring some tests in peerconnectioninterface_unittest.cc.

webrtc/pc/mediasession.h

Index: webrtc/pc/mediasession.h
diff --git a/webrtc/pc/mediasession.h b/webrtc/pc/mediasession.h
index 39ac26bd8dad104c5b10b0d450caf7cf67e85233..22291c42a6412b1f35040489ec26806b3377e010 100644
--- a/webrtc/pc/mediasession.h
+++ b/webrtc/pc/mediasession.h
@@ -532,6 +532,21 @@ const VideoContentDescription* GetFirstVideoContentDescription(
     const SessionDescription* sdesc);
 const DataContentDescription* GetFirstDataContentDescription(
     const SessionDescription* sdesc);
+// Non-const versions of the above functions.
+// Useful when modifying an existing description.
+ContentInfo* GetFirstMediaContent(ContentInfos& contents, MediaType media_type);
+ContentInfo* GetFirstAudioContent(ContentInfos& contents);
+ContentInfo* GetFirstVideoContent(ContentInfos& contents);
+ContentInfo* GetFirstDataContent(ContentInfos& contents);
+ContentInfo* GetFirstAudioContent(SessionDescription* sdesc);
+ContentInfo* GetFirstVideoContent(SessionDescription* sdesc);
+ContentInfo* GetFirstDataContent(SessionDescription* sdesc);
+AudioContentDescription* GetFirstAudioContentDescription(
+    SessionDescription* sdesc);
+VideoContentDescription* GetFirstVideoContentDescription(
+    SessionDescription* sdesc);
+DataContentDescription* GetFirstDataContentDescription(
+    SessionDescription* sdesc);
 
 void GetSupportedAudioCryptoSuites(std::vector<int>* crypto_suites);
 void GetSupportedVideoCryptoSuites(std::vector<int>* crypto_suites);