From e239779a8bdfd1685a833eb73f4f937e30edbed7 Mon Sep 17 00:00:00 2001
From: kthelgason <kthelgason@webrtc.org>
Date: Tue, 8 Nov 2016 08:19:48 -0800
Subject: [PATCH] Reenable P2P test case and remove outdated TODO

BUG=None

Review-Url: https://codereview.webrtc.org/2485953002
Cr-Commit-Position: refs/heads/master@{#14981}
---
 webrtc/api/peerconnection_unittest.cc | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/webrtc/api/peerconnection_unittest.cc b/webrtc/api/peerconnection_unittest.cc
index 3cfffe4631..18718c31a6 100644
--- a/webrtc/api/peerconnection_unittest.cc
+++ b/webrtc/api/peerconnection_unittest.cc
@@ -1827,11 +1827,7 @@ TEST_F(P2PTestConductor, LocalP2PTestWithoutMsid) {
   LocalP2PTest();
 }
 
-// This test sets up a Jsep call between two parties and the initiating peer
-// sends two steams.
-// TODO(perkj): Disabled due to
-// https://code.google.com/p/webrtc/issues/detail?id=1454
-TEST_F(P2PTestConductor, DISABLED_LocalP2PTestTwoStreams) {
+TEST_F(P2PTestConductor, LocalP2PTestTwoStreams) {
   ASSERT_TRUE(CreateTestClients());
   // Set optional video constraint to max 320pixels to decrease CPU usage.
   FakeConstraints constraint;