| Index: third_party/libjingle/libjingle.gyp | 
| =================================================================== | 
| --- third_party/libjingle/libjingle.gyp	(revision 117833) | 
| +++ third_party/libjingle/libjingle.gyp	(working copy) | 
| @@ -292,8 +292,10 @@ | 
| 'source/talk/base/taskrunner.h', | 
| 'source/talk/base/thread.cc', | 
| 'source/talk/base/thread.h', | 
| -        'source/talk/base/time.cc', | 
| -        'source/talk/base/time.h', | 
| +        'source/talk/base/timeutils.cc', | 
| +        'source/talk/base/timeutils.h', | 
| +        'source/talk/base/timing.cc', | 
| +        'source/talk/base/timing.h', | 
| 'source/talk/base/urlencode.cc', | 
| 'source/talk/base/urlencode.h', | 
| 'source/talk/base/worker.cc', | 
| @@ -319,8 +321,6 @@ | 
| 'source/talk/xmpp/jid.h', | 
| 'source/talk/xmpp/plainsaslhandler.h', | 
| 'source/talk/xmpp/prexmppauth.h', | 
| -        'source/talk/xmpp/ratelimitmanager.cc', | 
| -        'source/talk/xmpp/ratelimitmanager.h', | 
| 'source/talk/xmpp/saslcookiemechanism.h', | 
| 'source/talk/xmpp/saslhandler.h', | 
| 'source/talk/xmpp/saslmechanism.cc', | 
| @@ -468,17 +468,17 @@ | 
| 'target_name': 'libjingle_peerconnection', | 
| 'type': 'static_library', | 
| 'sources': [ | 
| -        'source/talk/app/webrtc/peerconnection.h', | 
| -        'source/talk/app/webrtc/peerconnectionfactory.cc', | 
| -        'source/talk/app/webrtc/peerconnectionfactory.h', | 
| -        'source/talk/app/webrtc/peerconnectionimpl.cc', | 
| -        'source/talk/app/webrtc/peerconnectionimpl.h', | 
| -        'source/talk/app/webrtc/peerconnectionproxy.cc', | 
| -        'source/talk/app/webrtc/peerconnectionproxy.h', | 
| -        'source/talk/app/webrtc/webrtcsession.cc', | 
| -        'source/talk/app/webrtc/webrtcsession.h', | 
| -        'source/talk/app/webrtc/webrtcjson.cc', | 
| -        'source/talk/app/webrtc/webrtcjson.h', | 
| +        'source/talk/app/webrtcv1/peerconnection.h', | 
| +        'source/talk/app/webrtcv1/peerconnectionfactory.cc', | 
| +        'source/talk/app/webrtcv1/peerconnectionfactory.h', | 
| +        'source/talk/app/webrtcv1/peerconnectionimpl.cc', | 
| +        'source/talk/app/webrtcv1/peerconnectionimpl.h', | 
| +        'source/talk/app/webrtcv1/peerconnectionproxy.cc', | 
| +        'source/talk/app/webrtcv1/peerconnectionproxy.h', | 
| +        'source/talk/app/webrtcv1/webrtcsession.cc', | 
| +        'source/talk/app/webrtcv1/webrtcsession.h', | 
| +        'source/talk/app/webrtcv1/webrtcjson.cc', | 
| +        'source/talk/app/webrtcv1/webrtcjson.h', | 
| 'source/talk/session/phone/audiomonitor.cc', | 
| 'source/talk/session/phone/audiomonitor.h', | 
| 'source/talk/session/phone/call.cc', | 
| @@ -522,6 +522,7 @@ | 
| 'source/talk/session/phone/srtpfilter.h', | 
| 'source/talk/session/phone/ssrcmuxfilter.cc', | 
| 'source/talk/session/phone/ssrcmuxfilter.h', | 
| +        'source/talk/session/phone/streamparams.cc', | 
| 'source/talk/session/phone/videocapturer.cc', | 
| 'source/talk/session/phone/videocapturer.h', | 
| 'source/talk/session/phone/videocommon.cc', | 
| @@ -533,9 +534,7 @@ | 
| 'source/talk/session/phone/webrtcpassthroughrender.cc', | 
| 'source/talk/session/phone/webrtcvideocapturer.cc', | 
| 'source/talk/session/phone/webrtcvideocapturer.h', | 
| -        # TODO(ronghuawu): Fix this in libjingle and remove the override. | 
| -        # See http://crbug.com/110255 | 
| -        'overrides/talk/session/phone/webrtcvideoengine.cc', | 
| +        'source/talk/session/phone/webrtcvideoengine.cc', | 
| 'source/talk/session/phone/webrtcvideoengine.h', | 
| 'source/talk/session/phone/webrtcvideoframe.cc', | 
| 'source/talk/session/phone/webrtcvideoframe.h', | 
|  |