Send fatal proxy errors to the network delegate.

net/url_request/url_request_job.cc

 // Copyright (c) 2010 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_job.h"
 
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "net/base/auth.h"
 #include "net/base/io_buffer.h"
 #include "net/base/load_flags.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_errors.h"
+#include "net/http/http_network_delegate.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
+#include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_job_metrics.h"
 #include "net/url_request/url_request_job_tracker.h"
 
 using base::Time;
 using base::TimeTicks;
 
 namespace net {
 
 // Buffer size allocated when de-compressing data.
 // static
@@ skipping 495 matching lines @@
 
   prefilter_bytes_read_ += bytes_read;
   if (filter_.get()) {
     // Tell the filter that it has more data
     FilteredDataRead(bytes_read);
 
     // Filter the data.
     int filter_bytes_read = 0;
     if (ReadFilteredData(&filter_bytes_read)) {
       postfilter_bytes_read_ += filter_bytes_read;
+      if (request_->context() && request_->context()->network_delegate()) {
+        request_->context()->network_delegate()->OnReadCompleted(
+            request_, filter_bytes_read);
+      }
       request_->delegate()->OnReadCompleted(request_, filter_bytes_read);
     }
   } else {
     postfilter_bytes_read_ += bytes_read;
+    if (request_->context() && request_->context()->network_delegate()) {
+      request_->context()->network_delegate()->OnReadCompleted(
+          request_, bytes_read);
+    }
     request_->delegate()->OnReadCompleted(request_, bytes_read);
   }
 }
 
 void URLRequestJob::NotifyStartError(const URLRequestStatus &status) {
   DCHECK(!has_handled_response_);
   has_handled_response_ = true;
   if (request_) {
     request_->set_status(status);
     request_->ResponseStarted();
@@ skipping 51 matching lines @@
 
 void URLRequestJob::CompleteNotifyDone() {
   // Check if we should notify the delegate that we're done because of an error.
   if (request_ &&
       !request_->status().is_success() &&
       request_->delegate()) {
     // We report the error differently depending on whether we've called
     // OnResponseStarted yet.
     if (has_handled_response_) {
       // We signal the error by calling OnReadComplete with a bytes_read of -1.
+      if (request_->context() && request_->context()->network_delegate())
+        request_->context()->network_delegate()->OnReadCompleted(request_, -1);
       request_->delegate()->OnReadCompleted(request_, -1);
     } else {
       has_handled_response_ = true;
       request_->ResponseStarted();
     }
   }
 }
 
 void URLRequestJob::NotifyCanceled() {
   if (!done_) {
@@ skipping 309 matching lines @@
 
   if (is_compressed_) {
     COMPRESSION_HISTOGRAM("NoProxy.BytesBeforeCompression", compressed_B);
     COMPRESSION_HISTOGRAM("NoProxy.BytesAfterCompression", decompressed_B);
   } else {
     COMPRESSION_HISTOGRAM("NoProxy.ShouldHaveBeenCompressed", decompressed_B);
   }
 }
 
 }  // namespace net