Commit 3cc27a4a authored by Julia Tuttle's avatar Julia Tuttle Committed by Commit Bot

Cronet: Convert options test to use base::Value

Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I559908461026784530214507380cda6289141cf6
Reviewed-on: https://chromium-review.googlesource.com/1015660
Commit-Queue: Julia Tuttle <juliatuttle@chromium.org>
Reviewed-by: default avatarAndrei Kapishnikov <kapishnikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553579}
parent 2aea307c
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <memory> #include <memory>
#include "base/json/json_writer.h"
#include "base/test/scoped_task_environment.h" #include "base/test/scoped_task_environment.h"
#include "base/values.h" #include "base/values.h"
#include "net/cert/cert_verifier.h" #include "net/cert/cert_verifier.h"
...@@ -25,6 +26,26 @@ TEST(URLRequestContextConfigTest, TestExperimentalOptionParsing) { ...@@ -25,6 +26,26 @@ TEST(URLRequestContextConfigTest, TestExperimentalOptionParsing) {
base::test::ScopedTaskEnvironment scoped_task_environment_( base::test::ScopedTaskEnvironment scoped_task_environment_(
base::test::ScopedTaskEnvironment::MainThreadType::IO); base::test::ScopedTaskEnvironment::MainThreadType::IO);
// Create JSON for experimental options.
base::DictionaryValue options;
options.SetPath({"QUIC", "max_server_configs_stored_in_properties"},
base::Value(2));
options.SetPath({"QUIC", "user_agent_id"}, base::Value("Custom QUIC UAID"));
options.SetPath({"QUIC", "idle_connection_timeout_seconds"},
base::Value(300));
options.SetPath({"QUIC", "close_sessions_on_ip_change"}, base::Value(true));
options.SetPath({"QUIC", "race_cert_verification"}, base::Value(true));
options.SetPath({"QUIC", "connection_options"}, base::Value("TIME,TBBR,REJ"));
options.SetPath({"AsyncDNS", "enable"}, base::Value(true));
options.SetPath({"NetworkErrorLogging", "enable"}, base::Value(true));
options.SetPath({"UnknownOption", "foo"}, base::Value(true));
options.SetPath({"HostResolverRules", "host_resolver_rules"},
base::Value("MAP * 127.0.0.1"));
// See http://crbug.com/696569.
options.SetKey("disable_ipv6_on_wifi", base::Value(true));
std::string options_json;
EXPECT_TRUE(base::JSONWriter::Write(options, &options_json));
URLRequestContextConfig config( URLRequestContextConfig config(
// Enable QUIC. // Enable QUIC.
true, true,
...@@ -48,19 +69,7 @@ TEST(URLRequestContextConfigTest, TestExperimentalOptionParsing) { ...@@ -48,19 +69,7 @@ TEST(URLRequestContextConfigTest, TestExperimentalOptionParsing) {
// User-Agent request header field. // User-Agent request header field.
"fake agent", "fake agent",
// JSON encoded experimental options. // JSON encoded experimental options.
"{\"QUIC\":{\"max_server_configs_stored_in_properties\":2," options_json,
"\"user_agent_id\":\"Custom QUIC UAID\","
"\"idle_connection_timeout_seconds\":300,"
"\"close_sessions_on_ip_change\":true,"
"\"race_cert_verification\":true,"
"\"connection_options\":\"TIME,TBBR,REJ\"},"
"\"AsyncDNS\":{\"enable\":true},"
"\"NetworkErrorLogging\":{\"enable\":true},"
"\"UnknownOption\":{\"foo\":true},"
"\"HostResolverRules\":{\"host_resolver_rules\":"
"\"MAP * 127.0.0.1\"},"
// See http://crbug.com/696569.
"\"disable_ipv6_on_wifi\":true}",
// MockCertVerifier to use for testing purposes. // MockCertVerifier to use for testing purposes.
std::unique_ptr<net::CertVerifier>(), std::unique_ptr<net::CertVerifier>(),
// Enable network quality estimator. // Enable network quality estimator.
......
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