Landing recent QUIC changes until Sun Mar 5 09:18:09 2017 +0000

net/quic/core/quic_config.h

Index: net/quic/core/quic_config.h
diff --git a/net/quic/core/quic_config.h b/net/quic/core/quic_config.h
index 286ba1c2af66e1904cf26c7618d1e7c2e28b54a3..924a8e7c015db8a7fe6efa28697204c191c459d7 100644
--- a/net/quic/core/quic_config.h
+++ b/net/quic/core/quic_config.h
@@ -351,10 +351,6 @@ class QUIC_EXPORT_PRIVATE QuicConfig {
 
   uint32_t ReceivedSocketReceiveBuffer() const;
 
-  void SetMultipathEnabled(bool multipath_enabled);
-
-  bool MultipathEnabled() const;
-
   void SetDisableConnectionMigration();
 
   bool DisableConnectionMigration() const;
@@ -428,9 +424,6 @@ class QUIC_EXPORT_PRIVATE QuicConfig {
   // TODO(ianswett): Deprecate once QUIC_VERSION_34 is deprecated.
   QuicFixedUint32 socket_receive_buffer_;
 
-  // Whether to support multipath for this connection.
-  QuicNegotiableUint32 multipath_enabled_;
-
   // Whether tell peer not to attempt connection migration.
   QuicFixedUint32 connection_migration_disabled_;
 
@@ -442,6 +435,9 @@ class QUIC_EXPORT_PRIVATE QuicConfig {
 
   // Whether support HTTP/2 SETTINGS_MAX_HEADER_LIST_SIZE SETTINGS frame.
   QuicFixedUint32 support_max_header_list_size_;
+
+  // Latched copy of gfe2_reloadable_flag_quic_no_socket_receive_buffer.

[Ryan Hamilton, 2017/03/10 17:48:33]

I commented on this in the base CL, but can you fix the occurrences of this in
this CL? I'm curious why the merge script missed it.

+  bool latched_no_socket_receive_buffer_;
 };
 
 }  // namespace net