Make QUIC tests restore flags to their default values

BUG=642709

Review-Url: https://codereview.chromium.org/2295043004
Cr-Commit-Position: refs/heads/master@{#415779}

net/quic/chromium/quic_end_to_end_unittest.cc

@@ -107,13 +107,6 @@ class QuicEndToEndTest : public ::testing::TestWithParam<TestParams> {
         auth_handler_factory_(
             HttpAuthHandlerFactory::CreateDefault(&host_resolver_)),
         strike_register_no_startup_period_(false) {
-    // TODO(crbug.com/642709) These values are currently needed to avoid test
-    // test failures on iOS10.  It's unclear why this is happenening, and should
-    // be removed after investigation.
-    FLAGS_quic_enable_version_35 = true;
-    FLAGS_quic_enable_version_36 = true;
-    FLAGS_quic_enable_version_36_v2 = true;
-
     request_.method = "GET";
     request_.url = GURL("https://test.example.com/");
     request_.load_flags = 0;

net/quic/chromium/quic_network_transaction_unittest.cc

@@ -2510,6 +2510,10 @@ TEST_P(QuicNetworkTransactionTest, QuicServerPush) {
 }
 
 TEST_P(QuicNetworkTransactionTest, QuicForceHolBlocking) {
+  ValueRestore<bool> old_v35_flag(&FLAGS_quic_enable_version_35,
+                                  FLAGS_quic_enable_version_35);
+  ValueRestore<bool> old_v36_flag(&FLAGS_quic_enable_version_36,
+                                  FLAGS_quic_enable_version_36);
   FLAGS_quic_enable_version_35 = true;
   FLAGS_quic_enable_version_36 = true;
   params_.quic_force_hol_blocking = true;

net/quic/core/quic_protocol_test.cc

@@ -9,6 +9,7 @@
 #include "base/stl_util.h"
 #include "net/quic/core/quic_flags.h"
 #include "net/quic/core/quic_utils.h"
+#include "net/quic/test_tools/quic_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
@@ -284,6 +285,12 @@ TEST(QuicProtocolTest, PathCloseFrameToString) {
 }
 
 TEST(QuicProtocolTest, FilterSupportedVersions) {
+  ValueRestore<bool> old_v35_flag(&FLAGS_quic_enable_version_35,
+                                  FLAGS_quic_enable_version_35);
+  ValueRestore<bool> old_v36_flag(&FLAGS_quic_enable_version_36,
+                                  FLAGS_quic_enable_version_36);
+  ValueRestore<bool> old_v36_2_flag(&FLAGS_quic_enable_version_36_v2,
+                                    FLAGS_quic_enable_version_36_v2);
   QuicVersionVector all_versions = {
       QUIC_VERSION_30, QUIC_VERSION_31, QUIC_VERSION_32, QUIC_VERSION_33,
       QUIC_VERSION_34, QUIC_VERSION_35, QUIC_VERSION_36};
@@ -300,6 +307,10 @@ TEST(QuicProtocolTest, FilterSupportedVersions) {
 }
 
 TEST(QuicProtocolTest, QuicVersionManager) {
+  ValueRestore<bool> old_v35_flag(&FLAGS_quic_enable_version_35,
+                                  FLAGS_quic_enable_version_35);
+  ValueRestore<bool> old_v36_2_flag(&FLAGS_quic_enable_version_36_v2,
+                                    FLAGS_quic_enable_version_36_v2);
   FLAGS_quic_enable_version_35 = false;
   FLAGS_quic_enable_version_36_v2 = false;
   QuicVersionManager manager(AllSupportedVersions());