| Index: webrtc/api/peerconnectionproxy.h
 | 
| diff --git a/webrtc/api/peerconnectionproxy.h b/webrtc/api/peerconnectionproxy.h
 | 
| index b0e1cf4da0faca4968204c0addb83fbae3fdbae3..f002014846a242a32bb0279becb05045a5478782 100644
 | 
| --- a/webrtc/api/peerconnectionproxy.h
 | 
| +++ b/webrtc/api/peerconnectionproxy.h
 | 
| @@ -64,10 +64,9 @@
 | 
|    PROXY_METHOD2(void, SetRemoteDescription, SetSessionDescriptionObserver*,
 | 
|                  SessionDescriptionInterface*)
 | 
|    PROXY_METHOD0(PeerConnectionInterface::RTCConfiguration, GetConfiguration);
 | 
| -  PROXY_METHOD2(bool,
 | 
| +  PROXY_METHOD1(bool,
 | 
|                  SetConfiguration,
 | 
| -                const PeerConnectionInterface::RTCConfiguration&,
 | 
| -                RTCError*);
 | 
| +                const PeerConnectionInterface::RTCConfiguration&);
 | 
|    PROXY_METHOD1(bool, AddIceCandidate, const IceCandidateInterface*)
 | 
|    PROXY_METHOD1(bool,
 | 
|                  RemoveIceCandidates,
 | 
| 
 |