Adding support for Unified Plan offer/answer negotiation.

webrtc/api/peerconnection_unittest.cc

 /*
  *  Copyright 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 699 matching lines @@
     EXPECT_TRUE_WAIT(observer->completed(), kMaxWaitMs);
     std::vector<std::string> tones;
     tones.push_back("1");
     tones.push_back("a");
     tones.push_back("");
     observer->Verify(tones);
 
     dtmf_sender->UnregisterObserver();
   }
 
-  // Verifies that the SessionDescription have rejected the appropriate media
-  // content.
-  void VerifyRejectedMediaInSessionDescription() {
+  // Verifies that the direction attribute is set correctly in the local
+  // description
+  // according to the options set.
+  void VerifyRecvDirectionInSessionDescription() {
     ASSERT_TRUE(peer_connection_->remote_description() != nullptr);
     ASSERT_TRUE(peer_connection_->local_description() != nullptr);
     const cricket::SessionDescription* remote_desc =
         peer_connection_->remote_description()->description();
     const cricket::SessionDescription* local_desc =
         peer_connection_->local_description()->description();
 
     const ContentInfo* remote_audio_content = GetFirstAudioContent(remote_desc);
     if (remote_audio_content) {
       const ContentInfo* audio_content =
           GetFirstAudioContent(local_desc);
-      EXPECT_EQ(can_receive_audio(), !audio_content->rejected);
+      EXPECT_EQ(can_receive_audio(),
+                cricket::RtpTransceiverDirection::FromMediaContentDirection(
+                    static_cast<const MediaContentDescription*>(
+                        audio_content->description)
+                        ->direction())
+                    .recv);
     }
 
     const ContentInfo* remote_video_content = GetFirstVideoContent(remote_desc);
     if (remote_video_content) {
       const ContentInfo* video_content =
           GetFirstVideoContent(local_desc);
-      EXPECT_EQ(can_receive_video(), !video_content->rejected);
+      EXPECT_EQ(can_receive_video(),
+                cricket::RtpTransceiverDirection::FromMediaContentDirection(
+                    static_cast<const MediaContentDescription*>(
+                        video_content->description)
+                        ->direction())
+                    .recv);
     }
   }
 
   void VerifyLocalIceUfragAndPassword() {
     ASSERT_TRUE(peer_connection_->local_description() != nullptr);
     const cricket::SessionDescription* desc =
         peer_connection_->local_description()->description();
     const cricket::ContentInfos& contents = desc->contents();
 
     for (size_t index = 0; index < contents.size(); ++index) {
@@ skipping 565 matching lines @@
     // Verify aspect ratio of the local preview.
     EXPECT_EQ(expected_aspect_ratio,
               initializing_client_local_rendered_aspect_ratio);
 
     // Verify rotation.
     EXPECT_EQ(rotation, receiving_client()->rendered_rotation());
     EXPECT_EQ(rotation, initializing_client()->rendered_rotation());
   }
 
   void VerifySessionDescriptions() {
-    initiating_client_->VerifyRejectedMediaInSessionDescription();
-    receiving_client_->VerifyRejectedMediaInSessionDescription();
+    initiating_client_->VerifyRecvDirectionInSessionDescription();
+    receiving_client_->VerifyRecvDirectionInSessionDescription();
     initiating_client_->VerifyLocalIceUfragAndPassword();
     receiving_client_->VerifyLocalIceUfragAndPassword();
   }
 
   ~P2PTestConductor() {
     if (initiating_client_) {
       initiating_client_->set_signaling_message_receiver(nullptr);
     }
     if (receiving_client_) {
       receiving_client_->set_signaling_message_receiver(nullptr);
@@ skipping 1462 matching lines @@
   server.urls.push_back("turn:hostname2");
   servers.push_back(server);
   EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_));
   EXPECT_EQ(2U, turn_servers_.size());
   EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority);
 }
 
 #endif // if !defined(THREAD_SANITIZER)
 
 }  // namespace