Making ECDSA the default certificate regardless of WEBRTC_CHROMIUM_BUILD.

webrtc/base/sslidentity.h

 /*
  *  Copyright 2004 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 99 matching lines @@
   static void DeleteCert(SSLCertificate* cert) { delete cert; }
 
   std::vector<SSLCertificate*> certs_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(SSLCertChain);
 };
 
 // KT_LAST is intended for vector declarations and loops over all key types;
 // it does not represent any key type in itself.
 // KT_DEFAULT is used as the default KeyType for KeyParams.
-enum KeyType {
-  KT_RSA, KT_ECDSA, KT_LAST,
-#if defined(WEBRTC_CHROMIUM_BUILD)
-  // TODO(hbos): Because of an experiment running in Chromium which relies on
-  // RSA being the default (for performance reasons) we have this #if. ECDSA
-  // launches in Chromium by flipping a flag which overrides the default. As
-  // soon as the experiment has ended and there is no risk of RSA being the
-  // default we should make KT_DEFAULT = KT_ECDSA unconditionally.
-  // crbug.com/611698
-  KT_DEFAULT = KT_RSA
-#else
-  KT_DEFAULT = KT_ECDSA
-#endif
-};
+enum KeyType { KT_RSA, KT_ECDSA, KT_LAST, KT_DEFAULT = KT_ECDSA };

[tommi, 2016/05/24 18:20:23]

did you run git cl format?

[hbos, 2016/05/24 18:43:11]

If I run it it does not change the code, so I guess it approves. I made it one
line because I remember it was one line before I did my #if change.

 
 static const int kRsaDefaultModSize = 1024;
 static const int kRsaDefaultExponent = 0x10001;  // = 2^16+1 = 65537
 static const int kRsaMinModSize = 1024;
 static const int kRsaMaxModSize = 8192;
 
 // Certificate default validity lifetime.
 static const int kDefaultCertificateLifetimeInSeconds =
     60 * 60 * 24 * 30;  // 30 days
 // Certificate validity window.
@@ skipping 113 matching lines @@
 // |s| is not 0-terminated; its char count is defined by |length|.
 int64_t ASN1TimeToSec(const unsigned char* s, size_t length, bool long_format);
 
 extern const char kPemTypeCertificate[];
 extern const char kPemTypeRsaPrivateKey[];
 extern const char kPemTypeEcPrivateKey[];
 
 }  // namespace rtc
 
 #endif  // WEBRTC_BASE_SSLIDENTITY_H_