Index: net/url_request/url_request_job.cc |
diff --git a/net/url_request/url_request_job.cc b/net/url_request/url_request_job.cc |
index ce58e6a7848e2009df13c05e6e2a537f7a72f435..106cb8567f392999caba20625bfa83a254d3710c 100644 |
--- a/net/url_request/url_request_job.cc |
+++ b/net/url_request/url_request_job.cc |
@@ -27,7 +27,7 @@ namespace { |
// Callback for TYPE_URL_REQUEST_FILTERS_SET net-internals event. |
base::Value* FiltersSetCallback(Filter* filter, |
- NetLog::LogLevel /* log_level */) { |
+ NetLogCaptureMode /* capture_mode */) { |
base::DictionaryValue* event_params = new base::DictionaryValue(); |
event_params->SetString("filters", filter->OrderedFilterList()); |
return event_params; |
@@ -698,7 +698,8 @@ bool URLRequestJob::ReadFilteredData(int* bytes_read) { |
} |
// If logging all bytes is enabled, log the filtered bytes read. |
- if (rv && request() && request()->net_log().IsLoggingBytes() && |
+ if (rv && request() && |
+ request()->net_log().GetCaptureMode().include_socket_bytes() && |
filtered_data_len > 0) { |
request()->net_log().AddByteTransferEvent( |
NetLog::TYPE_URL_REQUEST_JOB_FILTERED_BYTES_READ, |
@@ -789,7 +790,8 @@ void URLRequestJob::FollowRedirect(const RedirectInfo& redirect_info) { |
void URLRequestJob::OnRawReadComplete(int bytes_read) { |
DCHECK(raw_read_buffer_.get()); |
// If |filter_| is non-NULL, bytes will be logged after it is applied instead. |
- if (!filter_.get() && request() && request()->net_log().IsLoggingBytes() && |
+ if (!filter_.get() && request() && |
+ request()->net_log().GetCaptureMode().include_socket_bytes() && |
bytes_read > 0) { |
request()->net_log().AddByteTransferEvent( |
NetLog::TYPE_URL_REQUEST_JOB_BYTES_READ, |