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

Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp

Index: Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp
===================================================================
--- Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp	(revision 129357)
+++ Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp	(working copy)
@@ -83,13 +83,13 @@
             return 0;
         }
 
-        String uri, credential;
-        ok = iceServer.get("uri", uri);
+        String urlString, credential;
+        ok = iceServer.get("url", urlString);
         if (!ok) {
             ec = TYPE_MISMATCH_ERR;
             return 0;
         }
-        KURL url(KURL(), uri);
+        KURL url(KURL(), urlString);
         if (!url.isValid() || !(url.protocolIs("turn") || url.protocolIs("stun"))) {
             ec = TYPE_MISMATCH_ERR;
             return 0;