Enable QUIC for proxies based on Finch config and command line switch.

net/url_request/url_request_context_builder.cc

Index: net/url_request/url_request_context_builder.cc
diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
index 303dd1761bfd0312645c30b2e2733390f233effe..19189d9cbf60e615c9218ab4fd83f1998bf86eae 100644
--- a/net/url_request/url_request_context_builder.cc
+++ b/net/url_request/url_request_context_builder.cc
@@ -185,7 +185,8 @@ URLRequestContextBuilder::HttpNetworkSessionParams::HttpNetworkSessionParams()
       testing_fixed_https_port(0),
       next_protos(NextProtosDefaults()),
       use_alternate_protocols(true),
-      enable_quic(false) {
+      enable_quic(false),
+      enable_quic_for_proxies(false) {
 }
 
 URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams()
@@ -224,11 +225,15 @@ void URLRequestContextBuilder::DisableHttpCache() {
   http_cache_params_ = HttpCacheParams();
 }
 
-void URLRequestContextBuilder::SetSpdyAndQuicEnabled(bool spdy_enabled,
-                                                     bool quic_enabled) {
+void URLRequestContextBuilder::SetSpdyAndQuicEnabled(
+    bool spdy_enabled,
+    bool quic_enabled,
+    bool quic_enabled_for_proxies) {
   http_network_session_params_.next_protos =
       NextProtosWithSpdyAndQuic(spdy_enabled, quic_enabled);
   http_network_session_params_.enable_quic = quic_enabled;
+  http_network_session_params_.enable_quic_for_proxies =
+      quic_enabled_for_proxies;
 }
 
 void URLRequestContextBuilder::SetCookieAndChannelIdStores(
@@ -358,6 +363,8 @@ URLRequestContext* URLRequestContextBuilder::Build() {
       http_network_session_params_.trusted_spdy_proxy;
   network_session_params.next_protos = http_network_session_params_.next_protos;
   network_session_params.enable_quic = http_network_session_params_.enable_quic;
+  network_session_params.enable_quic_for_proxies =
+      http_network_session_params_.enable_quic_for_proxies;
   network_session_params.quic_connection_options =
       http_network_session_params_.quic_connection_options;