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

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

Issue 1059843002: Refactor NetLog::LogLevel --> NetLogCaptureMode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase again to fix a merge conflict Created 5 years, 8 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
« no previous file with comments | « net/url_request/url_request.cc ('k') | net/url_request/url_request_netlog_params.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/power_monitor/power_monitor.h" 10 #include "base/power_monitor/power_monitor.h"
11 #include "base/profiler/scoped_tracker.h" 11 #include "base/profiler/scoped_tracker.h"
12 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
13 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "net/base/auth.h" 15 #include "net/base/auth.h"
16 #include "net/base/host_port_pair.h" 16 #include "net/base/host_port_pair.h"
17 #include "net/base/io_buffer.h" 17 #include "net/base/io_buffer.h"
18 #include "net/base/load_states.h" 18 #include "net/base/load_states.h"
19 #include "net/base/net_errors.h" 19 #include "net/base/net_errors.h"
20 #include "net/base/network_delegate.h" 20 #include "net/base/network_delegate.h"
21 #include "net/filter/filter.h" 21 #include "net/filter/filter.h"
22 #include "net/http/http_response_headers.h" 22 #include "net/http/http_response_headers.h"
23 23
24 namespace net { 24 namespace net {
25 25
26 namespace { 26 namespace {
27 27
28 // Callback for TYPE_URL_REQUEST_FILTERS_SET net-internals event. 28 // Callback for TYPE_URL_REQUEST_FILTERS_SET net-internals event.
29 base::Value* FiltersSetCallback(Filter* filter, 29 base::Value* FiltersSetCallback(Filter* filter,
30 NetLog::LogLevel /* log_level */) { 30 NetLogCaptureMode /* capture_mode */) {
31 base::DictionaryValue* event_params = new base::DictionaryValue(); 31 base::DictionaryValue* event_params = new base::DictionaryValue();
32 event_params->SetString("filters", filter->OrderedFilterList()); 32 event_params->SetString("filters", filter->OrderedFilterList());
33 return event_params; 33 return event_params;
34 } 34 }
35 35
36 std::string ComputeMethodForRedirect(const std::string& method, 36 std::string ComputeMethodForRedirect(const std::string& method,
37 int http_status_code) { 37 int http_status_code) {
38 // For 303 redirects, all request methods except HEAD are converted to GET, 38 // For 303 redirects, all request methods except HEAD are converted to GET,
39 // as per the latest httpbis draft. The draft also allows POST requests to 39 // as per the latest httpbis draft. The draft also allows POST requests to
40 // be converted to GETs when following 301/302 redirects, for historical 40 // be converted to GETs when following 301/302 redirects, for historical
(...skipping 650 matching lines...) Expand 10 before | Expand all | Expand 10 after
691 } 691 }
692 default: { 692 default: {
693 NOTREACHED(); 693 NOTREACHED();
694 filter_needs_more_output_space_ = false; 694 filter_needs_more_output_space_ = false;
695 rv = false; 695 rv = false;
696 break; 696 break;
697 } 697 }
698 } 698 }
699 699
700 // If logging all bytes is enabled, log the filtered bytes read. 700 // If logging all bytes is enabled, log the filtered bytes read.
701 if (rv && request() && request()->net_log().IsLoggingBytes() && 701 if (rv && request() &&
702 request()->net_log().GetCaptureMode().include_socket_bytes() &&
702 filtered_data_len > 0) { 703 filtered_data_len > 0) {
703 request()->net_log().AddByteTransferEvent( 704 request()->net_log().AddByteTransferEvent(
704 NetLog::TYPE_URL_REQUEST_JOB_FILTERED_BYTES_READ, 705 NetLog::TYPE_URL_REQUEST_JOB_FILTERED_BYTES_READ,
705 filtered_data_len, filtered_read_buffer_->data()); 706 filtered_data_len, filtered_read_buffer_->data());
706 } 707 }
707 } else { 708 } else {
708 // we are done, or there is no data left. 709 // we are done, or there is no data left.
709 rv = true; 710 rv = true;
710 } 711 }
711 break; 712 break;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
782 783
783 void URLRequestJob::FollowRedirect(const RedirectInfo& redirect_info) { 784 void URLRequestJob::FollowRedirect(const RedirectInfo& redirect_info) {
784 int rv = request_->Redirect(redirect_info); 785 int rv = request_->Redirect(redirect_info);
785 if (rv != OK) 786 if (rv != OK)
786 NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, rv)); 787 NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, rv));
787 } 788 }
788 789
789 void URLRequestJob::OnRawReadComplete(int bytes_read) { 790 void URLRequestJob::OnRawReadComplete(int bytes_read) {
790 DCHECK(raw_read_buffer_.get()); 791 DCHECK(raw_read_buffer_.get());
791 // If |filter_| is non-NULL, bytes will be logged after it is applied instead. 792 // If |filter_| is non-NULL, bytes will be logged after it is applied instead.
792 if (!filter_.get() && request() && request()->net_log().IsLoggingBytes() && 793 if (!filter_.get() && request() &&
794 request()->net_log().GetCaptureMode().include_socket_bytes() &&
793 bytes_read > 0) { 795 bytes_read > 0) {
794 request()->net_log().AddByteTransferEvent( 796 request()->net_log().AddByteTransferEvent(
795 NetLog::TYPE_URL_REQUEST_JOB_BYTES_READ, 797 NetLog::TYPE_URL_REQUEST_JOB_BYTES_READ,
796 bytes_read, raw_read_buffer_->data()); 798 bytes_read, raw_read_buffer_->data());
797 } 799 }
798 800
799 if (bytes_read > 0) { 801 if (bytes_read > 0) {
800 RecordBytesRead(bytes_read); 802 RecordBytesRead(bytes_read);
801 } 803 }
802 raw_read_buffer_ = NULL; 804 raw_read_buffer_ = NULL;
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
861 // Alter the referrer if redirecting cross-origin (especially HTTP->HTTPS). 863 // Alter the referrer if redirecting cross-origin (especially HTTP->HTTPS).
862 redirect_info.new_referrer = 864 redirect_info.new_referrer =
863 ComputeReferrerForRedirect(request_->referrer_policy(), 865 ComputeReferrerForRedirect(request_->referrer_policy(),
864 request_->referrer(), 866 request_->referrer(),
865 redirect_info.new_url).spec(); 867 redirect_info.new_url).spec();
866 868
867 return redirect_info; 869 return redirect_info;
868 } 870 }
869 871
870 } // namespace net 872 } // namespace net
OLDNEW
« no previous file with comments | « net/url_request/url_request.cc ('k') | net/url_request/url_request_netlog_params.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698