Remove URLRequestJob::filter_input_byte_count_

net/url_request/url_request_http_job.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/url_request/url_request_http_job.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 96 matching lines @@
 bool URLRequestHttpJob::HttpFilterContext::IsCachedContent() const {
   return job_->is_cached_content_;
 }
 
 SdchManager::DictionarySet*
 URLRequestHttpJob::HttpFilterContext::SdchDictionariesAdvertised() const {
   return job_->dictionaries_advertised_.get();
 }
 
 int64 URLRequestHttpJob::HttpFilterContext::GetByteReadCount() const {
-  return job_->filter_input_byte_count();
+  return job_->prefilter_bytes_read();
 }
 
 int URLRequestHttpJob::HttpFilterContext::GetResponseCode() const {
   return job_->GetResponseCode();
 }
 
 const URLRequestContext*
 URLRequestHttpJob::HttpFilterContext::GetURLRequestContext() const {
   return job_->request() ? job_->request()->context() : NULL;
 }
@@ skipping 1257 matching lines @@
         << "The timer was reset before it was recorded.";
     return;
   }
   request_creation_time_ = base::Time::Now();
 }
 
 void URLRequestHttpJob::UpdatePacketReadTimes() {
   if (!packet_timing_enabled_)
     return;
 
-  if (filter_input_byte_count() <= bytes_observed_in_packets_) {
-    DCHECK_EQ(filter_input_byte_count(), bytes_observed_in_packets_);
-    return;  // No new bytes have arrived.
-  }
+  DCHECK_GT(prefilter_bytes_read(), bytes_observed_in_packets_);

[mmenke, 2015/04/10 21:48:02]

We never call UpdatePacketReadTimes() when we didn't actually read any data, so
the condition of this if was always false.

[Randy Smith (Not in Mondays), 2015/04/10 22:03:57]

Yeah, but it's part of the URLRequestJob -> subclass interface.   This doesn't
break anything *now*, but ... :-}.  Could you update the comment in
url_request_job.h to indicate that this function will only be called when bytes
have been read since the last call to it?

[mmenke, 2015/04/10 22:36:49]

Done.

 
   base::Time now(base::Time::Now());
   if (!bytes_observed_in_packets_)
     request_time_snapshot_ = now;
   final_packet_time_ = now;
 
-  bytes_observed_in_packets_ = filter_input_byte_count();
+  bytes_observed_in_packets_ = prefilter_bytes_read();
 }
 
 void URLRequestHttpJob::RecordPacketStats(
     FilterContext::StatisticSelector statistic) const {
   if (!packet_timing_enabled_ || (final_packet_time_ == base::Time()))
     return;
 
   base::TimeDelta duration = final_packet_time_ - request_time_snapshot_;
   switch (statistic) {
     case FilterContext::SDCH_DECODE: {
@@ skipping 71 matching lines @@
   return override_response_headers_.get() ?
              override_response_headers_.get() :
              transaction_->GetResponseInfo()->headers.get();
 }
 
 void URLRequestHttpJob::NotifyURLRequestDestroyed() {
   awaiting_callback_ = false;
 }
 
 }  // namespace net