Further reduce the number of QUIC end-to-end test variations that we run from 54 to 30, by only run…

net/tools/quic/end_to_end_test.cc

Index: net/tools/quic/end_to_end_test.cc
diff --git a/net/tools/quic/end_to_end_test.cc b/net/tools/quic/end_to_end_test.cc
index 31faf9543ccef85edd88e8ca9e916af888e7b970..31fc98ba6e31b8470926043ab1891c1b6ae40f03 100644
--- a/net/tools/quic/end_to_end_test.cc
+++ b/net/tools/quic/end_to_end_test.cc
@@ -201,6 +201,12 @@ vector<TestParams> GetTestParams() {
                   server_uses_stateless_rejects_if_peer_supported,
                   congestion_control_tag, auto_tune_flow_control_window));
 
+              // Run version negotiation tests tests with no options, or all
+              // the options enabled to avoid a combinatorial explosion.
+              if (enabled_options > 0 && enabled_options < kMaxEnabledOptions) {
+                continue;
+              }
+
               // Test client supporting all versions and server supporting 1
               // version. Simulate an old server and exercise version downgrade
               // in the client. Protocol negotiation should occur. Skip the i =