1 files changed, 16 insertions, 0 deletions
diff --git a/components/cronet/url_request_context_config.cc b/components/cronet/url_request_context_config.cc
index 4627628..49af1af 100644
--- a/components/cronet/url_request_context_config.cc
+++ b/components/cronet/url_request_context_config.cc
@@ -41,6 +41,8 @@ const char kQuicHostWhitelist[] = "host_whitelist";
 const char kQuicCloseSessionsOnIpChange[] = "close_sessions_on_ip_change";
 const char kQuicMigrateSessionsOnNetworkChange[] =
     "migrate_sessions_on_network_change";
+const char kQuicPreferAes[] = "prefer_aes";
+const char kQuicUserAgentId[] = "user_agent_id";
 
 // AsyncDNS experiment dictionary name.
 const char kAsyncDnsFieldTrialName[] = "AsyncDNS";
@@ -148,6 +150,16 @@ void ParseAndSetExperimentalOptions(
       context_builder->set_quic_migrate_sessions_on_network_change(
           quic_migrate_sessions_on_network_change);
     }
+
+    bool quic_prefer_aes = false;
+    if (quic_args->GetBoolean(kQuicPreferAes, &quic_prefer_aes)) {
+      context_builder->set_quic_prefer_aes(quic_prefer_aes);
+    }
+
+    std::string quic_user_agent_id;
+    if (quic_args->GetString(kQuicUserAgentId, &quic_user_agent_id)) {
+      context_builder->set_quic_user_agent_id(quic_user_agent_id);
+    }
   }
 
   const base::DictionaryValue* async_dns_args = nullptr;
@@ -187,6 +199,7 @@ URLRequestContextConfig::Pkp::~Pkp() {}
 
 URLRequestContextConfig::URLRequestContextConfig(
     bool enable_quic,
+    const std::string& quic_user_agent_id,
     bool enable_spdy,
     bool enable_sdch,
     HttpCacheType http_cache,
@@ -201,6 +214,7 @@ URLRequestContextConfig::URLRequestContextConfig(
     const std::string& data_reduction_secure_proxy_check_url,
     scoped_ptr<net::CertVerifier> mock_cert_verifier)
     : enable_quic(enable_quic),
+      quic_user_agent_id(quic_user_agent_id),
       enable_spdy(enable_spdy),
       enable_sdch(enable_sdch),
       http_cache(http_cache),
@@ -239,6 +253,8 @@ void URLRequestContextConfig::ConfigureURLRequestContextBuilder(
   context_builder->set_user_agent(user_agent);
   context_builder->SetSpdyAndQuicEnabled(enable_spdy, enable_quic);
   context_builder->set_sdch_enabled(enable_sdch);
+  if (enable_quic)
+    context_builder->set_quic_user_agent_id(quic_user_agent_id);
 
   ParseAndSetExperimentalOptions(experimental_options, context_builder,
                                  net_log);