| Index: webrtc/pc/mediasession.h
 | 
| diff --git a/webrtc/pc/mediasession.h b/webrtc/pc/mediasession.h
 | 
| index 68f4c370994eb7b44a3aae29da263f2c8e60dd24..f864fe99b769e10de359e9f9be4d319a35633352 100644
 | 
| --- a/webrtc/pc/mediasession.h
 | 
| +++ b/webrtc/pc/mediasession.h
 | 
| @@ -494,7 +494,8 @@ class MediaSessionDescriptionFactory {
 | 
|        const std::string& content_name,
 | 
|        const SessionDescription* offer_desc,
 | 
|        const TransportOptions& transport_options,
 | 
| -      const SessionDescription* current_desc) const;
 | 
| +      const SessionDescription* current_desc,
 | 
| +      bool require_transport_attributes) const;
 | 
|  
 | 
|    bool AddTransportAnswer(
 | 
|        const std::string& content_name,
 | 
| @@ -528,26 +529,26 @@ class MediaSessionDescriptionFactory {
 | 
|        StreamParamsVec* current_streams,
 | 
|        SessionDescription* desc) const;
 | 
|  
 | 
| -  bool AddAudioContentForAnswer(
 | 
| -      const SessionDescription* offer,
 | 
| -      const MediaSessionOptions& options,
 | 
| -      const SessionDescription* current_description,
 | 
| -      StreamParamsVec* current_streams,
 | 
| -      SessionDescription* answer) const;
 | 
| -
 | 
| -  bool AddVideoContentForAnswer(
 | 
| -      const SessionDescription* offer,
 | 
| -      const MediaSessionOptions& options,
 | 
| -      const SessionDescription* current_description,
 | 
| -      StreamParamsVec* current_streams,
 | 
| -      SessionDescription* answer) const;
 | 
| -
 | 
| -  bool AddDataContentForAnswer(
 | 
| -      const SessionDescription* offer,
 | 
| -      const MediaSessionOptions& options,
 | 
| -      const SessionDescription* current_description,
 | 
| -      StreamParamsVec* current_streams,
 | 
| -      SessionDescription* answer) const;
 | 
| +  bool AddAudioContentForAnswer(const SessionDescription* offer,
 | 
| +                                const MediaSessionOptions& options,
 | 
| +                                const SessionDescription* current_description,
 | 
| +                                const TransportInfo* bundle_transport,
 | 
| +                                StreamParamsVec* current_streams,
 | 
| +                                SessionDescription* answer) const;
 | 
| +
 | 
| +  bool AddVideoContentForAnswer(const SessionDescription* offer,
 | 
| +                                const MediaSessionOptions& options,
 | 
| +                                const SessionDescription* current_description,
 | 
| +                                const TransportInfo* bundle_transport,
 | 
| +                                StreamParamsVec* current_streams,
 | 
| +                                SessionDescription* answer) const;
 | 
| +
 | 
| +  bool AddDataContentForAnswer(const SessionDescription* offer,
 | 
| +                               const MediaSessionOptions& options,
 | 
| +                               const SessionDescription* current_description,
 | 
| +                               const TransportInfo* bundle_transport,
 | 
| +                               StreamParamsVec* current_streams,
 | 
| +                               SessionDescription* answer) const;
 | 
|  
 | 
|    AudioCodecs audio_send_codecs_;
 | 
|    AudioCodecs audio_recv_codecs_;
 | 
| 
 |