Remove GICE.

talk/app/webrtc/peerconnectionendtoend_unittest.cc

Index: talk/app/webrtc/peerconnectionendtoend_unittest.cc
diff --git a/talk/app/webrtc/peerconnectionendtoend_unittest.cc b/talk/app/webrtc/peerconnectionendtoend_unittest.cc
index 7da7cc81398e02ac7c0bb60ee2155333ba98451a..3d70767c97d8fb50e219d4b082eae5205f22d28c 100644
--- a/talk/app/webrtc/peerconnectionendtoend_unittest.cc
+++ b/talk/app/webrtc/peerconnectionendtoend_unittest.cc
@@ -48,8 +48,6 @@ using webrtc::PeerConnectionInterface;
 
 namespace {
 
-const char kExternalGiceUfrag[] = "1234567890123456";
-const char kExternalGicePwd[] = "123456789012345678901234";
 const size_t kMaxWait = 10000;
 
 void RemoveLinesFromSdp(const std::string& line_start,
@@ -98,24 +96,6 @@ void UseExternalSdes(std::string* sdp) {
   InjectAfter("a=mid:data\r\n", kDataSdes, sdp);
 }
 
-void UseGice(std::string* sdp) {
-  InjectAfter("t=0 0\r\n", "a=ice-options:google-ice\r\n", sdp);
-
-  std::string ufragline = "a=ice-ufrag:";
-  std::string pwdline = "a=ice-pwd:";
-  RemoveLinesFromSdp(ufragline, sdp);
-  RemoveLinesFromSdp(pwdline, sdp);
-  ufragline.append(kExternalGiceUfrag);
-  ufragline.append("\r\n");
-  pwdline.append(kExternalGicePwd);
-  pwdline.append("\r\n");
-  const std::string ufrag_pwd = ufragline + pwdline;
-
-  InjectAfter("a=mid:audio\r\n", ufrag_pwd, sdp);
-  InjectAfter("a=mid:video\r\n", ufrag_pwd, sdp);
-  InjectAfter("a=mid:data\r\n", ufrag_pwd, sdp);
-}
-
 void RemoveBundle(std::string* sdp) {
   RemoveLinesFromSdp("a=group:BUNDLE", sdp);
 }
@@ -179,37 +159,6 @@ class PeerConnectionEndToEndTest
     callee_->WaitForConnection();
   }
 
-  void SetupLegacySdpConverter() {
-    caller_->SignalOnSdpCreated.connect(
-      this, &PeerConnectionEndToEndTest::ConvertToLegacySdp);
-    callee_->SignalOnSdpCreated.connect(
-      this, &PeerConnectionEndToEndTest::ConvertToLegacySdp);
-  }
-
-  void ConvertToLegacySdp(std::string* sdp) {
-    UseExternalSdes(sdp);
-    UseGice(sdp);
-    RemoveBundle(sdp);
-    LOG(LS_INFO) << "ConvertToLegacySdp: " << *sdp;
-  }
-
-  void SetupGiceConverter() {
-    caller_->SignalOnIceCandidateCreated.connect(
-      this, &PeerConnectionEndToEndTest::AddGiceCredsToCandidate);
-    callee_->SignalOnIceCandidateCreated.connect(
-      this, &PeerConnectionEndToEndTest::AddGiceCredsToCandidate);
-  }
-
-  void AddGiceCredsToCandidate(std::string* sdp) {
-    std::string gice_creds = " username ";
-    gice_creds.append(kExternalGiceUfrag);
-    gice_creds.append(" password ");
-    gice_creds.append(kExternalGicePwd);
-    gice_creds.append("\r\n");
-    Replace("\r\n", gice_creds, sdp);
-    LOG(LS_INFO) << "AddGiceCredsToCandidate: " << *sdp;
-  }
-
   void OnCallerAddedDataChanel(DataChannelInterface* dc) {
     caller_signaled_data_channels_.push_back(dc);
   }
@@ -285,19 +234,6 @@ TEST_F(PeerConnectionEndToEndTest, MAYBE_Call) {
   WaitForCallEstablished();
 }
 
-// Disabled per b/14899892
-TEST_F(PeerConnectionEndToEndTest, DISABLED_CallWithLegacySdp) {

[juberti1, 2015/07/31 01:13:59]

I think we need to retain this test, just w/o GICE. SDES still needs testing...
and perhaps non-BUNDLE

[pthatcher1, 2015/07/31 04:25:36]

Done.

-  FakeConstraints pc_constraints;
-  pc_constraints.AddMandatory(MediaConstraintsInterface::kEnableDtlsSrtp,
-                              false);
-  CreatePcs(&pc_constraints);
-  SetupLegacySdpConverter();
-  SetupGiceConverter();
-  GetAndAddUserMedia();
-  Negotiate();
-  WaitForCallEstablished();
-}
-
 // Verifies that a DataChannel created before the negotiation can transition to
 // "OPEN" and transfer data.
 TEST_F(PeerConnectionEndToEndTest, CreateDataChannelBeforeNegotiate) {