Land Recent QUIC Changes until 05/13/2015

chrome/common/chrome_switches.cc

Index: chrome/common/chrome_switches.cc
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 25575f7aecad86970143d913e4d9109cf28ca3da..1e419a3bccfe946f028742537f2b9517d4a34bf5 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -319,10 +319,6 @@ const char kDisablePromptOnRepost[]         = "disable-prompt-on-repost";
 // Disables support for the QUIC protocol.
 const char kDisableQuic[]                   = "disable-quic";
 
-// Disable use of pacing of QUIC packets.
-// This only has an effect if QUIC protocol is enabled.
-const char kDisableQuicPacing[]             = "disable-quic-pacing";
-
 // Disable use of Chromium's port selection for the ephemeral port via bind().
 // This only has an effect if QUIC protocol is enabled.
 const char kDisableQuicPortSelection[]      = "disable-quic-port-selection";
@@ -511,10 +507,6 @@ const char kEnableQueryExtraction[]         = "enable-query-extraction";
 // Enables support for the QUIC protocol.  This is a temporary testing flag.
 const char kEnableQuic[]                    = "enable-quic";
 
-// Disable use of pacing of QUIC packets.
-// This only has an effect if QUIC protocol is enabled.
-const char kEnableQuicPacing[]              = "enable-quic-pacing";
-
 // Enable use of Chromium's port selection for the ephemeral port via bind().
 // This only has an effect if QUIC protocol is enabled.
 const char kEnableQuicPortSelection[]       = "enable-quic-port-selection";