QUIC - use QuicSessionKey tuple (host, port, is_https) instead of server_hostname

net/quic/crypto/quic_server_info.h

Index: net/quic/crypto/quic_server_info.h
diff --git a/net/quic/crypto/quic_server_info.h b/net/quic/crypto/quic_server_info.h
index 853504ae70f96882c3d1d5e66165097892554dc3..c6647d43816eee869da74eb8e4bc2c6c6eed4c23 100644
--- a/net/quic/crypto/quic_server_info.h
+++ b/net/quic/crypto/quic_server_info.h
@@ -13,6 +13,7 @@
 #include "base/time/time.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_export.h"
+#include "net/quic/quic_session_key.h"
 
 namespace net {
 
@@ -24,7 +25,7 @@ class X509Certificate;
 // crypto config.
 class NET_EXPORT_PRIVATE QuicServerInfo {
  public:
-  QuicServerInfo(const std::string& hostname);
+  QuicServerInfo(const QuicSessionKey& server_key);
   virtual ~QuicServerInfo();
 
   // Start will commence the lookup. This must be called before any other
@@ -92,17 +93,18 @@ class NET_EXPORT_PRIVATE QuicServerInfo {
   // SerializeInner is a helper function for Serialize.
   std::string SerializeInner() const;
 
-  // This is the QUIC server hostname for which we restore the crypto_config.
-  const std::string hostname_;
+  // This is the QUIC server (is_https, hostname, port) tuple for which we

[wtc, 2014/03/13 22:22:03]

Nit: in the QuicSessionKey constructors, is_https is the last parameter. So it
seems better to also list is_https last here.

[ramant (doing other things), 2014/03/13 23:46:36]

Done.

+  // restore the crypto_config.
+  const QuicSessionKey server_key_;
 };
 
 class QuicServerInfoFactory {
  public:
   virtual ~QuicServerInfoFactory();
 
-  // GetForHost returns a fresh, allocated QuicServerInfo for the given
-  // hostname or NULL on failure.
-  virtual QuicServerInfo* GetForHost(const std::string& hostname) = 0;
+  // GetForServer returns a fresh, allocated QuicServerInfo for the given
+  // |server_key| or NULL on failure.
+  virtual QuicServerInfo* GetForServer(const QuicSessionKey& server_key) = 0;
 };
 
 }  // namespace net