OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "net/http/http_stream_factory_impl_job.h" | 5 #include "net/http/http_stream_factory_impl_job.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 725 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
736 if (proxy_info_.is_quic() && !request_info_.url.SchemeIs("http")) { | 736 if (proxy_info_.is_quic() && !request_info_.url.SchemeIs("http")) { |
737 NOTREACHED(); | 737 NOTREACHED(); |
738 // TODO(rch): support QUIC proxies for HTTPS urls. | 738 // TODO(rch): support QUIC proxies for HTTPS urls. |
739 return ERR_NOT_IMPLEMENTED; | 739 return ERR_NOT_IMPLEMENTED; |
740 } | 740 } |
741 HostPortPair destination = proxy_info_.is_quic() ? | 741 HostPortPair destination = proxy_info_.is_quic() ? |
742 proxy_info_.proxy_server().host_port_pair() : origin_; | 742 proxy_info_.proxy_server().host_port_pair() : origin_; |
743 next_state_ = STATE_INIT_CONNECTION_COMPLETE; | 743 next_state_ = STATE_INIT_CONNECTION_COMPLETE; |
744 bool secure_quic = using_ssl_ || proxy_info_.is_quic(); | 744 bool secure_quic = using_ssl_ || proxy_info_.is_quic(); |
745 int rv = quic_request_.Request( | 745 int rv = quic_request_.Request( |
746 destination, secure_quic, request_info_.method, net_log_, io_callback_); | 746 destination, secure_quic, request_info_.privacy_mode, |
| 747 request_info_.method, net_log_, io_callback_); |
747 if (rv != OK) { | 748 if (rv != OK) { |
748 // OK, there's no available QUIC session. Let |waiting_job_| resume | 749 // OK, there's no available QUIC session. Let |waiting_job_| resume |
749 // if it's paused. | 750 // if it's paused. |
750 if (waiting_job_) { | 751 if (waiting_job_) { |
751 waiting_job_->Resume(this); | 752 waiting_job_->Resume(this); |
752 waiting_job_ = NULL; | 753 waiting_job_ = NULL; |
753 } | 754 } |
754 } | 755 } |
755 return rv; | 756 return rv; |
756 } | 757 } |
(...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1464 (net::LOAD_MAIN_FRAME | net::LOAD_SUB_FRAME | net::LOAD_PREFETCH | | 1465 (net::LOAD_MAIN_FRAME | net::LOAD_SUB_FRAME | net::LOAD_PREFETCH | |
1465 net::LOAD_IS_DOWNLOAD)) { | 1466 net::LOAD_IS_DOWNLOAD)) { |
1466 // Avoid pipelining resources that may be streamed for a long time. | 1467 // Avoid pipelining resources that may be streamed for a long time. |
1467 return false; | 1468 return false; |
1468 } | 1469 } |
1469 return stream_factory_->http_pipelined_host_pool_.IsKeyEligibleForPipelining( | 1470 return stream_factory_->http_pipelined_host_pool_.IsKeyEligibleForPipelining( |
1470 *http_pipelining_key_.get()); | 1471 *http_pipelining_key_.get()); |
1471 } | 1472 } |
1472 | 1473 |
1473 } // namespace net | 1474 } // namespace net |
OLD | NEW |