| Index: webrtc/api/peerconnection.h
 | 
| diff --git a/webrtc/api/peerconnection.h b/webrtc/api/peerconnection.h
 | 
| index c4a9a60053db82ca9976340412334e70bae55a59..45a32052b248c31315ee4105f164547d364462d4 100644
 | 
| --- a/webrtc/api/peerconnection.h
 | 
| +++ b/webrtc/api/peerconnection.h
 | 
| @@ -36,6 +36,7 @@ class VideoRtpReceiver;
 | 
|  bool ExtractMediaSessionOptions(
 | 
|      const PeerConnectionInterface::RTCOfferAnswerOptions& rtc_options,
 | 
|      bool is_offer,
 | 
| +    bool ice_renomination,
 | 
|      cricket::MediaSessionOptions* session_options);
 | 
|  
 | 
|  // Populates |session_options| from |constraints|, and returns true if all
 | 
| @@ -239,6 +240,9 @@ class PeerConnection : public PeerConnectionInterface,
 | 
|        const RTCOfferAnswerOptions& options,
 | 
|        cricket::MediaSessionOptions* session_options);
 | 
|  
 | 
| +  void InitializeOptionsForAnswer(
 | 
| +      cricket::MediaSessionOptions* session_options);
 | 
| +
 | 
|    // Helper function for options processing.
 | 
|    // Deprecated.
 | 
|    virtual void FinishOptionsForAnswer(
 | 
| @@ -414,6 +418,8 @@ class PeerConnection : public PeerConnectionInterface,
 | 
|  
 | 
|    bool remote_peer_supports_msid_ = false;
 | 
|  
 | 
| +  bool ice_renomination_ = false;
 | 
| +
 | 
|    std::vector<rtc::scoped_refptr<RtpSenderProxyWithInternal<RtpSenderInternal>>>
 | 
|        senders_;
 | 
|    std::vector<
 | 
| 
 |