QUIC - clarified comments for persisting crypto config per comments in

net/quic/quic_crypto_client_stream.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_crypto_client_stream.h"
 
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
 #include "net/quic/crypto/crypto_protocol.h"
 #include "net/quic/crypto/crypto_utils.h"
@@ skipping 409 matching lines @@
   if (!quic_server_info) {
     return OK;
   }
 
   generation_counter_ = cached->generation_counter();
   next_state_ = STATE_LOAD_QUIC_SERVER_INFO_COMPLETE;
 
   // TODO(rtenneti): If multiple tabs load the same URL, all requests except for
   // the first request send InchoateClientHello. Fix the code to handle multiple
   // requests. A possible solution is to wait for the first request to finish
-  // and use the data from the disk cache for all requests.
-  // quic_server_info->Persist requires quic_server_info to be ready. We might
-  // have already initialized |cached| config from a the cached state for a
-  // canonical hostname.
+  // and use the data from the disk cache for all requests. We may need to call

[wtc, 2014/02/21 00:04:28]

Please start a new paragraph, to make it clear that this is not part of the TODO
comment.

[ramant (doing other things), 2014/02/21 00:08:10]

Thanks very much.

Done.

+  // quic_server_info->Persist later. quic_server_info->Persist requires
+  // quic_server_info to be ready, so we always call WaitForDataReady, even
+  // though we might have initialized |cached| config from the cached state for
+  // a canonical hostname.
   int rv = quic_server_info->WaitForDataReady(
       base::Bind(&QuicCryptoClientStream::OnIOComplete,
                  base::Unretained(this)));
 
   if (rv != ERR_IO_PENDING) {
     disk_cache_load_result_ = rv;
   }
   return rv;
 }
 
 void QuicCryptoClientStream::DoLoadQuicServerInfoComplete(
     QuicCryptoClientConfig::CachedState* cached) {
   next_state_ = STATE_SEND_CHLO;
 
   // If someone else already saved a server config, we don't want to overwrite
   // it. Also, if someone else saved a server config and then cleared it (so
-  // cached->IsEmpty() is true, but the generation counter changed), we still
-  // want to load from QuicServerInfo.
+  // cached->IsEmpty() is true), we still want to load from QuicServerInfo.
   if (!cached->IsEmpty()) {
-    // Someone else has already saved a server config received from the network
-    // or the canonical server config.
     return;
   }
 
   if (disk_cache_load_result_ != OK || !cached->LoadQuicServerInfo(
           session()->connection()->clock()->WallNow())) {
     // It is ok to proceed to STATE_SEND_CHLO when we cannot load QuicServerInfo
     // from the disk cache.
     DCHECK(cached->IsEmpty());
     DVLOG(1) << "Empty server_config";
     return;
   }
 
   ProofVerifier* verifier = crypto_config_->proof_verifier();
   if (!verifier) {
     // If no verifier is set then we don't check the certificates.
     cached->SetProofValid();
   } else if (!cached->signature().empty()) {
     next_state_ = STATE_VERIFY_PROOF;
   }
 }
 
 }  // namespace net