Move Window's specific logic for disabling ECDSA from QuicCryptoyclientConfig

net/quic/crypto/quic_crypto_client_config.cc

Index: net/quic/crypto/quic_crypto_client_config.cc
diff --git a/net/quic/crypto/quic_crypto_client_config.cc b/net/quic/crypto/quic_crypto_client_config.cc
index 6654d45116a9005749d5a513231fca6a55e2b302..72199bbe26dd73ea2ea31f433c3722ebf5737d97 100644
--- a/net/quic/crypto/quic_crypto_client_config.cc
+++ b/net/quic/crypto/quic_crypto_client_config.cc
@@ -19,10 +19,6 @@
 #include "net/quic/quic_session_key.h"
 #include "net/quic/quic_utils.h"
 
-#if defined(OS_WIN)
-#include "base/win/windows_version.h"
-#endif
-
 using base::StringPiece;
 using std::make_pair;
 using std::map;
@@ -31,7 +27,8 @@ using std::vector;
 
 namespace net {
 
-QuicCryptoClientConfig::QuicCryptoClientConfig() {}
+QuicCryptoClientConfig::QuicCryptoClientConfig()
+    : disable_ecdsa_(false) {}
 
 QuicCryptoClientConfig::~QuicCryptoClientConfig() {
   STLDeleteValues(&cached_states_);
@@ -253,6 +250,8 @@ void QuicCryptoClientConfig::SetDefaults() {
   // Authenticated encryption algorithms.
   aead.resize(1);
   aead[0] = kAESG;
+
+  disable_ecdsa_ = false;
 }
 
 QuicCryptoClientConfig::CachedState* QuicCryptoClientConfig::LookupOrCreate(
@@ -289,14 +288,7 @@ void QuicCryptoClientConfig::FillInchoateClientHello(
   }
 
   if (server_key.is_https()) {
-    // Don't request ECDSA proofs on platforms that do not support ECDSA
-    // certificates.

[wtc, 2014/03/25 14:58:11]

We should move this comment to either quic_crypto_client_config.h or
quic_stream_factory.cc. For example, in quic_crypto_client_config.h we can say:

  // Call this method on platforms that do not support ECDSA
  // certificates to not request ECDSA proofs.

("to not request ECDSA proofs" sounds awkward to me. Maybe we should
remove it.)

We may also want to add a reminder that this method can be removed
when we drop support for Windows XP.

[Ryan Hamilton, 2014/03/27 19:06:39]

Done.

-    bool disableECDSA = false;
-#if defined(OS_WIN)
-    if (base::win::GetVersion() < base::win::VERSION_VISTA)
-      disableECDSA = true;
-#endif
-    if (disableECDSA) {
+    if (disable_ecdsa_) {
       out->SetTaglist(kPDMD, kX59R, 0);
     } else {
       out->SetTaglist(kPDMD, kX509, 0);
@@ -721,4 +713,8 @@ void QuicCryptoClientConfig::PopulateFromCanonicalConfig(
   server_state->InitializeFrom(*canonical_state);
 }
 
+void QuicCryptoClientConfig::DisableEcdsa() {

[wtc, 2014/03/25 14:58:11]

This should follow the definition of AddCanonicalSuffix() to match their
declaration order in the header file.

[Ryan Hamilton, 2014/03/27 19:06:39]

Done.

+  disable_ecdsa_ = true;
+}
+
 }  // namespace net