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

Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 65 matching lines @@
     RefPtr<RTCConfiguration> rtcConfiguration = RTCConfiguration::create();
 
     for (size_t i = 0; i < numberOfServers; ++i) {
         Dictionary iceServer;
         ok = iceServers.get(i, iceServer);
         if (!ok) {
             ec = TYPE_MISMATCH_ERR;
             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;
         }
 
         iceServer.get("credential", credential);
 
         rtcConfiguration->appendServer(RTCIceServer::create(url, credential));
     }
 
@@ skipping 406 matching lines @@
     if (iceState == m_iceState || m_readyState == ReadyStateClosed)
         return;
 
     m_iceState = iceState;
     dispatchEvent(Event::create(eventNames().icechangeEvent, false, false));
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(MEDIA_STREAM)