Merge 128982 - MediaStream API: Rename the RTCIceServer uri parameter to url.

LayoutTests/fast/mediastream/RTCPeerConnection.html

Index: LayoutTests/fast/mediastream/RTCPeerConnection.html
===================================================================
--- LayoutTests/fast/mediastream/RTCPeerConnection.html	(revision 129357)
+++ LayoutTests/fast/mediastream/RTCPeerConnection.html	(working copy)
@@ -16,9 +16,9 @@
 shouldThrow("new webkitRTCPeerConnection(null, '');");
 
 shouldNotThrow("new webkitRTCPeerConnection({iceServers:[]}, null);");
-shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{uri:'stun:foo.com'}]}, null);");
-shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{uri:'turn:foo.com', credential:'x'}]}, null);");
-shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{uri:'turn:foo.com', credential:'x'},{uri:'stun:bar.com'}]}, null);");
+shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{url:'stun:foo.com'}]}, null);");
+shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{url:'turn:foo.com', credential:'x'}]}, null);");
+shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{url:'turn:foo.com', credential:'x'},{url:'stun:bar.com'}]}, null);");
 shouldThrow("new webkitRTCPeerConnection({fooServers:[]}, null);");
 shouldThrow("new webkitRTCPeerConnection({iceServers:true}, null);");
 shouldThrow("new webkitRTCPeerConnection({iceServers:[1, 2, 3]}, null);");