| 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 3757475e955892dbdd9e19471545b429cafc4888..bbc72e1089b9637aa5067e0382740f44445f74e0 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;
|
| @@ -769,7 +769,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,
|
| @@ -870,7 +871,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,
|
|
|