Merge internal change: 63891842 - QuicServerId changes

net/quic/quic_client_session.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.
 //
 // A client specific QuicSession subclass.  This class owns the underlying
 // QuicConnection and QuicConnectionHelper objects.  The connection stores
 // a non-owning pointer to the helper so this session needs to ensure that
 // the helper outlives the connection.
 
 #ifndef NET_QUIC_QUIC_CLIENT_SESSION_H_
@@ skipping 12 matching lines @@
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_reliable_client_stream.h"
 
 namespace net {
 
 class CertVerifyResult;
 class DatagramClientSocket;
 class QuicConnectionHelper;
 class QuicCryptoClientStreamFactory;
 class QuicDefaultPacketWriter;
-class QuicSessionKey;
+class QuicServerId;
 class QuicServerInfo;
 class QuicStreamFactory;
 class SSLInfo;
 
 namespace test {
 class QuicClientSessionPeer;
 }  // namespace test
 
 class NET_EXPORT_PRIVATE QuicClientSession : public QuicClientSessionBase {
  public:
@@ skipping 44 matching lines @@
 
   // Constructs a new session which will own |connection| and |helper|, but
   // not |stream_factory|, which must outlive this session.
   // TODO(rch): decouple the factory from the session via a Delegate interface.
   QuicClientSession(QuicConnection* connection,
                     scoped_ptr<DatagramClientSocket> socket,
                     scoped_ptr<QuicDefaultPacketWriter> writer,
                     QuicStreamFactory* stream_factory,
                     QuicCryptoClientStreamFactory* crypto_client_stream_factory,
                     scoped_ptr<QuicServerInfo> server_info,
-                    const QuicSessionKey& server_key,
+                    const QuicServerId& server_id,
                     const QuicConfig& config,
                     QuicCryptoClientConfig* crypto_config,
                     NetLog* net_log);
 
   virtual ~QuicClientSession();
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   // Attempts to create a new stream.  If the stream can be
@@ skipping 125 matching lines @@
   // on this session. Existing stream will continue to be processed.
   bool going_away_;
   base::WeakPtrFactory<QuicClientSession> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicClientSession);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_CLIENT_SESSION_H_