Revert "Fixes two issues in how we handle OfferToReceiveX for CreateOffer:" because it broke content_browsertests on Android.

This reverts commit r7068.

TBR=kjellander@webrtc.org
BUG=2108

Review URL: https://webrtc-codereview.appspot.com/23539004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7108 4adac7df-926f-26a2-2b94-8c16560cd09d

1 files changed, 5 insertions, 6 deletions

diff --git a/talk/session/media/mediasession.cc b/talk/session/media/mediasession.cc
index 92dd257b65..45e321f2a3 100644
--- a/talk/session/media/mediasession.cc
+++ b/talk/session/media/mediasession.cc
@@ -1170,28 +1170,28 @@ SessionDescription* MediaSessionDescriptionFactory::CreateOffer(
   if (current_description) {
     ContentInfos::const_iterator it = current_description->contents().begin();
     for (; it != current_description->contents().end(); ++it) {
-      if (IsMediaContentOfType(&*it, MEDIA_TYPE_AUDIO)) {
+      if (IsMediaContentOfType(&*it, MEDIA_TYPE_AUDIO) && options.has_audio) {
         if (!AddAudioContentForOffer(options, current_description,
                                      audio_rtp_extensions, audio_codecs,
                                      &current_streams, offer.get())) {
           return NULL;
         }
         audio_added = true;
-      } else if (IsMediaContentOfType(&*it, MEDIA_TYPE_VIDEO)) {
+      } else if (IsMediaContentOfType(&*it, MEDIA_TYPE_VIDEO) &&
+                 options.has_video) {
         if (!AddVideoContentForOffer(options, current_description,
                                      video_rtp_extensions, video_codecs,
                                      &current_streams, offer.get())) {
           return NULL;
         }
         video_added = true;
-      } else if (IsMediaContentOfType(&*it, MEDIA_TYPE_DATA)) {
+      } else if (IsMediaContentOfType(&*it, MEDIA_TYPE_DATA) &&
+                 options.has_data()) {
         if (!AddDataContentForOffer(options, current_description, &data_codecs,
                                     &current_streams, offer.get())) {
           return NULL;
         }
         data_added = true;
-      } else {
-        ASSERT(false);
       }
     }
   }
@@ -1459,7 +1459,6 @@ bool MediaSessionDescriptionFactory::AddAudioContentForOffer(
 
   bool secure_transport = (transport_desc_factory_->secure() != SEC_DISABLED);
   SetMediaProtocol(secure_transport, audio.get());
-
   desc->AddContent(CN_AUDIO, NS_JINGLE_RTP, audio.release());
   if (!AddTransportOffer(CN_AUDIO, options.transport_options,
                          current_description, desc)) {