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

net/http/http_stream_factory_impl_job.cc

Index: net/http/http_stream_factory_impl_job.cc
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
index 8729dfbba293736b550fd70027c9852804520ffa..266966fd43d3a0a75e5b21e1c471f4dd3d100164 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -91,6 +91,7 @@ HttpStreamFactoryImpl::Job::Job(HttpStreamFactoryImpl* stream_factory,
       using_ssl_(false),
       using_spdy_(false),
       using_quic_(false),
+      using_quic_proxy_(false),
       quic_request_(session_->quic_stream_factory()),
       using_existing_quic_session_(false),
       spdy_certificate_error_(OK),
@@ -747,11 +748,20 @@ int HttpStreamFactoryImpl::Job::DoInitConnection() {
   if (ShouldForceQuic())
     using_quic_ = true;
 
-  if (proxy_info_.is_quic())
+  if (using_quic_) {
+    DCHECK(session_->params().enable_quic);
+  }
+
+  if (proxy_info_.is_quic()) {
     using_quic_ = true;
+    using_quic_proxy_ = true;
+  }
 
   if (using_quic_) {
-    DCHECK(session_->params().enable_quic);
+    if (using_quic_proxy_) {
+      DCHECK(session_->params().enable_quic_proxy);

[bengr, 2015/02/07 01:48:48]

I'm confused. I thought we were going to DCHECK that enable_quic OR
enable_quic_proxy is true.

[Ryan Hamilton, 2015/02/08 16:56:36]

That was what I thought too.

[tbansal1, 2015/02/10 19:46:04]

IIUC, this is stricter than the enable_quic OR enable_quic_proxy test.

+    }

[bengr, 2015/02/07 01:48:48]

Remove curly braces.

[tbansal1, 2015/02/10 19:46:04]

Done.

+
     if (proxy_info_.is_quic() && !request_info_.url.SchemeIs("http")) {
       NOTREACHED();
       // TODO(rch): support QUIC proxies for HTTPS urls.