Land Recent QUIC Changes.

net/quic/test_tools/quic_config_peer.h

 // Copyright 2014 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_CONFIG_PEER_H_
 #define NET_QUIC_TEST_TOOLS_QUIC_CONFIG_PEER_H_
 
 #include "net/quic/quic_protocol.h"
 
 namespace net {
@@ skipping 13 matching lines @@
   // TODO(rjshade): Remove when removing QUIC_VERSION_19.
   static void SetReceivedInitialFlowControlWindow(QuicConfig* config,
                                                   uint32 window_bytes);
 
   static void SetReceivedInitialStreamFlowControlWindow(QuicConfig* config,
                                                         uint32 window_bytes);
 
   static void SetReceivedInitialSessionFlowControlWindow(QuicConfig* config,
                                                          uint32 window_bytes);
 
+  static void SetReceivedConnectionOptions(QuicConfig* config,
+                                           const QuicTagVector options);
+
+
  private:
   DISALLOW_COPY_AND_ASSIGN(QuicConfigPeer);
 };
 
 }  // namespace test
 
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_QUIC_CONFIG_PEER_H_