commit e239779a8bdfd1685a833eb73f4f937e30edbed7
author kthelgason <kthelgason@webrtc.org> Tue Nov 08 16:19:48 2016
committer Commit bot <commit-bot@chromium.org> Tue Nov 08 16:19:54 2016
tree 08b8ed0a481cc5941d72b34a56da4f46804c161c
parent 95611837087e57f59ece87f02b9479e58c6904e8

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

diff --git a/webrtc/api/peerconnection_unittest.cc b/webrtc/api/peerconnection_unittest.cc
index 3cfffe4..18718c3 100644
--- a/webrtc/api/peerconnection_unittest.cc
+++ b/webrtc/api/peerconnection_unittest.cc
@@ -1827,11 +1827,7 @@
   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;