Move QuicServerInfo management from CachedState to the QuicStreamFactory

net/quic/quic_crypto_client_stream.h

 // 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.
 
 #ifndef NET_QUIC_QUIC_CRYPTO_CLIENT_STREAM_H_
 #define NET_QUIC_QUIC_CRYPTO_CLIENT_STREAM_H_
 
 #include <string>
 
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "net/cert/cert_verify_result.h"
 #include "net/cert/x509_certificate.h"
 #include "net/quic/crypto/proof_verifier.h"
 #include "net/quic/crypto/quic_crypto_client_config.h"
 #include "net/quic/quic_config.h"
 #include "net/quic/quic_crypto_stream.h"
 
 namespace net {
 
-class ProofVerifyDetails;
+class QuicServerInfo;
 class QuicSession;
 class SSLInfo;
 
 namespace test {
 class CryptoTestUtils;
 }  // namespace test
 
 class NET_EXPORT_PRIVATE QuicCryptoClientStream : public QuicCryptoStream {
  public:
   QuicCryptoClientStream(const string& server_hostname,
@@ skipping 13 matching lines @@
   // num_sent_client_hellos returns the number of client hello messages that
   // have been sent. If the handshake has completed then this is one greater
   // than the number of round-trips needed for the handshake.
   int num_sent_client_hellos() const;
 
   // Gets the SSL connection information.
   virtual bool GetSSLInfo(SSLInfo* ssl_info);
 
   void OnIOComplete(int result);
 
+  void SetQuicServerInfo(scoped_ptr<QuicServerInfo> server_info);
+
  private:
   // ProofVerifierCallbackImpl is passed as the callback method to VerifyProof.
   // The ProofVerifier calls this class with the result of proof verification
   // when verification is performed asynchronously.
   class ProofVerifierCallbackImpl : public ProofVerifierCallback {
    public:
     explicit ProofVerifierCallbackImpl(QuicCryptoClientStream* stream);
     virtual ~ProofVerifierCallbackImpl();
 
     // ProofVerifierCallback interface.
@@ skipping 31 matching lines @@
   // functions.
 
   // Call QuicServerInfo's WaitForDataReady to load the server information from
   // the disk cache.
   int DoLoadQuicServerInfo(QuicCryptoClientConfig::CachedState* cached);
   void DoLoadQuicServerInfoComplete(
       QuicCryptoClientConfig::CachedState* cached);
   // LoadQuicServerInfo is a helper function for DoLoadQuicServerInfoComplete.
   void LoadQuicServerInfo(QuicCryptoClientConfig::CachedState* cached);
 
+  void SaveQuicServerInfo(QuicCryptoClientConfig::CachedState* cached);

[wtc, 2014/03/12 23:13:20]

1. Please document that we should call SaveQuicServerInfo whenever we call
cached->SetProofValid().

Perhaps this should be done by cached->SetProofValid()?

2. |cached| should be a const pointer or const reference.

[Ryan Hamilton, 2014/03/13 16:38:07]

Done.
It could be but that would increase, rather than decrease the consistency of
this code with respect to the internal version. In any case, this will soon be
moving :>
Good point.  Done.

+
   State next_state_;
   // num_client_hellos_ contains the number of client hello messages that this
   // connection has sent.
   int num_client_hellos_;
 
   QuicCryptoClientConfig* const crypto_config_;
 
   // Client's connection nonce (4-byte timestamp + 28 random bytes)
   std::string nonce_;
   // Server's hostname
   std::string server_hostname_;
 
   // Generation counter from QuicCryptoClientConfig's CachedState.
   uint64 generation_counter_;
 
   // proof_verify_callback_ contains the callback object that we passed to an
   // asynchronous proof verification. The ProofVerifier owns this object.
   ProofVerifierCallbackImpl* proof_verify_callback_;
 
   // These members are used to store the result of an asynchronous proof
   // verification. These members must not be used after
   // STATE_VERIFY_PROOF_COMPLETE.
   bool verify_ok_;
   string verify_error_details_;
   scoped_ptr<ProofVerifyDetails> verify_details_;
 
   // The result of certificate verification.
   scoped_ptr<CertVerifyResult> cert_verify_result_;
+  scoped_ptr<QuicServerInfo> quic_server_info_;

[wtc, 2014/03/12 23:13:20]

Nit: because of the "The result of certificate verification." comment, it would
be nice to add a blank line to make it clear this is not part of that group.

[Ryan Hamilton, 2014/03/13 16:38:07]

Done.

 
   // This member is used to store the result of an asynchronous disk cache read.
   // It must not be used after STATE_LOAD_QUIC_SERVER_INFO_COMPLETE.
   int disk_cache_load_result_;
 
   // Time when call to WaitForDataReady was made, used for computing time spent
   // to load QUIC server information from disk cache.
   base::TimeTicks disk_cache_load_start_time_;
 
   base::WeakPtrFactory<QuicCryptoClientStream> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicCryptoClientStream);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_CRYPTO_CLIENT_STREAM_H_