Reland of Moving MediaStreamSignaling logic into PeerConnection.

talk/app/webrtc/webrtcsessiondescriptionfactory.h

Index: talk/app/webrtc/webrtcsessiondescriptionfactory.h
diff --git a/talk/app/webrtc/webrtcsessiondescriptionfactory.h b/talk/app/webrtc/webrtcsessiondescriptionfactory.h
index 95fab63a3da6afce58541be8e02dc344368a823e..91adc662c2566be33f60b358c2442de10dcbbd01 100644
--- a/talk/app/webrtc/webrtcsessiondescriptionfactory.h
+++ b/talk/app/webrtc/webrtcsessiondescriptionfactory.h
@@ -43,7 +43,6 @@ class TransportDescriptionFactory;
 namespace webrtc {
 class CreateSessionDescriptionObserver;
 class MediaConstraintsInterface;
-class MediaStreamSignaling;
 class SessionDescriptionInterface;
 class WebRtcSession;
 
@@ -92,32 +91,26 @@ class WebRtcSessionDescriptionFactory : public rtc::MessageHandler,
   // Construct with DTLS disabled.
   WebRtcSessionDescriptionFactory(rtc::Thread* signaling_thread,
                                   cricket::ChannelManager* channel_manager,
-                                  MediaStreamSignaling* mediastream_signaling,
                                   WebRtcSession* session,
-                                  const std::string& session_id,
-                                  cricket::DataChannelType dct);
+                                  const std::string& session_id);
 
   // Construct with DTLS enabled using the specified |dtls_identity_store| to
   // generate a certificate.
   WebRtcSessionDescriptionFactory(
       rtc::Thread* signaling_thread,
       cricket::ChannelManager* channel_manager,
-      MediaStreamSignaling* mediastream_signaling,
       rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
       WebRtcSession* session,
-      const std::string& session_id,
-      cricket::DataChannelType dct);
+      const std::string& session_id);
 
   // Construct with DTLS enabled using the specified (already generated)
   // |certificate|.
   WebRtcSessionDescriptionFactory(
       rtc::Thread* signaling_thread,
       cricket::ChannelManager* channel_manager,
-      MediaStreamSignaling* mediastream_signaling,
       const rtc::scoped_refptr<rtc::RTCCertificate>& certificate,
       WebRtcSession* session,
-      const std::string& session_id,
-      cricket::DataChannelType dct);
+      const std::string& session_id);
   virtual ~WebRtcSessionDescriptionFactory();
 
   static void CopyCandidatesFromSessionDescription(
@@ -126,10 +119,11 @@ class WebRtcSessionDescriptionFactory : public rtc::MessageHandler,
 
   void CreateOffer(
       CreateSessionDescriptionObserver* observer,
-      const PeerConnectionInterface::RTCOfferAnswerOptions& options);
-  void CreateAnswer(
-      CreateSessionDescriptionObserver* observer,
-      const MediaConstraintsInterface* constraints);
+      const PeerConnectionInterface::RTCOfferAnswerOptions& options,
+      const cricket::MediaSessionOptions& session_options);
+  void CreateAnswer(CreateSessionDescriptionObserver* observer,
+                    const MediaConstraintsInterface* constraints,
+                    const cricket::MediaSessionOptions& session_options);
 
   void SetSdesPolicy(cricket::SecurePolicy secure_policy);
   cricket::SecurePolicy SdesPolicy() const;
@@ -153,13 +147,11 @@ class WebRtcSessionDescriptionFactory : public rtc::MessageHandler,
   WebRtcSessionDescriptionFactory(
       rtc::Thread* signaling_thread,
       cricket::ChannelManager* channel_manager,
-      MediaStreamSignaling* mediastream_signaling,
       rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
       const rtc::scoped_refptr<WebRtcIdentityRequestObserver>&
           identity_request_observer,
       WebRtcSession* session,
       const std::string& session_id,
-      cricket::DataChannelType dct,
       bool dtls_enabled);
 
   // MessageHandler implementation.
@@ -183,7 +175,6 @@ class WebRtcSessionDescriptionFactory : public rtc::MessageHandler,
   std::queue<CreateSessionDescriptionRequest>
       create_session_description_requests_;
   rtc::Thread* const signaling_thread_;
-  MediaStreamSignaling* const mediastream_signaling_;
   cricket::TransportDescriptionFactory transport_desc_factory_;
   cricket::MediaSessionDescriptionFactory session_desc_factory_;
   uint64_t session_version_;
@@ -193,7 +184,6 @@ class WebRtcSessionDescriptionFactory : public rtc::MessageHandler,
   // TODO(jiayl): remove the dependency on session once bug 2264 is fixed.
   WebRtcSession* const session_;
   const std::string session_id_;
-  const cricket::DataChannelType data_channel_type_;
   CertificateRequestState certificate_request_state_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSessionDescriptionFactory);