Revert "Reland "Remove GICE (gone forever!) and PORTALLOCATOR_ENABLE_SHARED_UFRAG (enabled forever)…

talk/app/webrtc/webrtcsdp_unittest.cc

Index: talk/app/webrtc/webrtcsdp_unittest.cc
diff --git a/talk/app/webrtc/webrtcsdp_unittest.cc b/talk/app/webrtc/webrtcsdp_unittest.cc
index a534c23920748138cb98d5eb03c3da47c0b3fb99..869c3ecabdba9101b6cfe982db0f1c5680824585 100644
--- a/talk/app/webrtc/webrtcsdp_unittest.cc
+++ b/talk/app/webrtc/webrtcsdp_unittest.cc
@@ -55,6 +55,7 @@ using cricket::ICE_CANDIDATE_COMPONENT_RTP;
 using cricket::kFecSsrcGroupSemantics;
 using cricket::LOCAL_PORT_TYPE;
 using cricket::NS_JINGLE_DRAFT_SCTP;
+using cricket::NS_JINGLE_ICE_UDP;
 using cricket::NS_JINGLE_RTP;
 using cricket::RtpHeaderExtension;
 using cricket::RELAY_PORT_TYPE;
@@ -579,11 +580,13 @@ class WebRtcSdpTest : public testing::Test {
     // TransportInfo
     EXPECT_TRUE(desc_.AddTransportInfo(
         TransportInfo(kAudioContentName,
-                      TransportDescription(kCandidateUfragVoice,
+                      TransportDescription(NS_JINGLE_ICE_UDP,
+                                           kCandidateUfragVoice,
                                            kCandidatePwdVoice))));
     EXPECT_TRUE(desc_.AddTransportInfo(
         TransportInfo(kVideoContentName,
-                      TransportDescription(kCandidateUfragVideo,
+                      TransportDescription(NS_JINGLE_ICE_UDP,
+                                           kCandidateUfragVideo,
                                            kCandidatePwdVideo))));
 
     // v4 host
@@ -860,6 +863,8 @@ class WebRtcSdpTest : public testing::Test {
       const cricket::TransportInfo transport1 = transports1.at(i);
       const cricket::TransportInfo transport2 = transports2.at(i);
       EXPECT_EQ(transport1.content_name, transport2.content_name);
+      EXPECT_EQ(transport1.description.transport_type,
+                transport2.description.transport_type);
       EXPECT_EQ(transport1.description.ice_ufrag,
                 transport2.description.ice_ufrag);
       EXPECT_EQ(transport1.description.ice_pwd,
@@ -940,7 +945,8 @@ class WebRtcSdpTest : public testing::Test {
       ASSERT(false);
     }
     TransportInfo transport_info(
-        content_name, TransportDescription(ufrag, pwd));
+        content_name, TransportDescription(NS_JINGLE_ICE_UDP,
+                                           ufrag, pwd));
     SessionDescription* desc =
         const_cast<SessionDescription*>(jdesc->description());
     desc->RemoveTransportInfoByName(content_name);
@@ -977,7 +983,8 @@ class WebRtcSdpTest : public testing::Test {
                                           sizeof(kIdentityDigest));
     EXPECT_TRUE(desc_.AddTransportInfo(
         TransportInfo(kAudioContentName,
-                      TransportDescription(std::vector<std::string>(),
+                      TransportDescription(NS_JINGLE_ICE_UDP,
+                                           std::vector<std::string>(),
                                            kCandidateUfragVoice,
                                            kCandidatePwdVoice,
                                            cricket::ICEMODE_FULL,
@@ -985,7 +992,8 @@ class WebRtcSdpTest : public testing::Test {
                                            &fingerprint, Candidates()))));
     EXPECT_TRUE(desc_.AddTransportInfo(
         TransportInfo(kVideoContentName,
-                      TransportDescription(std::vector<std::string>(),
+                      TransportDescription(NS_JINGLE_ICE_UDP,
+                                           std::vector<std::string>(),
                                            kCandidateUfragVideo,
                                            kCandidatePwdVideo,
                                            cricket::ICEMODE_FULL,
@@ -1065,7 +1073,8 @@ class WebRtcSdpTest : public testing::Test {
     desc_.AddContent(kDataContentName, NS_JINGLE_DRAFT_SCTP, data.release());
     EXPECT_TRUE(desc_.AddTransportInfo(
            TransportInfo(kDataContentName,
-                         TransportDescription(kCandidateUfragData,
+                         TransportDescription(NS_JINGLE_ICE_UDP,
+                                              kCandidateUfragData,
                                               kCandidatePwdData))));
   }
 
@@ -1088,7 +1097,8 @@ class WebRtcSdpTest : public testing::Test {
     desc_.AddContent(kDataContentName, NS_JINGLE_RTP, data.release());
     EXPECT_TRUE(desc_.AddTransportInfo(
            TransportInfo(kDataContentName,
-                         TransportDescription(kCandidateUfragData,
+                         TransportDescription(NS_JINGLE_ICE_UDP,
+                                              kCandidateUfragData,
                                               kCandidatePwdData))));
   }