diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-09-29 16:16:15 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-11-09 10:04:06 +0000 |
| commit | a95a7417ad456115a1ef2da4bb8320531c0821f1 (patch) | |
| tree | edcd59279e486d2fd4a8f88a7ed025bcf925c6e6 /chromium/components/network_session_configurator/browser | |
| parent | 33fc33aa94d4add0878ec30dc818e34e1dd3cc2a (diff) | |
| download | qtwebengine-chromium-a95a7417ad456115a1ef2da4bb8320531c0821f1.tar.gz | |
BASELINE: Update Chromium to 106.0.5249.126
Change-Id: Ib0bb21c437a7d1686e21c33f2d329f2ac425b7ab
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/438936
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/network_session_configurator/browser')
2 files changed, 6 insertions, 6 deletions
diff --git a/chromium/components/network_session_configurator/browser/network_session_configurator.cc b/chromium/components/network_session_configurator/browser/network_session_configurator.cc index 0e02e894eb0..1412711297d 100644 --- a/chromium/components/network_session_configurator/browser/network_session_configurator.cc +++ b/chromium/components/network_session_configurator/browser/network_session_configurator.cc @@ -31,7 +31,7 @@ #include "net/quic/set_quic_flag.h" #include "net/spdy/spdy_session.h" #include "net/spdy/spdy_session_pool.h" -#include "net/third_party/quiche/overrides/quiche_platform_impl/quic_flags_impl.h" +#include "net/third_party/quiche/src/quiche/common/platform/api/quiche_flags.h" #include "net/third_party/quiche/src/quiche/quic/core/quic_packets.h" #include "net/third_party/quiche/src/quiche/quic/core/quic_tag.h" #include "net/third_party/quiche/src/quiche/spdy/core/spdy_protocol.h" @@ -481,7 +481,7 @@ quic::ParsedQuicVersionVector GetQuicVersions( quic::ParsedQuicVersionVector trial_versions = quic::ParseQuicVersionVectorString(trial_versions_str); const bool obsolete_versions_allowed = base::EqualsCaseInsensitiveASCII( - GetVariationParam(quic_trial_params, "obsolete_versions_allowed"), + GetVariationParam(quic_trial_params, "obsolete_versions_allowed2"), "true"); if (!obsolete_versions_allowed) { quic::ParsedQuicVersionVector filtered_versions; diff --git a/chromium/components/network_session_configurator/browser/network_session_configurator_unittest.cc b/chromium/components/network_session_configurator/browser/network_session_configurator_unittest.cc index e24bb0a5136..ef5e7f5f5fe 100644 --- a/chromium/components/network_session_configurator/browser/network_session_configurator_unittest.cc +++ b/chromium/components/network_session_configurator/browser/network_session_configurator_unittest.cc @@ -581,7 +581,7 @@ TEST_F(NetworkSessionConfiguratorTest, QuicVersionFromFieldTrialParams) { std::map<std::string, std::string> field_trial_params; field_trial_params["quic_version"] = quic::QuicVersionToString(version.transport_version); - field_trial_params["obsolete_versions_allowed"] = "true"; + field_trial_params["obsolete_versions_allowed2"] = "true"; variations::AssociateVariationParams("QUIC", "Enabled", field_trial_params); base::FieldTrialList::CreateFieldTrial("QUIC", "Enabled"); @@ -614,7 +614,7 @@ TEST_F(NetworkSessionConfiguratorTest, std::map<std::string, std::string> field_trial_params; field_trial_params["quic_version"] = quic_versions; - field_trial_params["obsolete_versions_allowed"] = "true"; + field_trial_params["obsolete_versions_allowed2"] = "true"; variations::AssociateVariationParams("QUIC", "Enabled", field_trial_params); base::FieldTrialList::CreateFieldTrial("QUIC", "Enabled"); @@ -1077,7 +1077,7 @@ TEST_P(NetworkSessionConfiguratorWithQuicVersionTest, std::string quic_versions = quic::ParsedQuicVersionToString(version_); std::map<std::string, std::string> field_trial_params; field_trial_params["quic_version"] = quic_versions; - field_trial_params["obsolete_versions_allowed"] = "true"; + field_trial_params["obsolete_versions_allowed2"] = "true"; variations::AssociateVariationParams("QUIC", "Enabled", field_trial_params); base::FieldTrialList::CreateFieldTrial("QUIC", "Enabled"); ParseFieldTrials(); @@ -1122,7 +1122,7 @@ TEST_P(NetworkSessionConfiguratorWithQuicVersionTest, quic::ParsedQuicVersionToString(good_version); std::map<std::string, std::string> field_trial_params; field_trial_params["quic_version"] = quic_versions; - field_trial_params["obsolete_versions_allowed"] = "true"; + field_trial_params["obsolete_versions_allowed2"] = "true"; variations::AssociateVariationParams("QUIC", "Enabled", field_trial_params); base::FieldTrialList::CreateFieldTrial("QUIC", "Enabled"); ParseFieldTrials(); |