Index: net/quic/quic_stream_factory.cc |
diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc |
index 8db6c694858eb8f90b9d379bb7e6a4932c62d61b..7a0be5a69606e617ff9f3400f207d87c6ac465d6 100644 |
--- a/net/quic/quic_stream_factory.cc |
+++ b/net/quic/quic_stream_factory.cc |
@@ -57,12 +57,8 @@ |
#include "base/win/windows_version.h" |
#endif |
-#if defined(USE_OPENSSL) |
#include <openssl/aead.h> |
#include "crypto/openssl_util.h" |
-#else |
-#include "base/cpu.h" |
-#endif |
using std::min; |
using std::vector; |
@@ -680,13 +676,8 @@ QuicStreamFactory::QuicStreamFactory( |
} |
if (enable_token_binding && channel_id_service && IsTokenBindingSupported()) |
crypto_config_.tb_key_params.push_back(kP256); |
-#if defined(USE_OPENSSL) |
crypto::EnsureOpenSSLInit(); |
bool has_aes_hardware_support = !!EVP_has_aes_hardware(); |
-#else |
- base::CPU cpu; |
- bool has_aes_hardware_support = cpu.has_aesni() && cpu.has_avx(); |
-#endif |
UMA_HISTOGRAM_BOOLEAN("Net.QuicSession.PreferAesGcm", |
has_aes_hardware_support); |
if (has_aes_hardware_support || prefer_aes_) |