QUIC - Temporary fix for b/20760730 until channel_id_service is

net/quic/quic_stream_factory.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 "net/quic/quic_stream_factory.h"
 
 #include <set>
 
 #include "base/cpu.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 560 matching lines @@
       port_seed_(random_generator_->RandUint64()),
       check_persisted_supports_quic_(true),
       task_runner_(nullptr),
       weak_factory_(this) {
   DCHECK(transport_security_state_);
   crypto_config_.set_user_agent_id(user_agent_id);
   crypto_config_.AddCanonicalSuffix(".c.youtube.com");
   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.google.com/p/chromium/codesearch#chromium/src/net/quic/quic_cryp...

[Ryan Hamilton, 2015/05/12 20:23:19]

I *think* it's ok because of the call to RequiresChannelID().

[mef, 2015/05/12 20:26:18]

Ah, right, RequiresChannelID() has a check for
crypto_config_->channel_id_source().

+        new ChannelIDSourceChromium(channel_id_service));
+  }
   base::CPU cpu;
   if (cpu.has_aesni() && cpu.has_avx())
     crypto_config_.PreferAesGcm();
   if (!IsEcdsaSupported())
     crypto_config_.DisableEcdsa();
 }
 
 QuicStreamFactory::~QuicStreamFactory() {
   CloseAllSessions(ERR_ABORTED);
   while (!all_sessions_.empty()) {
@@ skipping 613 matching lines @@
   // Since the session was active, there's no longer an
   // HttpStreamFactoryImpl::Job running which can mark it broken, unless the TCP
   // job also fails. So to avoid not using QUIC when we otherwise could, we mark
   // it as recently broken, which means that 0-RTT will be disabled but we'll
   // still race.
   http_server_properties_->MarkAlternativeServiceRecentlyBroken(
       alternative_service);
 }
 
 }  // namespace net