ECDSA default certificate in WebRTC: Remove experiment flag kWebRtcEcdsaDefault.

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.h>
 
 #include <string>
 #include <utility>
@@ skipping 704 matching lines @@
       constraints, &blink::WebMediaTrackConstraintSet::voiceActivityDetection,
       &output->voice_activity_detection);
   GetConstraintValueAsBoolean(constraints,
                               &blink::WebMediaTrackConstraintSet::iceRestart,
                               &output->ice_restart);
 }
 
 base::LazyInstance<std::set<RTCPeerConnectionHandler*> >::Leaky
     g_peer_connection_handlers = LAZY_INSTANCE_INITIALIZER;
 
-void OverrideDefaultCertificateBasedOnExperiment(
+void OverrideDefaultCertificate(
     webrtc::PeerConnectionInterface::RTCConfiguration* config) {
-  if (base::FeatureList::IsEnabled(features::kWebRtcEcdsaDefault)) {
-    if (config->certificates.empty()) {
-      rtc::scoped_refptr<rtc::RTCCertificate> certificate =
-          PeerConnectionDependencyFactory::GenerateDefaultCertificate();
-      config->certificates.push_back(certificate);
-    }
+  if (rtc::KT_DEFAULT != rtc::KT_ECDSA && config->certificates.empty()) {

[tommi (sloooow) - chröme, 2016/05/24 20:58:11]

do we still need this or do you plan on removing this after a webrtc roll?

[hbos_chromium, 2016/05/25 07:58:34]

Since this CL removes a static_assert about KT_DEFAULT == KT_RSA it has to land
before the webrtc change that makes KT_DEFAULT == KT_ECDSA. After this has
landed and webrtc has rolled I'll remove OverrideDefaultCertificate.

+    rtc::scoped_refptr<rtc::RTCCertificate> certificate =
+        PeerConnectionDependencyFactory::GenerateDefaultCertificate();
+    config->certificates.push_back(certificate);
   }
-  // If the ECDSA experiment is not running we rely on the default being RSA for
-  // the control group. See bug related to this: crbug.com/611698.
-  static_assert(rtc::KT_DEFAULT == rtc::KT_RSA, "This code relies on "
-      "KT_DEFAULT == KT_RSA for RSA certificate generation.");
 }
 
 }  // namespace
 
 // Implementation of LocalRTCStatsRequest.
 LocalRTCStatsRequest::LocalRTCStatsRequest(blink::WebRTCStatsRequest impl)
     : impl_(impl) {
 }
 
 LocalRTCStatsRequest::LocalRTCStatsRequest() {}
@@ skipping 212 matching lines @@
     const blink::WebRTCConfiguration& server_configuration,
     const blink::WebMediaConstraints& options) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(frame_);
 
   peer_connection_tracker_ =
       RenderThreadImpl::current()->peer_connection_tracker()->AsWeakPtr();
 
   webrtc::PeerConnectionInterface::RTCConfiguration config;
   GetNativeRtcConfiguration(server_configuration, &config);
-  OverrideDefaultCertificateBasedOnExperiment(&config);
+  OverrideDefaultCertificate(&config);
 
   // Choose between RTC smoothness algorithm and prerenderer smoothing.
   // Prerenderer smoothing is turned on if RTC smoothness is turned off.
   config.set_prerenderer_smoothing(
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableRTCSmoothnessAlgorithm));
 
   // Copy all the relevant constraints into |config|.
   CopyConstraintsIntoRtcConfiguration(options, &config);
 
@@ skipping 16 matching lines @@
   return true;
 }
 
 bool RTCPeerConnectionHandler::InitializeForTest(
     const blink::WebRTCConfiguration& server_configuration,
     const blink::WebMediaConstraints& options,
     const base::WeakPtr<PeerConnectionTracker>& peer_connection_tracker) {
   DCHECK(thread_checker_.CalledOnValidThread());
   webrtc::PeerConnectionInterface::RTCConfiguration config;
   GetNativeRtcConfiguration(server_configuration, &config);
-  OverrideDefaultCertificateBasedOnExperiment(&config);
+  OverrideDefaultCertificate(&config);
 
   peer_connection_observer_ = new Observer(weak_factory_.GetWeakPtr());
   CopyConstraintsIntoRtcConfiguration(options, &config);
 
   native_peer_connection_ = dependency_factory_->CreatePeerConnection(
       config, nullptr, peer_connection_observer_.get());
   if (!native_peer_connection_.get()) {
     LOG(ERROR) << "Failed to initialize native PeerConnection.";
     return false;
   }
@@ skipping 781 matching lines @@
 }
 
 void RTCPeerConnectionHandler::ResetUMAStats() {
   DCHECK(thread_checker_.CalledOnValidThread());
   num_local_candidates_ipv6_ = 0;
   num_local_candidates_ipv4_ = 0;
   ice_connection_checking_start_ = base::TimeTicks();
   memset(ice_state_seen_, 0, sizeof(ice_state_seen_));
 }
 }  // namespace content