Land Recent QUIC 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_TOOLS_QUIC_TEST_TOOLS_QUIC_TEST_CLIENT_H_
 #define NET_TOOLS_QUIC_TEST_TOOLS_QUIC_TEST_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 67 matching lines @@
   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()|.
   void ExpectCertificates(bool on);
 
   // Wraps data in a quic packet and sends it.
   ssize_t SendData(string data, bool last_data);
 
-  QuicPacketCreator::Options* options();
-
   // From SimpleClient
   // Clears any outstanding state and sends a simple GET of 'uri' to the
   // server.  Returns 0 if the request failed and no bytes were written.
   virtual ssize_t SendRequest(const string& uri) OVERRIDE;
   virtual ssize_t SendMessage(const HTTPMessage& message) OVERRIDE;
   virtual string SendCustomSynchronousRequest(
       const HTTPMessage& message) OVERRIDE;
   virtual string SendSynchronousRequest(const string& uri) OVERRIDE;
   virtual void Connect() OVERRIDE;
   virtual void ResetConnection() OVERRIDE;
@@ skipping 98 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(QuicTestClient);
 };
 
 }  // namespace test
 
 }  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_TEST_TOOLS_QUIC_TEST_CLIENT_H_