Skip to content

GitLab

T
tangled
Commit db576145 authored by Zhongyi Shi's avatar Zhongyi Shi Committed by Commit Bot
Browse files
Options

Deprecate session params configuration for connection migration v1. 

Bug: 843299
Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I55bac965509f9576b30ad5e872f6e127bae8f661
Reviewed-on: https://chromium-review.googlesource.com/1060285Reviewed-by: default avatarMisha Efimov <mef@chromium.org>
Reviewed-by: default avatarRyan Hamilton <rch@chromium.org>
Commit-Queue: Zhongyi Shi <zhongyi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#559298}
parent 1a5b5c3e
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 113 deletions
components/cronet/url_request_context_config.cc
View file @ db576145
......@@ -60,8 +60,6 @@ const char kQuicMaxIdleTimeBeforeCryptoHandshakeSeconds[] =
"max_idle_time_before_crypto_handshake_seconds";
const char kQuicCloseSessionsOnIpChange[] = "close_sessions_on_ip_change";
const char kQuicAllowServerMigration[] = "allow_server_migration";
const char kQuicMigrateSessionsOnNetworkChange[] =
"migrate_sessions_on_network_change";
const char kQuicMigrateSessionsOnNetworkChangeV2[] =
"migrate_sessions_on_network_change_v2";
const char kQuicMaxTimeOnNonDefaultNetworkSeconds[] =
......@@ -69,7 +67,6 @@ const char kQuicMaxTimeOnNonDefaultNetworkSeconds[] =
const char kQuicMaxMigrationsToNonDefaultNetworkOnPathDegrading[] =
"max_migrations_to_non_default_network_on_path_degrading";
const char kQuicUserAgentId[] = "user_agent_id";
const char kQuicMigrateSessionsEarly[] = "migrate_sessions_early";
const char kQuicMigrateSessionsEarlyV2[] = "migrate_sessions_early_v2";
const char kQuicDisableBidirectionalStreams[] =
"quic_disable_bidirectional_streams";
......@@ -294,20 +291,6 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions(
quic_allow_server_migration;
}
bool quic_migrate_sessions_on_network_change = false;
if (quic_args->GetBoolean(kQuicMigrateSessionsOnNetworkChange,
&quic_migrate_sessions_on_network_change)) {
session_params->quic_migrate_sessions_on_network_change =
quic_migrate_sessions_on_network_change;
}
bool quic_migrate_sessions_early = false;
if (quic_args->GetBoolean(kQuicMigrateSessionsEarly,
&quic_migrate_sessions_early)) {
session_params->quic_migrate_sessions_early =
quic_migrate_sessions_early;
}
std::string quic_user_agent_id;
if (quic_args->GetString(kQuicUserAgentId, &quic_user_agent_id)) {
session_params->quic_user_agent_id = quic_user_agent_id;
......
components/cronet/url_request_context_config_unittest.cc
View file @ db576145
......@@ -188,60 +188,6 @@ TEST(URLRequestContextConfigTest, SetQuicServerMigrationOptions) {
EXPECT_TRUE(params->quic_allow_server_migration);
}
TEST(URLRequestContextConfigTest, SetQuicConnectionMigrationOptions) {
base::test::ScopedTaskEnvironment scoped_task_environment_(
base::test::ScopedTaskEnvironment::MainThreadType::IO);
URLRequestContextConfig config(
// Enable QUIC.
true,
// QUIC User Agent ID.
"Default QUIC User Agent ID",
// Enable SPDY.
true,
// Enable Brotli.
false,
// Type of http cache.
URLRequestContextConfig::HttpCacheType::DISK,
// Max size of http cache in bytes.
1024000,
// Disable caching for HTTP responses. Other information may be stored in
// the cache.
false,
// Storage path for http cache and cookie storage.
"/data/data/org.chromium.net/app_cronet_test/test_storage",
// Accept-Language request header field.
"foreign-language",
// User-Agent request header field.
"fake agent",
// JSON encoded experimental options.
"{\"QUIC\":{\"migrate_sessions_on_network_change\":true,"
"\"migrate_sessions_early\":true}}",
// MockCertVerifier to use for testing purposes.
std::unique_ptr<net::CertVerifier>(),
// Enable network quality estimator.
false,
// Enable Public Key Pinning bypass for local trust anchors.
true,
// Certificate verifier cache data.
"");
net::URLRequestContextBuilder builder;
net::NetLog net_log;
config.ConfigureURLRequestContextBuilder(&builder, &net_log);
// Set a ProxyConfigService to avoid DCHECK failure when building.
builder.set_proxy_config_service(
std::make_unique<net::ProxyConfigServiceFixed>(
net::ProxyConfigWithAnnotation::CreateDirect()));
std::unique_ptr<net::URLRequestContext> context(builder.Build());
const net::HttpNetworkSession::Params* params =
context->GetNetworkSessionParams();
EXPECT_FALSE(params->quic_close_sessions_on_ip_change);
EXPECT_TRUE(params->quic_migrate_sessions_on_network_change);
EXPECT_TRUE(params->quic_migrate_sessions_early);
}
TEST(URLRequestContextConfigTest, SetQuicConnectionMigrationV2Options) {
base::test::ScopedTaskEnvironment scoped_task_environment_(
base::test::ScopedTaskEnvironment::MainThreadType::IO);
......
components/network_session_configurator/browser/network_session_configurator.cc
View file @ db576145
......@@ -270,20 +270,6 @@ bool ShouldQuicConnectUsingDefaultNetwork(
"true");
}
bool ShouldQuicMigrateSessionsOnNetworkChange(
const VariationParameters& quic_trial_params) {
return base::LowerCaseEqualsASCII(
GetVariationParam(quic_trial_params,
"migrate_sessions_on_network_change"),
"true");
}
bool ShouldQuicMigrateSessionsEarly(
const VariationParameters& quic_trial_params) {
return base::LowerCaseEqualsASCII(
GetVariationParam(quic_trial_params, "migrate_sessions_early"), "true");
}
bool ShouldQuicMigrateSessionsOnNetworkChangeV2(
const VariationParameters& quic_trial_params) {
return base::LowerCaseEqualsASCII(
......@@ -421,10 +407,6 @@ void ConfigureQuicParams(base::StringPiece quic_trial_group,
ShouldQuicHeadersIncludeH2StreamDependencies(quic_trial_params);
params->quic_connect_using_default_network =
ShouldQuicConnectUsingDefaultNetwork(quic_trial_params);
params->quic_migrate_sessions_on_network_change =
ShouldQuicMigrateSessionsOnNetworkChange(quic_trial_params);
params->quic_migrate_sessions_early =
ShouldQuicMigrateSessionsEarly(quic_trial_params);
params->quic_migrate_sessions_on_network_change_v2 =
ShouldQuicMigrateSessionsOnNetworkChangeV2(quic_trial_params);
params->quic_migrate_sessions_early_v2 =
......
components/network_session_configurator/browser/network_session_configurator_unittest.cc
View file @ db576145
......@@ -311,18 +311,6 @@ TEST_F(NetworkSessionConfiguratorTest,
EXPECT_TRUE(params_.quic_connect_using_default_network);
}
TEST_F(NetworkSessionConfiguratorTest,
QuicMigrateSessionsOnNetworkChangeFromFieldTrialParams) {
std::map<std::string, std::string> field_trial_params;
field_trial_params["migrate_sessions_on_network_change"] = "true";
variations::AssociateVariationParams("QUIC", "Enabled", field_trial_params);
base::FieldTrialList::CreateFieldTrial("QUIC", "Enabled");
ParseFieldTrials();
EXPECT_TRUE(params_.quic_migrate_sessions_on_network_change);
}
TEST_F(NetworkSessionConfiguratorTest,
QuicMigrateSessionsOnNetworkChangeV2FromFieldTrialParams) {
std::map<std::string, std::string> field_trial_params;
......@@ -335,18 +323,6 @@ TEST_F(NetworkSessionConfiguratorTest,
EXPECT_TRUE(params_.quic_migrate_sessions_on_network_change_v2);
}
TEST_F(NetworkSessionConfiguratorTest,
QuicMigrateSessionsEarlyFromFieldTrialParams) {
std::map<std::string, std::string> field_trial_params;
field_trial_params["migrate_sessions_early"] = "true";
variations::AssociateVariationParams("QUIC", "Enabled", field_trial_params);
base::FieldTrialList::CreateFieldTrial("QUIC", "Enabled");
ParseFieldTrials();
EXPECT_TRUE(params_.quic_migrate_sessions_early);
}
TEST_F(NetworkSessionConfiguratorTest,
QuicMigrateSessionsEarlyV2FromFieldTrialParams) {
std::map<std::string, std::string> field_trial_params;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment