Removing "candidates" attribute from TransportDescription.

talk/app/webrtc/webrtcsdp_unittest.cc

 /*
  * libjingle
  * Copyright 2011 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 880 matching lines @@
                 transport2.description.ice_pwd);
       if (transport1.description.identity_fingerprint) {
         EXPECT_EQ(*transport1.description.identity_fingerprint,
                   *transport2.description.identity_fingerprint);
       } else {
         EXPECT_EQ(transport1.description.identity_fingerprint.get(),
                   transport2.description.identity_fingerprint.get());
       }
       EXPECT_EQ(transport1.description.transport_options,
                 transport2.description.transport_options);
-      EXPECT_TRUE(CompareCandidates(transport1.description.candidates,
-                                    transport2.description.candidates));
     }
 
     // global attributes
     EXPECT_EQ(desc1.msid_supported(), desc2.msid_supported());
   }
 
-  bool CompareCandidates(const Candidates& cs1, const Candidates& cs2) {
-    EXPECT_EQ(cs1.size(), cs2.size());
-    if (cs1.size() != cs2.size())
-      return false;
-    for (size_t i = 0; i< cs1.size(); ++i) {
-      const Candidate c1 = cs1.at(i);
-      const Candidate c2 = cs2.at(i);
-      EXPECT_TRUE(c1.IsEquivalent(c2));
-    }
-    return true;
-  }
-
   bool CompareSessionDescription(
       const JsepSessionDescription& desc1,
       const JsepSessionDescription& desc2) {
     EXPECT_EQ(desc1.session_id(), desc2.session_id());
     EXPECT_EQ(desc1.session_version(), desc2.session_version());
     CompareSessionDescription(*desc1.description(), *desc2.description());
     if (desc1.number_of_mediasections() != desc2.number_of_mediasections())
       return false;
     for (size_t i = 0; i < desc1.number_of_mediasections(); ++i) {
       const IceCandidateCollection* cc1 = desc1.candidates(i);
@@ skipping 77 matching lines @@
     transport_info.description.ice_pwd = ice_pwd;
     desc_.AddTransportInfo(transport_info);
   }
 
   void AddFingerprint() {
     desc_.RemoveTransportInfoByName(kAudioContentName);
     desc_.RemoveTransportInfoByName(kVideoContentName);
     rtc::SSLFingerprint fingerprint(rtc::DIGEST_SHA_1,
                                           kIdentityDigest,
                                           sizeof(kIdentityDigest));
-    EXPECT_TRUE(desc_.AddTransportInfo(
-        TransportInfo(kAudioContentName,
-                      TransportDescription(std::vector<std::string>(),
-                                           kCandidateUfragVoice,
-                                           kCandidatePwdVoice,
-                                           cricket::ICEMODE_FULL,
-                                           cricket::CONNECTIONROLE_NONE,
-                                           &fingerprint, Candidates()))));
-    EXPECT_TRUE(desc_.AddTransportInfo(
-        TransportInfo(kVideoContentName,
-                      TransportDescription(std::vector<std::string>(),
-                                           kCandidateUfragVideo,
-                                           kCandidatePwdVideo,
-                                           cricket::ICEMODE_FULL,
-                                           cricket::CONNECTIONROLE_NONE,
-                                           &fingerprint, Candidates()))));
+    EXPECT_TRUE(desc_.AddTransportInfo(TransportInfo(
+        kAudioContentName,
+        TransportDescription(std::vector<std::string>(), kCandidateUfragVoice,
+                             kCandidatePwdVoice, cricket::ICEMODE_FULL,
+                             cricket::CONNECTIONROLE_NONE, &fingerprint))));
+    EXPECT_TRUE(desc_.AddTransportInfo(TransportInfo(
+        kVideoContentName,
+        TransportDescription(std::vector<std::string>(), kCandidateUfragVideo,
+                             kCandidatePwdVideo, cricket::ICEMODE_FULL,
+                             cricket::CONNECTIONROLE_NONE, &fingerprint))));
   }
 
   void AddExtmap() {
     audio_desc_ = static_cast<AudioContentDescription*>(
         audio_desc_->Copy());
     video_desc_ = static_cast<VideoContentDescription*>(
         video_desc_->Copy());
     audio_desc_->AddRtpHeaderExtension(
         RtpHeaderExtension(kExtmapUri, kExtmapId));
     video_desc_->AddRtpHeaderExtension(
@@ skipping 1708 matching lines @@
       const cricket::MediaContentDescription* mdesc =
           static_cast<const cricket::MediaContentDescription*>(
               desc->contents()[i].description);
       EXPECT_EQ(media_types[media_content_in_sdp[i]], mdesc->type());
     }
 
     std::string serialized_sdp = webrtc::SdpSerialize(jdesc);
     EXPECT_EQ(sdp_string, serialized_sdp);
   }
 }