Roll Chrome into Mojo.

net/quic/quic_client_session.h

Index: net/quic/quic_client_session.h
diff --git a/net/quic/quic_client_session.h b/net/quic/quic_client_session.h
index b1a35d9aba72e9896f7b9648f6bf912ba356f642..05ed5e8b28d9e13239c075087d1ecb2ef0c7f72b 100644
--- a/net/quic/quic_client_session.h
+++ b/net/quic/quic_client_session.h
@@ -175,7 +175,9 @@ class NET_EXPORT_PRIVATE QuicClientSession : public QuicClientSessionBase {
   // Returns true if |hostname| may be pooled onto this session.  If this
   // is a secure QUIC session, then |hostname| must match the certificate
   // presented during the handshake.
-  bool CanPool(const std::string& hostname) const;
+  bool CanPool(const std::string& hostname, PrivacyMode privacy_mode) const;
+
+  const QuicServerId& server_id() const { return server_id_; }
 
  protected:
   // QuicSession methods:
@@ -219,7 +221,7 @@ class NET_EXPORT_PRIVATE QuicClientSession : public QuicClientSessionBase {
 
   void OnConnectTimeout();
 
-  HostPortPair server_host_port_;
+  QuicServerId server_id_;
   bool require_confirmation_;
   scoped_ptr<QuicCryptoClientStream> crypto_stream_;
   QuicStreamFactory* stream_factory_;