Use modified URLRequest::Read() and delegate methods in components/

components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.cc

 // Copyright 2014 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 "components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.h"
 
 #include <limits>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
@@ skipping 109 matching lines @@
     // If this ever triggers, then byte counts can no longer be safely stored in
     // 64-bit ints.
     NOTREACHED();
     return byte_count;
   }
   return static_cast<int64_t>(scaled_byte_count);
 }
 
 // Calculates the effective original content length of the |request|, accounting
 // for partial responses if necessary.
-int64_t CalculateEffectiveOCL(const net::URLRequest& request) {
+int64_t CalculateEffectiveOCL(const net::URLRequest& request, int net_error) {
   int64_t original_content_length_from_header =
       request.response_headers()->GetInt64HeaderValue(
           "x-original-content-length");
 
   if (original_content_length_from_header < 0)
     return request.received_response_content_length();
-  if (request.status().is_success())
+  if (net_error == net::OK)
     return original_content_length_from_header;
 
   int64_t content_length_from_header =
       request.response_headers()->GetContentLength();
 
   if (content_length_from_header < 0)
     return request.received_response_content_length();
   if (content_length_from_header == 0)
     return original_content_length_from_header;
 
   return ScaleByteCountByRatio(request.received_response_content_length(),
                                original_content_length_from_header,
                                content_length_from_header);
 }
 
 // Given a |request| that went through the Data Reduction Proxy, this function
 // estimates how many bytes would have been received if the response had been
 // received directly from the origin using HTTP/1.1 with a content length of
 // |adjusted_original_content_length|.
-int64_t EstimateOriginalReceivedBytes(const net::URLRequest& request) {
+int64_t EstimateOriginalReceivedBytes(const net::URLRequest& request,
+                                      int net_error) {
   if (request.was_cached() || !request.response_headers())
     return request.GetTotalReceivedBytes();
 
   // TODO(sclittle): Remove headers added by Data Reduction Proxy when computing
   // original size. http://crbug/535701.
   return request.response_headers()->raw_headers().size() +
-         CalculateEffectiveOCL(request);
+         CalculateEffectiveOCL(request, net_error);
 }
 
 }  // namespace
 
 namespace data_reduction_proxy {
 
 DataReductionProxyNetworkDelegate::DataReductionProxyNetworkDelegate(
     std::unique_ptr<net::NetworkDelegate> network_delegate,
     DataReductionProxyConfig* config,
     DataReductionProxyRequestOptions* request_options,
@@ skipping 116 matching lines @@
 
   if (data_reduction_proxy_request_options_) {
     data_reduction_proxy_request_options_->AddRequestHeader(headers);
   }
 }
 
 void DataReductionProxyNetworkDelegate::OnCompletedInternal(
     net::URLRequest* request,
     bool started) {
   DCHECK(request);
+  // TODO(maksims): remove this once OnCompletedInternal() has net_error in
+  // arguments.
+  int net_error = request->status().error();
+  DCHECK_NE(net::ERR_IO_PENDING, net_error);
   if (data_reduction_proxy_bypass_stats_)
-    data_reduction_proxy_bypass_stats_->OnUrlRequestCompleted(request, started);
+    data_reduction_proxy_bypass_stats_->OnUrlRequestCompleted(request, started,
+                                                              net_error);
 
   net::HttpRequestHeaders request_headers;
   if (data_reduction_proxy_io_data_ && request->response_headers() &&
       request->response_headers()->HasHeaderValue(
           chrome_proxy_header(), chrome_proxy_lo_fi_directive())) {
     data_reduction_proxy_io_data_->lofi_ui_service()->OnLoFiReponseReceived(
         *request, false);
   } else if (data_reduction_proxy_io_data_ && request->response_headers() &&
              request->response_headers()->HasHeaderValue(
                  chrome_proxy_header(),
@@ skipping 20 matching lines @@
   DataReductionProxyRequestType request_type = GetDataReductionProxyRequestType(
       *request, configurator_->GetProxyConfig(), *data_reduction_proxy_config_);
 
   // Determine the original content length if present.
   int64_t original_content_length =
       request->response_headers()
           ? request->response_headers()->GetInt64HeaderValue(
                 "x-original-content-length")
           : -1;
 
-  CalculateAndRecordDataUsage(*request, request_type, original_content_length);
+  CalculateAndRecordDataUsage(*request, request_type, original_content_length,
+                              net_error);
 
   RecordContentLength(*request, request_type, original_content_length);
 }
 
 void DataReductionProxyNetworkDelegate::CalculateAndRecordDataUsage(
     const net::URLRequest& request,
     DataReductionProxyRequestType request_type,
-    int64_t original_content_length) {
+    int64_t original_content_length,
+    int net_error) {
   DCHECK_LE(-1, original_content_length);
   int64_t data_used = request.GetTotalReceivedBytes();
 
   // Estimate how many bytes would have been used if the DataReductionProxy was
   // not used, and record the data usage.
   int64_t original_size = data_used;
 
   if (request_type == VIA_DATA_REDUCTION_PROXY)
-    original_size = EstimateOriginalReceivedBytes(request);
+    original_size = EstimateOriginalReceivedBytes(request, net_error);
 
   std::string mime_type;
   if (request.response_headers())
     request.response_headers()->GetMimeType(&mime_type);
 
   scoped_refptr<DataUseGroup> data_use_group =
       data_use_group_provider_
           ? data_use_group_provider_->GetDataUseGroup(&request)
           : nullptr;
   AccumulateDataUsage(data_used, original_size, request_type, data_use_group,
@@ skipping 74 matching lines @@
                                            request.url(),
                                            &data_reduction_proxy_info);
 }
 
 void DataReductionProxyNetworkDelegate::SetDataUseGroupProvider(
     std::unique_ptr<DataUseGroupProvider> data_use_group_provider) {
   data_use_group_provider_.reset(data_use_group_provider.release());
 }
 
 }  // namespace data_reduction_proxy