Pass the sctp command-line flag to Libjingle as an internal-only constraint.

content/renderer/media/rtc_peer_connection_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/rtc_peer_connection_handler.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
+#include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
+#include "content/public/common/content_switches.h"
 #include "content/renderer/media/media_stream_dependency_factory.h"
 #include "content/renderer/media/peer_connection_tracker.h"
 #include "content/renderer/media/remote_media_stream_impl.h"
 #include "content/renderer/media/rtc_data_channel_handler.h"
 #include "content/renderer/media/rtc_dtmf_sender_handler.h"
 #include "content/renderer/media/rtc_media_constraints.h"
 #include "content/renderer/render_thread_impl.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaConstraints.h"
 // TODO(hta): Move the following include to WebRTCStatsRequest.h file.
 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamSource.h"
@@ skipping 306 matching lines @@
 
 void RTCPeerConnectionHandler::associateWithFrame(WebKit::WebFrame* frame) {
   DCHECK(frame);
   frame_ = frame;
 }
 
 bool RTCPeerConnectionHandler::initialize(
     const WebKit::WebRTCConfiguration& server_configuration,
     const WebKit::WebMediaConstraints& options) {
   DCHECK(frame_);
+  static bool sctp_data_channel_enabled =

[tommi (sloooow) - chröme, 2013/05/21 08:03:24]

nit: no need to cache this in a static. initialize is rarely called and we
usually don't cache HasSwitch() results.

[jiayl, 2013/05/21 16:57:15]

Done.

+      CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableSCTPDataChannels);
 
   peer_connection_tracker_ =
       RenderThreadImpl::current()->peer_connection_tracker();
 
   webrtc::PeerConnectionInterface::IceServers servers;
   GetNativeIceServers(server_configuration, &servers);
 
   RTCMediaConstraints constraints(options);
+
+  if (sctp_data_channel_enabled) {
+    // TODO(jiayl): replace the hard coded string with
+    // webrtc::MediaConstraintsInterface::kEnbaleSctpDataChannels when

[tommi (sloooow) - chröme, 2013/05/21 08:03:24]

s/kEnbale/kEnable

[jiayl, 2013/05/21 16:57:15]

Done.

+    // the Libjingle change is rolled.

[tommi (sloooow) - chröme, 2013/05/21 08:03:24]

when will the libjingle change be rolled?  Could we perhaps just roll it before
we land this cl?

[jiayl, 2013/05/21 16:57:15]

The libjingle CL adding these strings depends on another libjingle CL that is
not approved yet. They should be committed and rolled by end of this week. I
submitted this CL in parallel per discussion with Justin, in order to minimize
the delay and leave enough baking time so that we can remove the flag by M29
cut.
On 2013/05/21 08:03:24, tommi wrote:

+    constraints.AddOptional("internalSctpDataChannels", "true");
+  }
+
   native_peer_connection_ =
       dependency_factory_->CreatePeerConnection(
           servers, &constraints, frame_, this);
   if (!native_peer_connection_) {
     LOG(ERROR) << "Failed to initialize native PeerConnection.";
     return false;
   }
   if (peer_connection_tracker_)
     peer_connection_tracker_->RegisterPeerConnection(
         this, servers, constraints, frame_);
@@ skipping 390 matching lines @@
   webrtc::SessionDescriptionInterface* native_desc =
       dependency_factory_->CreateSessionDescription(type, sdp, error);
 
   LOG_IF(ERROR, !native_desc) << "Failed to create native session description."
                               << " Type: " << type << " SDP: " << sdp;
 
   return native_desc;
 }
 
 }  // namespace content