From 04209ec5b08095a9b207905c6d6090478892345a Mon Sep 17 00:00:00 2001
From: foolip <foolip@chromium.org>
Date: Wed, 26 Oct 2016 03:42:02 -0700
Subject: [PATCH] Use RTCPeerConnection instead of webkitRTCPeerConnection

Cases where the second argument (constraints) is used are left alone, as
a reminder that this isn't standarized behavior.

BUG=658423

Review-Url: https://codereview.chromium.org/2446173002
Cr-Commit-Position: refs/heads/master@{#427662}
---
 .../docs/examples/api/desktopCapture/app.js   |   5 +-
 .../api_test/tab_capture/end_to_end.js        |   4 +-
 .../api_test/tab_capture/performance.js       |   4 +-
 content/test/data/media/datachannel_test.html |   4 +-
 .../test/data/media/mediarecorder_test.html   |   4 +-
 .../test/data/media/peerconnection-call.html  |   6 +-
 .../examples/video_effects/video_effects.html |   1 -
 .../mediastream/constructors-expected.txt     |   6 +-
 .../fast/mediastream/constructors.html        |   6 +-
 .../RTCPeerConnection-AddRemoveStream.html    |   2 +-
 ...TCPeerConnection-createAnswer-promise.html |   4 +-
 .../RTCPeerConnection-createAnswer.html       |   4 +-
 ...RTCPeerConnection-createOffer-promise.html |   4 +-
 .../RTCPeerConnection-createOffer.html        |   4 +-
 .../RTCPeerConnection-datachannel.html        |   4 +-
 .../RTCPeerConnection-dtmf.html               |   2 +-
 .../RTCPeerConnection-events.html             |   2 +-
 .../RTCPeerConnection-expected.txt            | 103 ++++++++--------
 ...RTCPeerConnection-generateCertificate.html |  20 ++--
 .../RTCPeerConnection-getStats-promise.html   |   2 +-
 ...RTCPeerConnection-ice-promise-expected.txt |   2 +-
 .../RTCPeerConnection-ice-promise.html        |   2 +-
 .../peerconnection/RTCPeerConnection-ice.html |   4 +-
 .../RTCPeerConnection-lifetime.html           |   6 +-
 ...erConnection-localDescription-promise.html |   2 +-
 .../RTCPeerConnection-localDescription.html   |   6 +-
 ...RTCPeerConnection-onnegotiationneeded.html |   2 +-
 ...rConnection-remoteDescription-promise.html |   2 +-
 .../RTCPeerConnection-remoteDescription.html  |   6 +-
 .../RTCPeerConnection-remotestreams.html      |   4 +-
 .../RTCPeerConnection-state.html              |   2 +-
 .../RTCPeerConnection-stats-expected.txt      |   2 +-
 .../RTCPeerConnection-stats.html              |   2 +-
 ...CPeerConnection-statsSelector-expected.txt |   2 +-
 .../RTCPeerConnection-statsSelector.html      |   2 +-
 .../peerconnection/RTCPeerConnection.html     | 110 +++++++++---------
 36 files changed, 174 insertions(+), 173 deletions(-)

diff --git a/chrome/common/extensions/docs/examples/api/desktopCapture/app.js b/chrome/common/extensions/docs/examples/api/desktopCapture/app.js
index a6d8e4717dbdda..e7ae8bc3051d64 100644
--- a/chrome/common/extensions/docs/examples/api/desktopCapture/app.js
+++ b/chrome/common/extensions/docs/examples/api/desktopCapture/app.js
@@ -60,12 +60,11 @@ function gotStream(stream) {
   video.src = URL.createObjectURL(stream);
   stream.onended = function() { console.log('Ended'); };
 
-  var servers = null;
-  pc1 = new webkitRTCPeerConnection(servers);
+  pc1 = new RTCPeerConnection();
   pc1.onicecandidate = function(event) {
     onIceCandidate(pc1, event);
   };
-  pc2 = new webkitRTCPeerConnection(servers);
+  pc2 = new RTCPeerConnection();
   pc2.onicecandidate = function(event) {
     onIceCandidate(pc2, event);
   };
diff --git a/chrome/test/data/extensions/api_test/tab_capture/end_to_end.js b/chrome/test/data/extensions/api_test/tab_capture/end_to_end.js
index 087eddfc1f2316..e15e266800595c 100644
--- a/chrome/test/data/extensions/api_test/tab_capture/end_to_end.js
+++ b/chrome/test/data/extensions/api_test/tab_capture/end_to_end.js
@@ -207,8 +207,8 @@ chrome.test.runTests([
             receiveStream = captureStream;
             waitForExpectedColors(colorDeviation);
           } else if (transportMethod == 'webrtc') {
-            var sender = new webkitRTCPeerConnection(null);
-            var receiver = new webkitRTCPeerConnection(null);
+            var sender = new RTCPeerConnection();
+            var receiver = new RTCPeerConnection();
             sender.onicecandidate = function (event) {
               if (event.candidate) {
                 receiver.addIceCandidate(new RTCIceCandidate(event.candidate));
diff --git a/chrome/test/data/extensions/api_test/tab_capture/performance.js b/chrome/test/data/extensions/api_test/tab_capture/performance.js
index 552b42ccd37a09..4d6025d03fb197 100644
--- a/chrome/test/data/extensions/api_test/tab_capture/performance.js
+++ b/chrome/test/data/extensions/api_test/tab_capture/performance.js
@@ -70,8 +70,8 @@ function TestStream(stream) {
 function testThroughWebRTC(stream) {
   capture_stream = stream;
   console.log("Testing through webrtc.");
-  var sender = new webkitRTCPeerConnection(null);
-  var receiver = new webkitRTCPeerConnection(null);
+  var sender = new RTCPeerConnection();
+  var receiver = new RTCPeerConnection();
   sender.onicecandidate = function (event) {
     if (event.candidate) {
       receiver.addIceCandidate(new RTCIceCandidate(event.candidate));
diff --git a/content/test/data/media/datachannel_test.html b/content/test/data/media/datachannel_test.html
index 3b6e30325b5be4..aa49fc03bb33a3 100644
--- a/content/test/data/media/datachannel_test.html
+++ b/content/test/data/media/datachannel_test.html
@@ -6,8 +6,8 @@
 // Tests that an RTCDataChannel with event handlers is not garbage-collected
 // prematurely.
 function testDataChannelGC() {
-  var pc1 = new webkitRTCPeerConnection(null);
-  var pc2 = new webkitRTCPeerConnection(null);
+  var pc1 = new RTCPeerConnection();
+  var pc2 = new RTCPeerConnection();
 
   var iceCandidateHandler = function(rpc) {
     return function(e) {
diff --git a/content/test/data/media/mediarecorder_test.html b/content/test/data/media/mediarecorder_test.html
index 86e392d3507bec..fa58e53950e987 100644
--- a/content/test/data/media/mediarecorder_test.html
+++ b/content/test/data/media/mediarecorder_test.html
@@ -42,8 +42,8 @@
   return new Promise(function(resolve, reject) {
     var localStream = stream;
     var remoteStream = null;
-    var localPeerConnection = new webkitRTCPeerConnection(null);
-    var remotePeerConnection = new webkitRTCPeerConnection(null);
+    var localPeerConnection = new RTCPeerConnection();
+    var remotePeerConnection = new RTCPeerConnection();
 
     function createAnswer(description) {
       remotePeerConnection.createAnswer(function(description) {
diff --git a/content/test/data/media/peerconnection-call.html b/content/test/data/media/peerconnection-call.html
index c592ab2c9b7081..781b86968836ab 100644
--- a/content/test/data/media/peerconnection-call.html
+++ b/content/test/data/media/peerconnection-call.html
@@ -518,7 +518,7 @@
   }
 
   function callWithDevicePermissionGranted() {
-    var pc = new webkitRTCPeerConnection(null, null);
+    var pc = new RTCPeerConnection();
     gatherIceCandidates(pc, function(candidates) {
       var hasLoopbackCandidate = false;
       assertEquals(candidates.length > 0, true);
@@ -534,7 +534,7 @@
   }
 
   function callWithNoCandidateExpected() {
-    var pc = new webkitRTCPeerConnection({iceServers:[]}, null);
+    var pc = new RTCPeerConnection();
     gatherIceCandidates(pc, function(candidates) {
       assertEquals(candidates.length, 0);
       reportTestSuccess();
@@ -542,7 +542,7 @@
   }
 
   function callAndExpectNonLoopbackCandidates() {
-    var pc = new webkitRTCPeerConnection(null, null);
+    var pc = new RTCPeerConnection();
     gatherIceCandidates(pc, function(candidates) {
       var hasCandidate = false;
       assertEquals(candidates.length > 0, true);
diff --git a/ppapi/examples/video_effects/video_effects.html b/ppapi/examples/video_effects/video_effects.html
index fa37d59b81c489..54697534ca2e5a 100644
--- a/ppapi/examples/video_effects/video_effects.html
+++ b/ppapi/examples/video_effects/video_effects.html
@@ -49,7 +49,6 @@
     width="320" height="240"/>
 
 <script>
-var RTCPeerConnection = webkitRTCPeerConnection;
 var getUserMedia = navigator.webkitGetUserMedia.bind(navigator);
 var attachMediaStream = function(element, stream) {
   element.src = URL.createObjectURL(stream);
diff --git a/third_party/WebKit/LayoutTests/fast/mediastream/constructors-expected.txt b/third_party/WebKit/LayoutTests/fast/mediastream/constructors-expected.txt
index 81cbfc7f9f85d7..1f310d687414d2 100644
--- a/third_party/WebKit/LayoutTests/fast/mediastream/constructors-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/mediastream/constructors-expected.txt
@@ -3,13 +3,13 @@ Tests the JSEP PeerConnection related constructors.
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS typeof webkitRTCPeerConnection === 'function' is true
+PASS typeof RTCPeerConnection === 'function' is true
 PASS typeof RTCSessionDescription === 'function' is true
 PASS typeof RTCIceCandidate === 'function' is true
-PASS webkitRTCPeerConnection() threw exception TypeError: Failed to construct 'RTCPeerConnection': Please use the 'new' operator, this DOM object constructor cannot be called as a function..
+PASS RTCPeerConnection() threw exception TypeError: Failed to construct 'RTCPeerConnection': Please use the 'new' operator, this DOM object constructor cannot be called as a function..
 PASS RTCSessionDescription() threw exception TypeError: Failed to construct 'RTCSessionDescription': Please use the 'new' operator, this DOM object constructor cannot be called as a function..
 PASS RTCIceCandidate() threw exception TypeError: Failed to construct 'RTCIceCandidate': Please use the 'new' operator, this DOM object constructor cannot be called as a function..
-PASS new webkitRTCPeerConnection({iceServers:[{url:'stun://foobar.com:12345'}]}, null); did not throw exception.
+PASS new RTCPeerConnection({iceServers:[{url:'stun://foobar.com:12345'}]}, null); did not throw exception.
 PASS new RTCSessionDescription({type:'offer',sdp:'foobar'}); did not throw exception.
 PASS new RTCIceCandidate({candidate:'foo'}); did not throw exception.
 PASS successfullyParsed is true
diff --git a/third_party/WebKit/LayoutTests/fast/mediastream/constructors.html b/third_party/WebKit/LayoutTests/fast/mediastream/constructors.html
index a1219962862124..185759a2743d26 100644
--- a/third_party/WebKit/LayoutTests/fast/mediastream/constructors.html
+++ b/third_party/WebKit/LayoutTests/fast/mediastream/constructors.html
@@ -9,15 +9,15 @@
 <script>
 description("Tests the JSEP PeerConnection related constructors.");
 
-shouldBeTrue("typeof webkitRTCPeerConnection === 'function'");
+shouldBeTrue("typeof RTCPeerConnection === 'function'");
 shouldBeTrue("typeof RTCSessionDescription === 'function'");
 shouldBeTrue("typeof RTCIceCandidate === 'function'");
 
-shouldThrow("webkitRTCPeerConnection()");
+shouldThrow("RTCPeerConnection()");
 shouldThrow("RTCSessionDescription()");
 shouldThrow("RTCIceCandidate()");
 
-shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{url:'stun://foobar.com:12345'}]}, null);");
+shouldNotThrow("new RTCPeerConnection({iceServers:[{url:'stun://foobar.com:12345'}]}, null);");
 shouldNotThrow("new RTCSessionDescription({type:'offer',sdp:'foobar'});");
 shouldNotThrow("new RTCIceCandidate({candidate:'foo'});");
 
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-AddRemoveStream.html b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-AddRemoveStream.html
index 9190a62c9af411..e43377b7c51c66 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-AddRemoveStream.html
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-AddRemoveStream.html
@@ -16,7 +16,7 @@
     navigator.webkitGetUserMedia(options, (stream2) => {
         assert_false(stream1.id === stream2.id);
 
-        pc = new webkitRTCPeerConnection(null, null);
+        pc = new RTCPeerConnection();
 
         pc.onnegotiationneeded = (event) => {
             assert_equals(pc.getStreamById(stream1.id), stream1);
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-createAnswer-promise.html b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-createAnswer-promise.html
index a786c27d954a93..4f0eefa2fb493a 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-createAnswer-promise.html
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-createAnswer-promise.html
@@ -12,7 +12,7 @@
       // In all other cases, createAnswer() fails in the test runner.
 
       defaultError = new DOMException('TEST_ERROR', 'OperationError')
-      pc = new webkitRTCPeerConnection(null, null);
+      pc = new RTCPeerConnection();
 
       // Test that createAnswer with voiceActivityDetection succeeds.
       // voiceActivityDetection is true by default.
@@ -40,7 +40,7 @@
       }, 'createAnswer(1)' );
 
       // Test closed connection
-      closedPC = new webkitRTCPeerConnection(null);
+      closedPC = new RTCPeerConnection();
       closedPC.close();
       promise_test(function() {
         var invalidStateError = new DOMException('', 'InvalidStateError');
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-createAnswer.html b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-createAnswer.html
index 64fb888b6caba2..ec9ec92069016c 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-createAnswer.html
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-createAnswer.html
@@ -36,7 +36,7 @@
 
 function testExecutionOrderClosedConnection()
 {
-    var localPeerConnection = new webkitRTCPeerConnection(null, null);
+    var localPeerConnection = new RTCPeerConnection();
     localPeerConnection.close();
     var counter = 0;
     window.events = [];
@@ -54,7 +54,7 @@
 }
 
 shouldNotThrow('testExecutionOrderClosedConnection()');
-pc = new webkitRTCPeerConnection(null, null);
+pc = new RTCPeerConnection();
 pc.createOffer(unexpectedCallback, createOfferWithoutDescriptionFailed);
 
 window.jsTestIsAsync = true;
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-createOffer-promise.html b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-createOffer-promise.html
index a4ac6d18ab9649..4d967ea3a7bf62 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-createOffer-promise.html
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-createOffer-promise.html
@@ -14,7 +14,7 @@
       // runner.
 
       defaultError = new DOMException('TEST_ERROR', 'OperationError')
-      pc = new webkitRTCPeerConnection(null);
+      pc = new RTCPeerConnection();
 
       // Test that creating an offer with voiceActivityDetection, iceRestart,
       // offerToReceiveAudio and offerToReceiveVideo returns an accepted promise.
@@ -69,7 +69,7 @@
       }, 'createOffer(1)' );
 
       // Test closed connection
-      closedPC = new webkitRTCPeerConnection(null);
+      closedPC = new RTCPeerConnection();
       closedPC.close();
       promise_test(function() {
         var invalidStateError = new DOMException('', 'InvalidStateError');
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-createOffer.html b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-createOffer.html
index 3e595a0dd1ee82..a3ab32363746d2 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-createOffer.html
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-createOffer.html
@@ -94,7 +94,7 @@
 
 function testExecutionOrderClosedConnection()
 {
-    var localPeerConnection = new webkitRTCPeerConnection(null, null);
+    var localPeerConnection = new RTCPeerConnection();
     localPeerConnection.close();
     var counter = 0;
     window.events = [];
@@ -112,7 +112,7 @@
 }
 
 shouldNotThrow('testExecutionOrderClosedConnection()');
-pc = new webkitRTCPeerConnection(null);
+pc = new RTCPeerConnection();
 shouldNotThrow('pc.createOffer(createOfferSucceeded1, unexpectedCallback, {voiceActivityDetection:true, iceRestart:true, offerToReceiveAudio:1, offerToReceiveVideo:1});');
 
 window.jsTestIsAsync = true;
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-datachannel.html b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-datachannel.html
index 87ed1c7a2417de..21e7dc602725f9 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-datachannel.html
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-datachannel.html
@@ -88,7 +88,7 @@
     }
 }
 
-pc = new webkitRTCPeerConnection(null, null);
+pc = new RTCPeerConnection();
 shouldNotThrow('dc = pc.createDataChannel("label1");');
 shouldBe("dc.reliable", "true");
 shouldNotThrow('dc = pc.createDataChannel("label2", {});');
@@ -102,7 +102,7 @@
 shouldNotThrow('dc = pc.createDataChannel("label3", {maxRetransmitTime:0});');
 shouldBe("dc.reliable", "false");
 
-pc = new webkitRTCPeerConnection(null, null);
+pc = new RTCPeerConnection();
 pc.oniceconnectionstatechange = pc_onicechange;
 pc.ondatachannel = pc_ondatachannel;
 
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-dtmf.html b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-dtmf.html
index 8d0085990c7e70..9dd2f55d8071af 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-dtmf.html
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-dtmf.html
@@ -53,7 +53,7 @@
     shouldBe('stream.getAudioTracks().length', '1');
     shouldBe('stream.getVideoTracks().length', '0');
 
-    pc = new webkitRTCPeerConnection(null, null);
+    pc = new RTCPeerConnection();
     pc.oniceconnectionstatechange = pc_onicechange;
 }
 
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-events.html b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-events.html
index 994f40b72a361a..ab38bb1285f59d 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-events.html
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-events.html
@@ -41,7 +41,7 @@
     testPassed('gotStream was called.');
     stream = s;
 
-    pc = new webkitRTCPeerConnection(null, null);
+    pc = new RTCPeerConnection();
     pc.onnegotiationneeded = onNegotiationNeeded;
 
     pc.addStream(stream);
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-expected.txt b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-expected.txt
index 35f2beb8cc58a0..9579a3ba359426 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-expected.txt
@@ -6,58 +6,59 @@ Tests the RTCPeerConnection constructor.
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS new webkitRTCPeerConnection(null); did not throw exception.
-PASS new webkitRTCPeerConnection(undefined); did not throw exception.
-PASS new webkitRTCPeerConnection({}); did not throw exception.
-PASS new webkitRTCPeerConnection(); did not throw exception.
-PASS new webkitRTCPeerConnection(''); threw exception TypeError: Failed to construct 'RTCPeerConnection': parameter 1 ('configuration') is not an object..
-PASS new webkitRTCPeerConnection({iceServers:[]}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{url:'stun:foo.com'}]}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{url:'turn:foo.com', credential:'x'}]}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{url:'turn:foo.com', credential:'x'},{url:'stun:bar.com'}]}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:['stun:foo.com', 'turn:foo.com']}]}); did not throw exception.
-PASS new webkitRTCPeerConnection({fooServers:[]}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:true}); threw exception TypeError: Failed to construct 'RTCPeerConnection': The value provided is neither an array, nor does it have indexed properties..
-PASS new webkitRTCPeerConnection({iceServers:[1, 2, 3]}); threw exception TypeError: Failed to construct 'RTCPeerConnection': cannot convert to dictionary..
-PASS new webkitRTCPeerConnection({iceServers:[{}]}); threw exception TypeError: Failed to construct 'RTCPeerConnection': Malformed RTCIceServer.
-PASS new webkitRTCPeerConnection({iceServers:[{url:'foo'}]}); threw exception TypeError: Failed to construct 'RTCPeerConnection': Malformed URL.
-PASS new webkitRTCPeerConnection({iceServers:[{urls:[1, 'turn:foo.com']}]}); threw exception TypeError: Failed to construct 'RTCPeerConnection': Malformed URL.
-PASS new webkitRTCPeerConnection({iceServers:[], iceTransports:'none'}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[], iceTransports:'relay'}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[], iceTransports:'all'}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[], iceTransports:'foo'}); threw exception TypeError: Failed to construct 'RTCPeerConnection': The provided value 'foo' is not a valid enum value of type RTCIceTransportPolicy..
-PASS new webkitRTCPeerConnection({iceServers:[], bundlePolicy:'balanced'}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[], bundlePolicy:'max-bundle'}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[], bundlePolicy:'max-compat'}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[], bundlePolicy:'foo'}); threw exception TypeError: Failed to construct 'RTCPeerConnection': The provided value 'foo' is not a valid enum value of type RTCBundlePolicy..
-PASS new webkitRTCPeerConnection({iceServers:[], rtcpMuxPolicy:'negotiate'}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[], rtcpMuxPolicy:'require'}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[], rtcpMuxPolicy:'foo'}); threw exception TypeError: Failed to construct 'RTCPeerConnection': The provided value 'foo' is not a valid enum value of type RTCRtcpMuxPolicy..
-PASS new webkitRTCPeerConnection(null, {mandatory:{valid_and_supported_1:1}}); did not throw exception.
-PASS new webkitRTCPeerConnection(null, {mandatory:{valid_and_supported_1:1, valid_and_supported_2:1}}); did not throw exception.
-PASS new webkitRTCPeerConnection(null, {optional:[{valid_and_supported_1:0}]}); did not throw exception.
-PASS new webkitRTCPeerConnection(null, {optional:[{valid_and_supported_1:0},{valid_and_supported_2:0}]}); did not throw exception.
-PASS new webkitRTCPeerConnection(null, {optional:[{valid_but_unsupported_1:0},{valid_but_unsupported_2:0}]}); did not throw exception.
-PASS new webkitRTCPeerConnection(null, {mandatory:{valid_and_supported_1:66}}); threw exception NotSupportedError: Failed to construct 'RTCPeerConnection': Unsatisfiable constraint valid_and_supported_1.
-PASS new webkitRTCPeerConnection(null, {mandatory:{invalid:1}}); threw exception NotSupportedError: Failed to construct 'RTCPeerConnection': Unsatisfiable constraint invalid.
-PASS new webkitRTCPeerConnection(null, {mandatory:{valid_but_unsupported_1:1}}); threw exception NotSupportedError: Failed to construct 'RTCPeerConnection': Unsatisfiable constraint valid_but_unsupported_1.
-PASS new webkitRTCPeerConnection(null, {mandatory:{valid_but_unsupported_1:1, valid_and_supported_1:1}}); threw exception NotSupportedError: Failed to construct 'RTCPeerConnection': Unsatisfiable constraint valid_but_unsupported_1.
-PASS new webkitRTCPeerConnection(null, {optional:{valid_and_supported_1:0}}); threw exception TypeError: Failed to construct 'RTCPeerConnection': Malformed constraints object..
-PASS new webkitRTCPeerConnection(null, {optional:[{valid_and_supported_1:0,valid_and_supported_2:0}]}); threw exception TypeError: Failed to construct 'RTCPeerConnection': Malformed constraints object..
-PASS new webkitRTCPeerConnection(null, {optional:[{invalid:0}]}); did not throw exception.
-PASS new webkitRTCPeerConnection(null, {valid_and_supported_1:1}); threw exception TypeError: Failed to construct 'RTCPeerConnection': Malformed constraints object..
-PASS new webkitRTCPeerConnection(null, {valid_but_unsupported_1:1}); threw exception TypeError: Failed to construct 'RTCPeerConnection': Malformed constraints object..
-PASS new webkitRTCPeerConnection(null, {valid_and_supported_2:1, mandatory:{valid_and_supported_1:1}}); threw exception TypeError: Failed to construct 'RTCPeerConnection': Malformed constraints object..
-PASS new webkitRTCPeerConnection({iceServers:[], certificates:null}); threw exception TypeError: Failed to construct 'RTCPeerConnection': The value provided is neither an array, nor does it have indexed properties..
-PASS new webkitRTCPeerConnection({iceServers:[], certificates:undefined}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[], certificates:[]}); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[], certificates:[null]}); threw exception TypeError: Failed to construct 'RTCPeerConnection': Invalid Array element type.
-PASS new webkitRTCPeerConnection({iceServers:[], certificates:[1337]}); threw exception TypeError: Failed to construct 'RTCPeerConnection': Invalid Array element type.
-PASS new webkitRTCPeerConnection({iceServers:[], certificates:[certRSA]}, null); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[], certificates:[certECDSA]}, null); did not throw exception.
+PASS webkitRTCPeerConnection is RTCPeerConnection
+PASS new RTCPeerConnection(null); did not throw exception.
+PASS new RTCPeerConnection(undefined); did not throw exception.
+PASS new RTCPeerConnection({}); did not throw exception.
+PASS new RTCPeerConnection(); did not throw exception.
+PASS new RTCPeerConnection(''); threw exception TypeError: Failed to construct 'RTCPeerConnection': parameter 1 ('configuration') is not an object..
+PASS new RTCPeerConnection({iceServers:[]}); did not throw exception.
+PASS new RTCPeerConnection({iceServers:[{url:'stun:foo.com'}]}); did not throw exception.
+PASS new RTCPeerConnection({iceServers:[{url:'turn:foo.com', credential:'x'}]}); did not throw exception.
+PASS new RTCPeerConnection({iceServers:[{url:'turn:foo.com', credential:'x'},{url:'stun:bar.com'}]}); did not throw exception.
+PASS new RTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]}); did not throw exception.
+PASS new RTCPeerConnection({iceServers:[{urls:['stun:foo.com', 'turn:foo.com']}]}); did not throw exception.
+PASS new RTCPeerConnection({fooServers:[]}); did not throw exception.
+PASS new RTCPeerConnection({iceServers:true}); threw exception TypeError: Failed to construct 'RTCPeerConnection': The value provided is neither an array, nor does it have indexed properties..
+PASS new RTCPeerConnection({iceServers:[1, 2, 3]}); threw exception TypeError: Failed to construct 'RTCPeerConnection': cannot convert to dictionary..
+PASS new RTCPeerConnection({iceServers:[{}]}); threw exception TypeError: Failed to construct 'RTCPeerConnection': Malformed RTCIceServer.
+PASS new RTCPeerConnection({iceServers:[{url:'foo'}]}); threw exception TypeError: Failed to construct 'RTCPeerConnection': Malformed URL.
+PASS new RTCPeerConnection({iceServers:[{urls:[1, 'turn:foo.com']}]}); threw exception TypeError: Failed to construct 'RTCPeerConnection': Malformed URL.
+PASS new RTCPeerConnection({iceServers:[], iceTransports:'none'}); did not throw exception.
+PASS new RTCPeerConnection({iceServers:[], iceTransports:'relay'}); did not throw exception.
+PASS new RTCPeerConnection({iceServers:[], iceTransports:'all'}); did not throw exception.
+PASS new RTCPeerConnection({iceServers:[], iceTransports:'foo'}); threw exception TypeError: Failed to construct 'RTCPeerConnection': The provided value 'foo' is not a valid enum value of type RTCIceTransportPolicy..
+PASS new RTCPeerConnection({iceServers:[], bundlePolicy:'balanced'}); did not throw exception.
+PASS new RTCPeerConnection({iceServers:[], bundlePolicy:'max-bundle'}); did not throw exception.
+PASS new RTCPeerConnection({iceServers:[], bundlePolicy:'max-compat'}); did not throw exception.
+PASS new RTCPeerConnection({iceServers:[], bundlePolicy:'foo'}); threw exception TypeError: Failed to construct 'RTCPeerConnection': The provided value 'foo' is not a valid enum value of type RTCBundlePolicy..
+PASS new RTCPeerConnection({iceServers:[], rtcpMuxPolicy:'negotiate'}); did not throw exception.
+PASS new RTCPeerConnection({iceServers:[], rtcpMuxPolicy:'require'}); did not throw exception.
+PASS new RTCPeerConnection({iceServers:[], rtcpMuxPolicy:'foo'}); threw exception TypeError: Failed to construct 'RTCPeerConnection': The provided value 'foo' is not a valid enum value of type RTCRtcpMuxPolicy..
+PASS new RTCPeerConnection(null, {mandatory:{valid_and_supported_1:1}}); did not throw exception.
+PASS new RTCPeerConnection(null, {mandatory:{valid_and_supported_1:1, valid_and_supported_2:1}}); did not throw exception.
+PASS new RTCPeerConnection(null, {optional:[{valid_and_supported_1:0}]}); did not throw exception.
+PASS new RTCPeerConnection(null, {optional:[{valid_and_supported_1:0},{valid_and_supported_2:0}]}); did not throw exception.
+PASS new RTCPeerConnection(null, {optional:[{valid_but_unsupported_1:0},{valid_but_unsupported_2:0}]}); did not throw exception.
+PASS new RTCPeerConnection(null, {mandatory:{valid_and_supported_1:66}}); threw exception NotSupportedError: Failed to construct 'RTCPeerConnection': Unsatisfiable constraint valid_and_supported_1.
+PASS new RTCPeerConnection(null, {mandatory:{invalid:1}}); threw exception NotSupportedError: Failed to construct 'RTCPeerConnection': Unsatisfiable constraint invalid.
+PASS new RTCPeerConnection(null, {mandatory:{valid_but_unsupported_1:1}}); threw exception NotSupportedError: Failed to construct 'RTCPeerConnection': Unsatisfiable constraint valid_but_unsupported_1.
+PASS new RTCPeerConnection(null, {mandatory:{valid_but_unsupported_1:1, valid_and_supported_1:1}}); threw exception NotSupportedError: Failed to construct 'RTCPeerConnection': Unsatisfiable constraint valid_but_unsupported_1.
+PASS new RTCPeerConnection(null, {optional:{valid_and_supported_1:0}}); threw exception TypeError: Failed to construct 'RTCPeerConnection': Malformed constraints object..
+PASS new RTCPeerConnection(null, {optional:[{valid_and_supported_1:0,valid_and_supported_2:0}]}); threw exception TypeError: Failed to construct 'RTCPeerConnection': Malformed constraints object..
+PASS new RTCPeerConnection(null, {optional:[{invalid:0}]}); did not throw exception.
+PASS new RTCPeerConnection(null, {valid_and_supported_1:1}); threw exception TypeError: Failed to construct 'RTCPeerConnection': Malformed constraints object..
+PASS new RTCPeerConnection(null, {valid_but_unsupported_1:1}); threw exception TypeError: Failed to construct 'RTCPeerConnection': Malformed constraints object..
+PASS new RTCPeerConnection(null, {valid_and_supported_2:1, mandatory:{valid_and_supported_1:1}}); threw exception TypeError: Failed to construct 'RTCPeerConnection': Malformed constraints object..
+PASS new RTCPeerConnection({iceServers:[], certificates:null}); threw exception TypeError: Failed to construct 'RTCPeerConnection': The value provided is neither an array, nor does it have indexed properties..
+PASS new RTCPeerConnection({iceServers:[], certificates:undefined}); did not throw exception.
+PASS new RTCPeerConnection({iceServers:[], certificates:[]}); did not throw exception.
+PASS new RTCPeerConnection({iceServers:[], certificates:[null]}); threw exception TypeError: Failed to construct 'RTCPeerConnection': Invalid Array element type.
+PASS new RTCPeerConnection({iceServers:[], certificates:[1337]}); threw exception TypeError: Failed to construct 'RTCPeerConnection': Invalid Array element type.
+PASS new RTCPeerConnection({iceServers:[], certificates:[certRSA]}, null); did not throw exception.
+PASS new RTCPeerConnection({iceServers:[], certificates:[certECDSA]}, null); did not throw exception.
 PASS certExpired.expires <= new Date().getTime() is true
-PASS new webkitRTCPeerConnection({iceServers:[], certificates:[certExpired]}, null); threw exception InvalidAccessError: Failed to construct 'RTCPeerConnection': Expired certificate(s)..
+PASS new RTCPeerConnection({iceServers:[], certificates:[certExpired]}, null); threw exception InvalidAccessError: Failed to construct 'RTCPeerConnection': Expired certificate(s)..
 PASS successfullyParsed is true
 
 TEST COMPLETE
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-generateCertificate.html b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-generateCertificate.html
index ab0dbf2ce23162..65e2837c9bc1f4 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-generateCertificate.html
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-generateCertificate.html
@@ -23,8 +23,8 @@
 // 1: RSA-2048 using public exponent = 65537.
 function generate1RSA()
 {
-    generateCallString  =  'generateCertificate({ name: "RSASSA-PKCS1-v1_5", modulusLength: 2048, publicExponent: new Uint8Array([1, 0, 1]), hash: "SHA-256" })';
-    webkitRTCPeerConnection.generateCertificate({ name: "RSASSA-PKCS1-v1_5", modulusLength: 2048, publicExponent: new Uint8Array([1, 0, 1]), hash: "SHA-256" })
+    generateCallString = 'generateCertificate({ name: "RSASSA-PKCS1-v1_5", modulusLength: 2048, publicExponent: new Uint8Array([1, 0, 1]), hash: "SHA-256" })';
+    RTCPeerConnection.generateCertificate({ name: "RSASSA-PKCS1-v1_5", modulusLength: 2048, publicExponent: new Uint8Array([1, 0, 1]), hash: "SHA-256" })
         .then(generate1RSASuccessful, generate1RSAFailed);
 }
 function generate1RSASuccessful(certificate)
@@ -43,8 +43,8 @@
 // 2: ECDSA using NIST P-256.
 function generate2ECDSA()
 {
-    generateCallString  =  'generateCertificate({ name: "ECDSA", namedCurve: "P-256" })';
-    webkitRTCPeerConnection.generateCertificate({ name: "ECDSA", namedCurve: "P-256" })
+    generateCallString = 'generateCertificate({ name: "ECDSA", namedCurve: "P-256" })';
+    RTCPeerConnection.generateCertificate({ name: "ECDSA", namedCurve: "P-256" })
         .then(generate2ECDSASuccessful, generate2ECDSAFailed);
 }
 function generate2ECDSASuccessful(certificate)
@@ -63,20 +63,20 @@
 // 3-5: Verify that the |expires| attribute works (generate ECDSA because its faster).
 function generate3ExpiresNegativeOneDay()
 {
-    generateCallString  =  'generateCertificate({ name: "ECDSA", namedCurve: "P-256", expires:-dayInMs })';
-    webkitRTCPeerConnection.generateCertificate({ name: "ECDSA", namedCurve: "P-256", expires:-dayInMs })
+    generateCallString = 'generateCertificate({ name: "ECDSA", namedCurve: "P-256", expires:-dayInMs })';
+    RTCPeerConnection.generateCertificate({ name: "ECDSA", namedCurve: "P-256", expires:-dayInMs })
         .then(function(certificate) { certExpiresNegativeOneDay = certificate; generate4ExpiresZero(); }, generate4ExpiresZero);
 }
 function generate4ExpiresZero()
 {
-    generateCallString  =  'generateCertificate({ name: "ECDSA", namedCurve: "P-256", expires:0 })';
-    webkitRTCPeerConnection.generateCertificate({ name: "ECDSA", namedCurve: "P-256", expires:0 })
+    generateCallString = 'generateCertificate({ name: "ECDSA", namedCurve: "P-256", expires:0 })';
+    RTCPeerConnection.generateCertificate({ name: "ECDSA", namedCurve: "P-256", expires:0 })
         .then(function(certificate) { certExpiresZero = certificate; generate5ExpiresPositiveOneDay(); }, generate5ExpiresPositiveOneDay);
 }
 function generate5ExpiresPositiveOneDay()
 {
-    generateCallString  =  'generateCertificate({ name: "ECDSA", namedCurve: "P-256", expires:dayInMs })';  // +1 day
-    webkitRTCPeerConnection.generateCertificate({ name: "ECDSA", namedCurve: "P-256", expires:dayInMs })
+    generateCallString = 'generateCertificate({ name: "ECDSA", namedCurve: "P-256", expires:dayInMs })';  // +1 day
+    RTCPeerConnection.generateCertificate({ name: "ECDSA", namedCurve: "P-256", expires:dayInMs })
         .then(function(certificate) { certExpiresPositiveOneDay = certificate; generate3to5ExpiresResolved(); }, generate3to5ExpiresResolved);
 }
 function generate3to5ExpiresResolved()
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-getStats-promise.html b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-getStats-promise.html
index 135791a96b73ed..79e9c67ec662d8 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-getStats-promise.html
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-getStats-promise.html
@@ -7,7 +7,7 @@
 </head>
 <body>
 <script>
-var pc = new webkitRTCPeerConnection(null);
+var pc = new RTCPeerConnection();
 
 function stringify_equals(d1, d2) {
   return JSON.stringify(d1) == JSON.stringify(d2);
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-ice-promise-expected.txt b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-ice-promise-expected.txt
index de084782170761..d3df4e35d9085b 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-ice-promise-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-ice-promise-expected.txt
@@ -3,7 +3,7 @@ Tests the RTCPeerConnection Ice functionality.
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS pc = new webkitRTCPeerConnection(null, null); did not throw exception.
+PASS pc = new RTCPeerConnection(); did not throw exception.
 PASS iceConnectionState is completed
 PASS pc.addIceCandidate(null).then(unexpectedSuccess, expectedTypeError); did not throw exception.
 PASS pc.addIceCandidate(iceCandidate).then(addIceCandidateSuccess, addIceCandidateFailure); did not throw exception.
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-ice-promise.html b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-ice-promise.html
index b89bbbe4e5ae79..cf5170b7dff54c 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-ice-promise.html
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-ice-promise.html
@@ -54,7 +54,7 @@
     }
 }
 
-shouldNotThrow('pc = new webkitRTCPeerConnection(null, null);');
+shouldNotThrow('pc = new RTCPeerConnection();');
 pc.oniceconnectionstatechange = onIceChange1;
 
 window.jsTestIsAsync = true;
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-ice.html b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-ice.html
index 3c6b1f8669f86b..288495523a7c67 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-ice.html
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-ice.html
@@ -8,7 +8,7 @@
 <script>
 
 async_test(function(t) {
-    const localPeerConnection = new webkitRTCPeerConnection(null, null);
+    const localPeerConnection = new RTCPeerConnection();
     localPeerConnection.close();
 
     let counter = 0;
@@ -96,7 +96,7 @@
     });
 
     const calledCallbacks = [];
-    const pc = new webkitRTCPeerConnection(null, null);
+    const pc = new RTCPeerConnection();
     pc.oniceconnectionstatechange = t.step_func(onIceChange1);
 }, 'Tests the RTCPeerConnection Ice functionality.');
 </script>
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-lifetime.html b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-lifetime.html
index 7991384ffa2d53..7565bf796d6f53 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-lifetime.html
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-lifetime.html
@@ -25,7 +25,7 @@
 function createPeerConnectionAndDataChannel()
 {
     // The Peer Connection object is leaked
-    var pc = new webkitRTCPeerConnection({iceServers:[]}, null);
+    var pc = new RTCPeerConnection();
     dc = pc.createDataChannel("label");
     dc.onopen = dataChannelOpen;
 }
@@ -34,7 +34,7 @@
 var observationB = null;
 
 // Test that the PeerConnection object is gc'd if close is called.
-var pcA = new webkitRTCPeerConnection(null, null);
+var pcA = new RTCPeerConnection();
 // Do not pass the object directly to observeGC function. This may
 // remain live on this function's stack preventing GC from collecting
 // it. Accessing the object inside an inner function will prevent any
@@ -47,7 +47,7 @@
     observationA = null;
 
     // Test that the PeerConnection object is not gc'd if close is not called.
-    pcB = new webkitRTCPeerConnection(null, null);
+    pcB = new RTCPeerConnection();
     // Do not pass the object directly to observeGC function. This may
     // remain live on this function's stack preventing GC from collecting
     // it. Accessing the object inside an inner function will prevent any
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-localDescription-promise.html b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-localDescription-promise.html
index 1eb3c289f85a26..9749767fb3f302 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-localDescription-promise.html
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-localDescription-promise.html
@@ -56,7 +56,7 @@
     testPassed('expectedInvalidSessionDescription was called.')
 }
 
-pc = new webkitRTCPeerConnection(null, null);
+pc = new RTCPeerConnection();
 shouldNotThrow('pc.setLocalDescription().catch(expectedTypeError)');
 shouldNotThrow('pc.setLocalDescription(null).catch(expectedInvalidSessionDescription)');
 var sessionDescription = new RTCSessionDescription({type:"offer", sdp:"local"});
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-localDescription.html b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-localDescription.html
index 801373d0ff7ceb..1619aef9601404 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-localDescription.html
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-localDescription.html
@@ -52,7 +52,7 @@
 
 function testExecutionOrderClosedConnection()
 {
-    var localPeerConnection = new webkitRTCPeerConnection(null, null);
+    var localPeerConnection = new RTCPeerConnection();
     localPeerConnection.close();
     var counter = 0;
     window.events = [];
@@ -65,13 +65,13 @@
         events[counter++] = 2;
     });
     Promise.resolve().then(_ => {
-        events[counter++] = 3; 
+        events[counter++] = 3;
         shouldBe('events', '[1,2,3]');
     });
 }
 
 shouldNotThrow('testExecutionOrderClosedConnection()');
-pc = new webkitRTCPeerConnection(null, null);
+pc = new RTCPeerConnection();
 shouldNotThrow('pc.setLocalDescription().catch(expectedTypeError)');
 shouldNotThrow('pc.setLocalDescription(null).catch(expectedInvalidSessionDescription)');
 var sessionDescription = new RTCSessionDescription({type:"offer", sdp:"local"});
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-onnegotiationneeded.html b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-onnegotiationneeded.html
index 3cd322e9ddac4e..d2b178ebc52237 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-onnegotiationneeded.html
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-onnegotiationneeded.html
@@ -34,7 +34,7 @@
     testPassed('Got a stream.');
     stream = s;
 
-    pc = new webkitRTCPeerConnection(null, null);
+    pc = new RTCPeerConnection();
     pc.onnegotiationneeded = onNegotiationNeeded;
 
     pc.addStream(stream);
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-remoteDescription-promise.html b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-remoteDescription-promise.html
index 31e12bcf6327a4..c675b3951e66bb 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-remoteDescription-promise.html
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-remoteDescription-promise.html
@@ -56,7 +56,7 @@
     testPassed('expectedInvalidSessionDescription was called.')
 }
 
-pc = new webkitRTCPeerConnection(null, null);
+pc = new RTCPeerConnection();
 shouldNotThrow('pc.setRemoteDescription().catch(expectedTypeError)');
 shouldNotThrow('pc.setRemoteDescription(null).catch(expectedInvalidSessionDescription)');
 var sessionDescription = new RTCSessionDescription({type:"answer", sdp:"remote"});
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-remoteDescription.html b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-remoteDescription.html
index 573eeedd2cbdb3..722773f1038d00 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-remoteDescription.html
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-remoteDescription.html
@@ -52,7 +52,7 @@
 
 function testExecutionOrderClosedConnection()
 {
-    var localPeerConnection = new webkitRTCPeerConnection(null, null);
+    var localPeerConnection = new RTCPeerConnection();
     localPeerConnection.close();
     var counter = 0;
     window.events = [];
@@ -65,13 +65,13 @@
         events[counter++] = 2;
     });
     Promise.resolve().then(_ => {
-        events[counter++] = 3; 
+        events[counter++] = 3;
         shouldBe('events', '[1,2,3]');
     });
 }
 
 shouldNotThrow('testExecutionOrderClosedConnection()');
-pc = new webkitRTCPeerConnection(null, null);
+pc = new RTCPeerConnection();
 shouldNotThrow('pc.setRemoteDescription().catch(expectedTypeError)');
 shouldNotThrow('pc.setRemoteDescription(null).catch(expectedInvalidSessionDescription)');
 var sessionDescription = new RTCSessionDescription({type:"answer", sdp:"remote"});
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-remotestreams.html b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-remotestreams.html
index b2690cbd2aa20c..a693e494fe253c 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-remotestreams.html
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-remotestreams.html
@@ -28,7 +28,7 @@
 {
     testPassed('requestSucceeded was called.');
     shouldBeEqualToNumber('pc.getRemoteStreams().length', 0);
-    finishJSTest();    
+    finishJSTest();
 }
 
 function requestSucceeded1()
@@ -73,7 +73,7 @@
     shouldBeFalse('event.stream.active')
 }
 
-pc = new webkitRTCPeerConnection(null, null);
+pc = new RTCPeerConnection();
 pc.onaddstream = onAddStream;
 pc.onremovestream = onRemoveStream;
 getUserMedia({audio:true, video:true}, gotStream);
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-state.html b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-state.html
index d7fb3f5ff8a558..5f5d7d80515557 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-state.html
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-state.html
@@ -9,7 +9,7 @@
 <script>
 
 async_test(function(test) {
-  var pc = new webkitRTCPeerConnection({iceServers: []}, null);
+  var pc = new RTCPeerConnection();
   assert_equals(pc.signalingState, 'stable');
   pc.onsignalingstatechange = test.step_func(() => {
     assert_equals(pc.signalingState, 'closed');
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-stats-expected.txt b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-stats-expected.txt
index ae6981b8ae845e..d62149d21c73f8 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-stats-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-stats-expected.txt
@@ -3,7 +3,7 @@ Tests the RTCPeerConnection stats interface.
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS pc = new webkitRTCPeerConnection(null) did not throw exception.
+PASS pc = new RTCPeerConnection() did not throw exception.
 PASS pc.getStats(statsHandler1) did not throw exception.
 PASS statsHandler1 was called
 PASS status is non-null.
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-stats.html b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-stats.html
index 31b3349be00ced..3cf829f721aaf5 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-stats.html
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-stats.html
@@ -89,7 +89,7 @@
 }
 
 var startTime = new Date().getTime();
-shouldNotThrow('pc = new webkitRTCPeerConnection(null)');
+shouldNotThrow('pc = new RTCPeerConnection()');
 shouldNotThrow('pc.getStats(statsHandler1)');
 
 window.jsTestIsAsync = true;
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-statsSelector-expected.txt b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-statsSelector-expected.txt
index 84ef4c95bac47e..210cf470a833aa 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-statsSelector-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-statsSelector-expected.txt
@@ -3,7 +3,7 @@ Tests the RTCPeerConnection stats selector argument.
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS pc = new webkitRTCPeerConnection(null) did not throw exception.
+PASS pc = new RTCPeerConnection() did not throw exception.
 PASS getUserMedia({audio:true, video:true}, gotStream) did not throw exception.
 PASS Got a stream.
 PASS pc.getStats(statsHandler2, pc.getLocalStreams()[0].getVideoTracks()[0]) did not throw exception.
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-statsSelector.html b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-statsSelector.html
index 4213eb625cac1d..8a634fae93723f 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-statsSelector.html
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-statsSelector.html
@@ -50,7 +50,7 @@
 }
 
 var startTime = new Date().getTime();
-shouldNotThrow('pc = new webkitRTCPeerConnection(null)');
+shouldNotThrow('pc = new RTCPeerConnection()');
 shouldNotThrow('getUserMedia({audio:true, video:true}, gotStream)');
 
 window.jsTestIsAsync = true;
diff --git a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection.html b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection.html
index 490fe95f509b80..f0e5a87c86b199 100644
--- a/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection.html
+++ b/third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection.html
@@ -7,64 +7,66 @@
 <script>
 description("Tests the RTCPeerConnection constructor.");
 
-shouldNotThrow("new webkitRTCPeerConnection(null);");
-shouldNotThrow("new webkitRTCPeerConnection(undefined);");
-shouldNotThrow("new webkitRTCPeerConnection({});");
-shouldNotThrow("new webkitRTCPeerConnection();");
-shouldThrow("new webkitRTCPeerConnection('');");
+shouldBe("webkitRTCPeerConnection", "RTCPeerConnection");
 
-shouldNotThrow("new webkitRTCPeerConnection({iceServers:[]});");
-shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{url:'stun:foo.com'}]});");
-shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{url:'turn:foo.com', credential:'x'}]});");
-shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{url:'turn:foo.com', credential:'x'},{url:'stun:bar.com'}]});");
-shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]});");
-shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{urls:['stun:foo.com', 'turn:foo.com']}]});");
+shouldNotThrow("new RTCPeerConnection(null);");
+shouldNotThrow("new RTCPeerConnection(undefined);");
+shouldNotThrow("new RTCPeerConnection({});");
+shouldNotThrow("new RTCPeerConnection();");
+shouldThrow("new RTCPeerConnection('');");
 
-shouldNotThrow("new webkitRTCPeerConnection({fooServers:[]});");
-shouldThrow("new webkitRTCPeerConnection({iceServers:true});");
-shouldThrow("new webkitRTCPeerConnection({iceServers:[1, 2, 3]});");
-shouldThrow("new webkitRTCPeerConnection({iceServers:[{}]});");
-shouldThrow("new webkitRTCPeerConnection({iceServers:[{url:'foo'}]});");
-shouldThrow("new webkitRTCPeerConnection({iceServers:[{urls:[1, 'turn:foo.com']}]});");
+shouldNotThrow("new RTCPeerConnection({iceServers:[]});");
+shouldNotThrow("new RTCPeerConnection({iceServers:[{url:'stun:foo.com'}]});");
+shouldNotThrow("new RTCPeerConnection({iceServers:[{url:'turn:foo.com', credential:'x'}]});");
+shouldNotThrow("new RTCPeerConnection({iceServers:[{url:'turn:foo.com', credential:'x'},{url:'stun:bar.com'}]});");
+shouldNotThrow("new RTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]});");
+shouldNotThrow("new RTCPeerConnection({iceServers:[{urls:['stun:foo.com', 'turn:foo.com']}]});");
 
-shouldNotThrow("new webkitRTCPeerConnection({iceServers:[], iceTransports:'none'});");
-shouldNotThrow("new webkitRTCPeerConnection({iceServers:[], iceTransports:'relay'});");
-shouldNotThrow("new webkitRTCPeerConnection({iceServers:[], iceTransports:'all'});");
-shouldThrow("new webkitRTCPeerConnection({iceServers:[], iceTransports:'foo'});");
+shouldNotThrow("new RTCPeerConnection({fooServers:[]});");
+shouldThrow("new RTCPeerConnection({iceServers:true});");
+shouldThrow("new RTCPeerConnection({iceServers:[1, 2, 3]});");
+shouldThrow("new RTCPeerConnection({iceServers:[{}]});");
+shouldThrow("new RTCPeerConnection({iceServers:[{url:'foo'}]});");
+shouldThrow("new RTCPeerConnection({iceServers:[{urls:[1, 'turn:foo.com']}]});");
 
-shouldNotThrow("new webkitRTCPeerConnection({iceServers:[], bundlePolicy:'balanced'});");
-shouldNotThrow("new webkitRTCPeerConnection({iceServers:[], bundlePolicy:'max-bundle'});");
-shouldNotThrow("new webkitRTCPeerConnection({iceServers:[], bundlePolicy:'max-compat'});");
-shouldThrow("new webkitRTCPeerConnection({iceServers:[], bundlePolicy:'foo'});");
+shouldNotThrow("new RTCPeerConnection({iceServers:[], iceTransports:'none'});");
+shouldNotThrow("new RTCPeerConnection({iceServers:[], iceTransports:'relay'});");
+shouldNotThrow("new RTCPeerConnection({iceServers:[], iceTransports:'all'});");
+shouldThrow("new RTCPeerConnection({iceServers:[], iceTransports:'foo'});");
 
-shouldNotThrow("new webkitRTCPeerConnection({iceServers:[], rtcpMuxPolicy:'negotiate'});");
-shouldNotThrow("new webkitRTCPeerConnection({iceServers:[], rtcpMuxPolicy:'require'});");
-shouldThrow("new webkitRTCPeerConnection({iceServers:[], rtcpMuxPolicy:'foo'});");
+shouldNotThrow("new RTCPeerConnection({iceServers:[], bundlePolicy:'balanced'});");
+shouldNotThrow("new RTCPeerConnection({iceServers:[], bundlePolicy:'max-bundle'});");
+shouldNotThrow("new RTCPeerConnection({iceServers:[], bundlePolicy:'max-compat'});");
+shouldThrow("new RTCPeerConnection({iceServers:[], bundlePolicy:'foo'});");
+
+shouldNotThrow("new RTCPeerConnection({iceServers:[], rtcpMuxPolicy:'negotiate'});");
+shouldNotThrow("new RTCPeerConnection({iceServers:[], rtcpMuxPolicy:'require'});");
+shouldThrow("new RTCPeerConnection({iceServers:[], rtcpMuxPolicy:'foo'});");
 
 // Deprecated.
-shouldNotThrow("new webkitRTCPeerConnection(null, {mandatory:{valid_and_supported_1:1}});");
-shouldNotThrow("new webkitRTCPeerConnection(null, {mandatory:{valid_and_supported_1:1, valid_and_supported_2:1}});");
-shouldNotThrow("new webkitRTCPeerConnection(null, {optional:[{valid_and_supported_1:0}]});");
-shouldNotThrow("new webkitRTCPeerConnection(null, {optional:[{valid_and_supported_1:0},{valid_and_supported_2:0}]});");
-shouldNotThrow("new webkitRTCPeerConnection(null, {optional:[{valid_but_unsupported_1:0},{valid_but_unsupported_2:0}]});");
-shouldThrow("new webkitRTCPeerConnection(null, {mandatory:{valid_and_supported_1:66}});");
-shouldThrow("new webkitRTCPeerConnection(null, {mandatory:{invalid:1}});");
-shouldThrow("new webkitRTCPeerConnection(null, {mandatory:{valid_but_unsupported_1:1}});");
-shouldThrow("new webkitRTCPeerConnection(null, {mandatory:{valid_but_unsupported_1:1, valid_and_supported_1:1}});");
-shouldThrow("new webkitRTCPeerConnection(null, {optional:{valid_and_supported_1:0}});");
-shouldThrow("new webkitRTCPeerConnection(null, {optional:[{valid_and_supported_1:0,valid_and_supported_2:0}]});");
+shouldNotThrow("new RTCPeerConnection(null, {mandatory:{valid_and_supported_1:1}});");
+shouldNotThrow("new RTCPeerConnection(null, {mandatory:{valid_and_supported_1:1, valid_and_supported_2:1}});");
+shouldNotThrow("new RTCPeerConnection(null, {optional:[{valid_and_supported_1:0}]});");
+shouldNotThrow("new RTCPeerConnection(null, {optional:[{valid_and_supported_1:0},{valid_and_supported_2:0}]});");
+shouldNotThrow("new RTCPeerConnection(null, {optional:[{valid_but_unsupported_1:0},{valid_but_unsupported_2:0}]});");
+shouldThrow("new RTCPeerConnection(null, {mandatory:{valid_and_supported_1:66}});");
+shouldThrow("new RTCPeerConnection(null, {mandatory:{invalid:1}});");
+shouldThrow("new RTCPeerConnection(null, {mandatory:{valid_but_unsupported_1:1}});");
+shouldThrow("new RTCPeerConnection(null, {mandatory:{valid_but_unsupported_1:1, valid_and_supported_1:1}});");
+shouldThrow("new RTCPeerConnection(null, {optional:{valid_and_supported_1:0}});");
+shouldThrow("new RTCPeerConnection(null, {optional:[{valid_and_supported_1:0,valid_and_supported_2:0}]});");
 // Optional constraints are ignored even if they are invalid.
-shouldNotThrow("new webkitRTCPeerConnection(null, {optional:[{invalid:0}]});");
-shouldThrow("new webkitRTCPeerConnection(null, {valid_and_supported_1:1});");
-shouldThrow("new webkitRTCPeerConnection(null, {valid_but_unsupported_1:1});");
-shouldThrow("new webkitRTCPeerConnection(null, {valid_and_supported_2:1, mandatory:{valid_and_supported_1:1}});");
+shouldNotThrow("new RTCPeerConnection(null, {optional:[{invalid:0}]});");
+shouldThrow("new RTCPeerConnection(null, {valid_and_supported_1:1});");
+shouldThrow("new RTCPeerConnection(null, {valid_but_unsupported_1:1});");
+shouldThrow("new RTCPeerConnection(null, {valid_and_supported_2:1, mandatory:{valid_and_supported_1:1}});");
 
 // Construct with certificates.
-shouldThrow("new webkitRTCPeerConnection({iceServers:[], certificates:null});");
-shouldNotThrow("new webkitRTCPeerConnection({iceServers:[], certificates:undefined});");
-shouldNotThrow("new webkitRTCPeerConnection({iceServers:[], certificates:[]});");
-shouldThrow("new webkitRTCPeerConnection({iceServers:[], certificates:[null]});");
-shouldThrow("new webkitRTCPeerConnection({iceServers:[], certificates:[1337]});");
+shouldThrow("new RTCPeerConnection({iceServers:[], certificates:null});");
+shouldNotThrow("new RTCPeerConnection({iceServers:[], certificates:undefined});");
+shouldNotThrow("new RTCPeerConnection({iceServers:[], certificates:[]});");
+shouldThrow("new RTCPeerConnection({iceServers:[], certificates:[null]});");
+shouldThrow("new RTCPeerConnection({iceServers:[], certificates:[1337]});");
 // Global certificate variables so that the "should..." methods can evaluate them.
 var certRSA = null;
 var certECDSA = null;
@@ -72,10 +74,10 @@
 
 function testCertificates1RSA()
 {
-    webkitRTCPeerConnection.generateCertificate({ name: "RSASSA-PKCS1-v1_5", modulusLength: 2048, publicExponent: new Uint8Array([1, 0, 1]), hash: "SHA-256" })
+    RTCPeerConnection.generateCertificate({ name: "RSASSA-PKCS1-v1_5", modulusLength: 2048, publicExponent: new Uint8Array([1, 0, 1]), hash: "SHA-256" })
         .then(function(certificate) {
                   certRSA = certificate;
-                  shouldNotThrow('new webkitRTCPeerConnection({iceServers:[], certificates:[certRSA]}, null);');
+                  shouldNotThrow('new RTCPeerConnection({iceServers:[], certificates:[certRSA]}, null);');
                   testCertificates2ECDSA();
               },
               function() {
@@ -85,10 +87,10 @@
 }
 function testCertificates2ECDSA()
 {
-    webkitRTCPeerConnection.generateCertificate({ name: "ECDSA", namedCurve: "P-256" })
+    RTCPeerConnection.generateCertificate({ name: "ECDSA", namedCurve: "P-256" })
         .then(function(certificate) {
                   certECDSA = certificate;
-                  shouldNotThrow('new webkitRTCPeerConnection({iceServers:[], certificates:[certECDSA]}, null);');
+                  shouldNotThrow('new RTCPeerConnection({iceServers:[], certificates:[certECDSA]}, null);');
                   testCertificates3Expired();
               },
               function() {
@@ -98,11 +100,11 @@
 }
 function testCertificates3Expired()
 {
-    webkitRTCPeerConnection.generateCertificate({ name: "ECDSA", namedCurve: "P-256", expires:0 })
+    RTCPeerConnection.generateCertificate({ name: "ECDSA", namedCurve: "P-256", expires:0 })
         .then(function(certificate) {
                   certExpired = certificate;
                   shouldBeTrue('certExpired.expires <= new Date().getTime()');
-                  shouldThrow('new webkitRTCPeerConnection({iceServers:[], certificates:[certExpired]}, null);');
+                  shouldThrow('new RTCPeerConnection({iceServers:[], certificates:[certExpired]}, null);');
                   finishJSTest();
               },
               function() {