Land Recent QUIC Changes.

chrome/browser/io_thread.h

Index: chrome/browser/io_thread.h
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
index 801d48d0935c398626177b23a17724e974e6397d..c4f9a8e0df42f0897d37b3ece115cce26613728b 100644
--- a/chrome/browser/io_thread.h
+++ b/chrome/browser/io_thread.h
@@ -185,7 +185,6 @@ class IOThread : public content::BrowserThreadDelegate {
     Optional<bool> enable_websocket_over_spdy;
 
     Optional<bool> enable_quic;
-    Optional<bool> enable_quic_time_based_loss_detection;
     Optional<bool> enable_quic_port_selection;
     Optional<bool> quic_always_require_handshake_confirmation;
     Optional<bool> quic_disable_connection_pooling;
@@ -353,13 +352,6 @@ class IOThread : public content::BrowserThreadDelegate {
       base::StringPiece quic_trial_group,
       const VariationParameters& quic_trial_params);
 
-  // Returns true if QUIC time-base loss detection should be negotiated during
-  // the QUIC handshake.
-  static bool ShouldEnableQuicTimeBasedLossDetection(
-      const base::CommandLine& command_line,
-      base::StringPiece quic_trial_group,
-      const VariationParameters& quic_trial_params);
-
   // Returns true if QUIC should always require handshake confirmation during
   // the QUIC handshake.
   static bool ShouldQuicAlwaysRequireHandshakeConfirmation(