Move QuicServerInfo management from CachedState to the QuicStreamFactory

net/quic/quic_crypto_client_stream.h

Index: net/quic/quic_crypto_client_stream.h
diff --git a/net/quic/quic_crypto_client_stream.h b/net/quic/quic_crypto_client_stream.h
index 12198d94c32ff65506a4159e9b172f49d4145676..df30e4939d94510b67b1c659eb1341e61924c500 100644
--- a/net/quic/quic_crypto_client_stream.h
+++ b/net/quic/quic_crypto_client_stream.h
@@ -18,7 +18,7 @@
 
 namespace net {
 
-class ProofVerifyDetails;
+class QuicServerInfo;
 class QuicSession;
 class SSLInfo;
 
@@ -52,6 +52,8 @@ class NET_EXPORT_PRIVATE QuicCryptoClientStream : public QuicCryptoStream {
 
   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
@@ -103,6 +105,8 @@ class NET_EXPORT_PRIVATE QuicCryptoClientStream : public QuicCryptoStream {
   // 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.
@@ -131,6 +135,7 @@ class NET_EXPORT_PRIVATE QuicCryptoClientStream : public QuicCryptoStream {
 
   // 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.