| Index: Source/modules/mediastream/RTCPeerConnection.cpp
 | 
| diff --git a/Source/modules/mediastream/RTCPeerConnection.cpp b/Source/modules/mediastream/RTCPeerConnection.cpp
 | 
| index 72bcb3ab32a94b9b9346e417fa261151fa672128..fcf446ba8024cec728ffd1a324053d2c663982fe 100644
 | 
| --- a/Source/modules/mediastream/RTCPeerConnection.cpp
 | 
| +++ b/Source/modules/mediastream/RTCPeerConnection.cpp
 | 
| @@ -91,7 +91,7 @@ RTCConfiguration* RTCPeerConnection::parseConfiguration(const Dictionary& config
 | 
|  
 | 
|      RTCIceTransports iceTransports = RTCIceTransportsAll;
 | 
|      String iceTransportsString;
 | 
| -    if (DictionaryHelper::get(configuration, "iceTransports", iceTransportsString)) {
 | 
| +    if (configuration.get("iceTransports", iceTransportsString)) {
 | 
|          if (iceTransportsString == "none") {
 | 
|              iceTransports = RTCIceTransportsNone;
 | 
|          } else if (iceTransportsString == "relay") {
 | 
| @@ -103,7 +103,7 @@ RTCConfiguration* RTCPeerConnection::parseConfiguration(const Dictionary& config
 | 
|      }
 | 
|  
 | 
|      ArrayValue iceServers;
 | 
| -    bool ok = DictionaryHelper::get(configuration, "iceServers", iceServers);
 | 
| +    bool ok = configuration.get("iceServers", iceServers);
 | 
|      if (!ok || iceServers.isUndefinedOrNull()) {
 | 
|          exceptionState.throwTypeError("Malformed RTCConfiguration");
 | 
|          return 0;
 | 
| @@ -132,9 +132,9 @@ RTCConfiguration* RTCPeerConnection::parseConfiguration(const Dictionary& config
 | 
|  
 | 
|          Vector<String> urlStrings;
 | 
|          if (names.contains("urls")) {
 | 
| -            if (!DictionaryHelper::get(iceServer, "urls", urlStrings) || !urlStrings.size()) {
 | 
| +            if (!iceServer.get("urls", urlStrings) || !urlStrings.size()) {
 | 
|                  String urlString;
 | 
| -                if (DictionaryHelper::get(iceServer, "urls", urlString)) {
 | 
| +                if (iceServer.get("urls", urlString)) {
 | 
|                      urlStrings.append(urlString);
 | 
|                  } else {
 | 
|                      exceptionState.throwTypeError("Malformed RTCIceServer");
 | 
| @@ -143,7 +143,7 @@ RTCConfiguration* RTCPeerConnection::parseConfiguration(const Dictionary& config
 | 
|              }
 | 
|          } else if (names.contains("url")) {
 | 
|              String urlString;
 | 
| -            if (DictionaryHelper::get(iceServer, "url", urlString)) {
 | 
| +            if (iceServer.get("url", urlString)) {
 | 
|                  urlStrings.append(urlString);
 | 
|              } else {
 | 
|                  exceptionState.throwTypeError("Malformed RTCIceServer");
 | 
| @@ -155,8 +155,8 @@ RTCConfiguration* RTCPeerConnection::parseConfiguration(const Dictionary& config
 | 
|          }
 | 
|  
 | 
|          String username, credential;
 | 
| -        DictionaryHelper::get(iceServer, "username", username);
 | 
| -        DictionaryHelper::get(iceServer, "credential", credential);
 | 
| +        iceServer.get("username", username);
 | 
| +        iceServer.get("credential", credential);
 | 
|  
 | 
|          for (Vector<String>::iterator iter = urlStrings.begin(); iter != urlStrings.end(); ++iter) {
 | 
|              KURL url(KURL(), *iter);
 | 
| @@ -190,18 +190,18 @@ RTCOfferOptions* RTCPeerConnection::parseOfferOptions(const Dictionary& options,
 | 
|      bool voiceActivityDetection = true;
 | 
|      bool iceRestart = false;
 | 
|  
 | 
| -    if (DictionaryHelper::get(options, "offerToReceiveVideo", offerToReceiveVideo) && offerToReceiveVideo < 0) {
 | 
| +    if (options.get("offerToReceiveVideo", offerToReceiveVideo) && offerToReceiveVideo < 0) {
 | 
|          exceptionState.throwTypeError("Invalid offerToReceiveVideo");
 | 
|          return 0;
 | 
|      }
 | 
|  
 | 
| -    if (DictionaryHelper::get(options, "offerToReceiveAudio", offerToReceiveAudio) && offerToReceiveAudio < 0) {
 | 
| +    if (options.get("offerToReceiveAudio", offerToReceiveAudio) && offerToReceiveAudio < 0) {
 | 
|          exceptionState.throwTypeError("Invalid offerToReceiveAudio");
 | 
|          return 0;
 | 
|      }
 | 
|  
 | 
| -    DictionaryHelper::get(options, "voiceActivityDetection", voiceActivityDetection);
 | 
| -    DictionaryHelper::get(options, "iceRestart", iceRestart);
 | 
| +    options.get("voiceActivityDetection", voiceActivityDetection);
 | 
| +    options.get("iceRestart", iceRestart);
 | 
|  
 | 
|      RTCOfferOptions* rtcOfferOptions = RTCOfferOptions::create(offerToReceiveVideo, offerToReceiveAudio, voiceActivityDetection, iceRestart);
 | 
|      return rtcOfferOptions;
 | 
| @@ -548,19 +548,19 @@ RTCDataChannel* RTCPeerConnection::createDataChannel(String label, const Diction
 | 
|          return nullptr;
 | 
|  
 | 
|      WebRTCDataChannelInit init;
 | 
| -    DictionaryHelper::get(options, "ordered", init.ordered);
 | 
| -    DictionaryHelper::get(options, "negotiated", init.negotiated);
 | 
| +    options.get("ordered", init.ordered);
 | 
| +    options.get("negotiated", init.negotiated);
 | 
|  
 | 
|      unsigned short value = 0;
 | 
| -    if (DictionaryHelper::get(options, "id", value))
 | 
| +    if (options.get("id", value))
 | 
|          init.id = value;
 | 
| -    if (DictionaryHelper::get(options, "maxRetransmits", value))
 | 
| +    if (options.get("maxRetransmits", value))
 | 
|          init.maxRetransmits = value;
 | 
| -    if (DictionaryHelper::get(options, "maxRetransmitTime", value))
 | 
| +    if (options.get("maxRetransmitTime", value))
 | 
|          init.maxRetransmitTime = value;
 | 
|  
 | 
|      String protocolString;
 | 
| -    DictionaryHelper::get(options, "protocol", protocolString);
 | 
| +    options.get("protocol", protocolString);
 | 
|      init.protocol = protocolString;
 | 
|  
 | 
|      RTCDataChannel* channel = RTCDataChannel::create(executionContext(), this, m_peerHandler.get(), label, init, exceptionState);
 | 
| 
 |