Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(106)

Side by Side Diff: net/url_request/url_request_job.cc

Issue 2334623003: Store net::ProxyServer in HttpResponseInfo object (Closed)
Patch Set: Rebased Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/url_request/url_request_job.h" 5 #include "net/url_request/url_request_job.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 11 matching lines...) Expand all
22 #include "net/base/host_port_pair.h" 22 #include "net/base/host_port_pair.h"
23 #include "net/base/io_buffer.h" 23 #include "net/base/io_buffer.h"
24 #include "net/base/load_flags.h" 24 #include "net/base/load_flags.h"
25 #include "net/base/load_states.h" 25 #include "net/base/load_states.h"
26 #include "net/base/net_errors.h" 26 #include "net/base/net_errors.h"
27 #include "net/base/network_delegate.h" 27 #include "net/base/network_delegate.h"
28 #include "net/filter/filter.h" 28 #include "net/filter/filter.h"
29 #include "net/http/http_response_headers.h" 29 #include "net/http/http_response_headers.h"
30 #include "net/log/net_log_event_type.h" 30 #include "net/log/net_log_event_type.h"
31 #include "net/nqe/network_quality_estimator.h" 31 #include "net/nqe/network_quality_estimator.h"
32 #include "net/proxy/proxy_server.h"
32 #include "net/url_request/url_request_context.h" 33 #include "net/url_request/url_request_context.h"
33 34
34 namespace net { 35 namespace net {
35 36
36 namespace { 37 namespace {
37 38
38 // Callback for TYPE_URL_REQUEST_FILTERS_SET net-internals event. 39 // Callback for TYPE_URL_REQUEST_FILTERS_SET net-internals event.
39 std::unique_ptr<base::Value> FiltersSetCallback( 40 std::unique_ptr<base::Value> FiltersSetCallback(
40 Filter* filter, 41 Filter* filter,
41 NetLogCaptureMode /* capture_mode */) { 42 NetLogCaptureMode /* capture_mode */) {
(...skipping 759 matching lines...) Expand 10 before | Expand all | Expand 10 after
801 } 802 }
802 803
803 void URLRequestJob::DestroyFilters() { 804 void URLRequestJob::DestroyFilters() {
804 filter_.reset(); 805 filter_.reset();
805 } 806 }
806 807
807 const URLRequestStatus URLRequestJob::GetStatus() { 808 const URLRequestStatus URLRequestJob::GetStatus() {
808 return request_->status(); 809 return request_->status();
809 } 810 }
810 811
811 void URLRequestJob::SetProxyServer(const HostPortPair& proxy_server) { 812 void URLRequestJob::SetProxyServer(const ProxyServer& proxy_server) {
812 request_->proxy_server_ = proxy_server; 813 request_->proxy_server_ = proxy_server;
813 } 814 }
814 815
815 Error URLRequestJob::ReadRawDataForFilter(int* bytes_read) { 816 Error URLRequestJob::ReadRawDataForFilter(int* bytes_read) {
816 Error error = ERR_FAILED; 817 Error error = ERR_FAILED;
817 DCHECK(bytes_read); 818 DCHECK(bytes_read);
818 DCHECK(filter_.get()); 819 DCHECK(filter_.get());
819 820
820 *bytes_read = 0; 821 *bytes_read = 0;
821 822
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
994 int64_t total_sent_bytes = GetTotalSentBytes(); 995 int64_t total_sent_bytes = GetTotalSentBytes();
995 DCHECK_GE(total_sent_bytes, last_notified_total_sent_bytes_); 996 DCHECK_GE(total_sent_bytes, last_notified_total_sent_bytes_);
996 if (total_sent_bytes > last_notified_total_sent_bytes_) { 997 if (total_sent_bytes > last_notified_total_sent_bytes_) {
997 network_delegate_->NotifyNetworkBytesSent( 998 network_delegate_->NotifyNetworkBytesSent(
998 request_, total_sent_bytes - last_notified_total_sent_bytes_); 999 request_, total_sent_bytes - last_notified_total_sent_bytes_);
999 } 1000 }
1000 last_notified_total_sent_bytes_ = total_sent_bytes; 1001 last_notified_total_sent_bytes_ = total_sent_bytes;
1001 } 1002 }
1002 1003
1003 } // namespace net 1004 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698