Index: net/quic/quic_stream_factory.cc |
diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc |
index 9776448cc5f0aa3948d3998b395675b637c8b55e..7c24ecdaef4439814ed3cb2a0b246e2774bcabc0 100644 |
--- a/net/quic/quic_stream_factory.cc |
+++ b/net/quic/quic_stream_factory.cc |
@@ -578,8 +578,12 @@ QuicStreamFactory::QuicStreamFactory( |
crypto_config_.AddCanonicalSuffix(".googlevideo.com"); |
crypto_config_.SetProofVerifier( |
new ProofVerifierChromium(cert_verifier, transport_security_state)); |
- crypto_config_.SetChannelIDSource( |
- new ChannelIDSourceChromium(channel_id_service)); |
+ // TODO(rtenneti): http://crbug.com/487355. Temporary fix for b/20760730 until |
+ // channel_id_service is supported in cronet. |
+ if (channel_id_service) { |
+ crypto_config_.SetChannelIDSource( |
mef
2015/05/12 20:04:03
Is it safe? What would happen here: https://code.g
Ryan Hamilton
2015/05/12 20:23:19
I *think* it's ok because of the call to RequiresC
mef
2015/05/12 20:26:18
Ah, right, RequiresChannelID() has a check for cry
|
+ new ChannelIDSourceChromium(channel_id_service)); |
+ } |
base::CPU cpu; |
if (cpu.has_aesni() && cpu.has_avx()) |
crypto_config_.PreferAesGcm(); |