Merge internal change: 63891842 - QuicServerId changes

net/quic/quic_server_id.h

Index: net/quic/quic_server_id.h
diff --git a/net/quic/quic_session_key.h b/net/quic/quic_server_id.h
similarity index 52%
rename from net/quic/quic_session_key.h
rename to net/quic/quic_server_id.h
index 6cd43e7b9c93cda7cf190233cf2e047bb9222122..1973ccc862bef812486c2cc4718cf9a015edd790 100644
--- a/net/quic/quic_session_key.h
+++ b/net/quic/quic_server_id.h
@@ -13,30 +13,30 @@
 
 namespace net {
 
-// The key used to identify sessions. Includes the hostname, port, and scheme.
-class NET_EXPORT_PRIVATE QuicSessionKey {
+// The id used to identify sessions. Includes the hostname, port, scheme and
+// privacy_mode.
+class NET_EXPORT_PRIVATE QuicServerId {
  public:
-  QuicSessionKey();
-  QuicSessionKey(const HostPortPair& host_port_pair,
-                 bool is_https,
-                 PrivacyMode privacy_mode);
-  QuicSessionKey(const std::string& host,
-                 uint16 port,
-                 bool is_https,
-                 PrivacyMode privacy_mode);
-  ~QuicSessionKey();
+  QuicServerId();
+  QuicServerId(const HostPortPair& host_port_pair,
+               bool is_https,
+               PrivacyMode privacy_mode);
+  QuicServerId(const std::string& host,
+               uint16 port,
+               bool is_https,
+               PrivacyMode privacy_mode);
+  ~QuicServerId();
 
   // Needed to be an element of std::set.
-  bool operator<(const QuicSessionKey& other) const;
-  bool operator==(const QuicSessionKey& other) const;
+  bool operator<(const QuicServerId& other) const;
+  bool operator==(const QuicServerId& other) const;
 
-  // ToString() will convert the QuicSessionKey to "scheme:hostname:port".
-  // "scheme" would either be "http" or "https" based on |is_https|.
+  // ToString() will convert the QuicServerId to "scheme:hostname:port" or
+  // "scheme:hostname:port/private". "scheme" would either be "http" or "https"
+  // based on |is_https|.
   std::string ToString() const;
 
-  const HostPortPair& host_port_pair() const {
-    return host_port_pair_;
-  }
+  const HostPortPair& host_port_pair() const { return host_port_pair_; }
 
   const std::string& host() const { return host_port_pair_.host(); }