Merge internal change: 63891842 - QuicServerId changes

net/tools/quic/test_tools/quic_test_client.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.
 
 #ifndef NET_QUIC_TEST_TOOLS_QUIC_TEST_CLIENT_H_
 #define NET_QUIC_TEST_TOOLS_QUIC_TEST_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/quic/quic_framer.h"
 #include "net/quic/quic_packet_creator.h"
 #include "net/quic/quic_protocol.h"
 #include "net/tools/quic/quic_client.h"
 
 namespace net {
 
 class ProofVerifier;
-class QuicSessionKey;
+class QuicServerId;
 
 namespace tools {
 
 class QuicPacketWriterWrapper;
 
 namespace test {
 
 class HTTPMessage;
 class MockableQuicClient;
 
 // A toy QUIC client used for testing.
 class QuicTestClient :  public QuicDataStream::Visitor {
  public:
   QuicTestClient(IPEndPoint server_address,
-                 const QuicSessionKey& server_key,
+                 const string& server_hostname,
                  const QuicVersionVector& supported_versions);
   QuicTestClient(IPEndPoint server_address,
-                 const QuicSessionKey& server_key,
+                 const string& server_hostname,
                  bool secure,
                  const QuicVersionVector& supported_versions);
   QuicTestClient(IPEndPoint server_address,
-                 const QuicSessionKey& server_key,
+                 const string& server_hostname,
                  bool secure,
                  const QuicConfig& config,
                  const QuicVersionVector& supported_versions,
                  uint32 client_initial_flow_control_receive_window);
 
   virtual ~QuicTestClient();
 
   // ExpectCertificates controls whether the server is expected to provide
   // certificates. The certificates, if any, are not verified, but the common
   // name is recorded and available with |cert_common_name()|.
@@ skipping 61 matching lines @@
   const string& response_body() {return response_;}
   bool connected() const;
 
   void set_auto_reconnect(bool reconnect) { auto_reconnect_ = reconnect; }
 
   void set_priority(QuicPriority priority) { priority_ = priority; }
 
   void WaitForWriteToFlush();
 
  private:
-  void Initialize(IPEndPoint address,
-                  const QuicSessionKey& server_key,
-                  bool secure);
+  void Initialize(IPEndPoint address, const std::string& hostname, bool secure);
 
   IPEndPoint server_address_;
   IPEndPoint client_address_;
-  QuicSessionKey server_key_;
   scoped_ptr<MockableQuicClient> client_;  // The actual client
   QuicSpdyClientStream* stream_;
 
   QuicRstStreamErrorCode stream_error_;
 
   bool response_complete_;
   bool response_headers_complete_;
   BalsaHeaders headers_;
   QuicPriority priority_;
   string response_;
@@ skipping 17 matching lines @@
   // client_.
   ProofVerifier* proof_verifier_;
 };
 
 }  // namespace test
 
 }  // namespace tools
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_QUIC_TEST_CLIENT_H_