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

talk/app/webrtc/jsepsessiondescription_unittest.cc

 /*
  * libjingle
  * Copyright 2012 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 59 matching lines @@
                    audio.release());
 
   video->AddCodec(cricket::VideoCodec(120, "VP8", 640, 480, 30, 0));
   desc->AddContent(cricket::CN_VIDEO, cricket::NS_JINGLE_RTP,
                    video.release());
 
   EXPECT_TRUE(desc->AddTransportInfo(
       cricket::TransportInfo(
                              cricket::CN_AUDIO,
                              cricket::TransportDescription(
-                                 cricket::NS_GINGLE_P2P,
                                  std::vector<std::string>(),
                                  kCandidateUfragVoice, kCandidatePwdVoice,
                                  cricket::ICEMODE_FULL,
                                  cricket::CONNECTIONROLE_NONE,
                                  NULL, cricket::Candidates()))));
   EXPECT_TRUE(desc->AddTransportInfo(
       cricket::TransportInfo(cricket::CN_VIDEO,
                              cricket::TransportDescription(
-                                 cricket::NS_GINGLE_P2P,
                                  std::vector<std::string>(),
                                  kCandidateUfragVideo, kCandidatePwdVideo,
                                  cricket::ICEMODE_FULL,
                                  cricket::CONNECTIONROLE_NONE,
                                  NULL, cricket::Candidates()))));
   return desc;
 }
 
 class JsepSessionDescriptionTest : public testing::Test {
  protected:
@@ skipping 138 matching lines @@
   EXPECT_TRUE(jsep_desc_->AddCandidate(&jsep_candidate));
   std::string sdp_with_candidate = Serialize(jsep_desc_.get());
   EXPECT_NE(sdp, sdp_with_candidate);
 
   scoped_ptr<SessionDescriptionInterface> parsed_jsep_desc(
       DeSerialize(sdp_with_candidate));
   std::string parsed_sdp_with_candidate = Serialize(parsed_jsep_desc.get());
 
   EXPECT_EQ(sdp_with_candidate, parsed_sdp_with_candidate);
 }