Refactor the relationship between BaseChannel and MediaChannel so that we send over all the paramet…

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 760 matching lines @@
 
     // extmap
     ASSERT_EQ(cd1->rtp_header_extensions().size(),
               cd2->rtp_header_extensions().size());
     for (size_t i = 0; i< cd1->rtp_header_extensions().size(); ++i) {
       const RtpHeaderExtension ext1 = cd1->rtp_header_extensions().at(i);
       const RtpHeaderExtension ext2 = cd2->rtp_header_extensions().at(i);
       EXPECT_EQ(ext1.uri, ext2.uri);
       EXPECT_EQ(ext1.id, ext2.id);
     }
-
-    // buffered mode latency
-    EXPECT_EQ(cd1->buffered_mode_latency(), cd2->buffered_mode_latency());
   }
 
 
   void CompareSessionDescription(const SessionDescription& desc1,
                                  const SessionDescription& desc2) {
     // Compare content descriptions.
     if (desc1.contents().size() != desc2.contents().size()) {
       ADD_FAILURE();
       return;
     }
@@ skipping 920 matching lines @@
 
   std::string sdp_with_extmap = kSdpString;
   InjectAfter("a=mid:audio_content_name\r\n",
               kExtmap, &sdp_with_extmap);
   InjectAfter("a=mid:video_content_name\r\n",
               kExtmap, &sdp_with_extmap);
 
   EXPECT_EQ(sdp_with_extmap, message);
 }
 
-TEST_F(WebRtcSdpTest, SerializeSessionDescriptionWithBufferLatency) {
-  VideoContentDescription* vcd = static_cast<VideoContentDescription*>(
-      GetFirstVideoContent(&desc_)->description);
-  vcd->set_buffered_mode_latency(128);
-
-  ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(),
-                                jdesc_.session_id(),
-                                jdesc_.session_version()));
-  std::string message = webrtc::SdpSerialize(jdesc_);
-  std::string sdp_with_buffer_latency = kSdpFullString;
-  InjectAfter("a=rtpmap:120 VP8/90000\r\n",
-              "a=x-google-buffer-latency:128\r\n",
-              &sdp_with_buffer_latency);
-  EXPECT_EQ(sdp_with_buffer_latency, message);
-}
-
 TEST_F(WebRtcSdpTest, SerializeCandidates) {
   std::string message = webrtc::SdpSerializeCandidate(*jcandidate_);
   EXPECT_EQ(std::string(kRawCandidate), message);
 }
 
 // TODO(mallinath) : Enable this test once WebRTCSdp capable of parsing
 // RFC 6544.
 TEST_F(WebRtcSdpTest, SerializeTcpCandidates) {
   Candidate candidate(ICE_CANDIDATE_COMPONENT_RTP, "tcp",
                       rtc::SocketAddress("192.168.1.5", 9), kCandidatePriority,
@@ skipping 205 matching lines @@
       &sdp_with_ufrag_pwd);
   // Update the candidate ufrag and pwd to the expected ones.
   EXPECT_TRUE(UpdateCandidateUfragPwd(&jdesc_, 0,
       "media+level+iceufrag", "media+level+icepwd"));
   EXPECT_TRUE(UpdateCandidateUfragPwd(&jdesc_, 1,
       "session+level+iceufrag", "session+level+icepwd"));
   EXPECT_TRUE(SdpDeserialize(sdp_with_ufrag_pwd, &jdesc_with_ufrag_pwd));
   EXPECT_TRUE(CompareSessionDescription(jdesc_, jdesc_with_ufrag_pwd));
 }
 
-TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithBufferLatency) {
-  JsepSessionDescription jdesc_with_buffer_latency(kDummyString);
-  std::string sdp_with_buffer_latency = kSdpFullString;
-  InjectAfter("a=rtpmap:120 VP8/90000\r\n",
-              "a=x-google-buffer-latency:128\r\n",
-              &sdp_with_buffer_latency);
-
-  EXPECT_TRUE(
-      SdpDeserialize(sdp_with_buffer_latency, &jdesc_with_buffer_latency));
-  VideoContentDescription* vcd = static_cast<VideoContentDescription*>(
-      GetFirstVideoContent(&desc_)->description);
-  vcd->set_buffered_mode_latency(128);
-  ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(),
-                                jdesc_.session_id(),
-                                jdesc_.session_version()));
-  EXPECT_TRUE(CompareSessionDescription(jdesc_, jdesc_with_buffer_latency));
-}
-
 TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithRecvOnlyContent) {
   EXPECT_TRUE(TestDeserializeDirection(cricket::MD_RECVONLY));
 }
 
 TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithSendOnlyContent) {
   EXPECT_TRUE(TestDeserializeDirection(cricket::MD_SENDONLY));
 }
 
 TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithInactiveContent) {
   EXPECT_TRUE(TestDeserializeDirection(cricket::MD_INACTIVE));
@@ skipping 438 matching lines @@
                                  "b=AS:badvalue\r\n",
                                  "b=AS:badvalue");
   // rtcp-fb
   ExpectParseFailureWithNewLines("a=mid:video_content_name\r\n",
                                  "a=rtcp-fb:badvalue nack\r\n",
                                  "a=rtcp-fb:badvalue nack");
   // extmap
   ExpectParseFailureWithNewLines("a=mid:video_content_name\r\n",
                                  "a=extmap:badvalue http://example.com\r\n",
                                  "a=extmap:badvalue http://example.com");
-  // x-google-buffer-latency
-  ExpectParseFailureWithNewLines("a=mid:video_content_name\r\n",
-                                 "a=x-google-buffer-latency:badvalue\r\n",
-                                 "a=x-google-buffer-latency:badvalue");
 }
 
 TEST_F(WebRtcSdpTest, DeserializeSdpWithReorderedPltypes) {
   JsepSessionDescription jdesc_output(kDummyString);
 
   const char kSdpWithReorderedPlTypesString[] =
       "v=0\r\n"
       "o=- 18446744069414584320 18446462598732840960 IN IP4 127.0.0.1\r\n"
       "s=-\r\n"
       "t=0 0\r\n"
@@ skipping 260 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);
   }
 }