URLRequest::Interceptor enhancements...

net/url_request/url_request_job.cc

 // Copyright (c) 2006-2008 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/string_util.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/auth.h"
@@ skipping 319 matching lines @@
       // Reference the |ref| directly out of the original URL to avoid a
       // malloc.
       replacements.SetRef(url.spec().data(),
                           url.parsed_for_possibly_invalid_spec().ref);
       new_location = new_location.ReplaceComponents(replacements);
     }
 
     // Toggle this flag to true so the consumer can access response headers.
     // Then toggle it back if we choose to follow the redirect.
     has_handled_response_ = true;
-    request_->delegate()->OnReceivedRedirect(request_, new_location);
+    request_->ReceivedRedirect(new_location);
 
-    // Ensure that the request wasn't destroyed in OnReceivedRedirect
+    // Ensure that the request wasn't detached or destroyed in ReceivedRedirect
     if (!request_ || !request_->delegate())
       return;
 
     // If we were not cancelled, then follow the redirect.
     if (request_->status().is_success()) {
       has_handled_response_ = false;
       FollowRedirect(new_location, http_status_code);
       return;
     }
   } else if (NeedsAuth()) {
@@ skipping 12 matching lines @@
   if (request_->status().is_success())
     SetupFilter();
 
   if (!filter_.get()) {
     std::string content_length;
     request_->GetResponseHeaderByName("content-length", &content_length);
     if (!content_length.empty())
       expected_content_size_ = StringToInt64(content_length);
   }
 
-  request_->delegate()->OnResponseStarted(request_);
+  request_->ResponseStarted();
 }
 
 void URLRequestJob::NotifyStartError(const URLRequestStatus &status) {
   DCHECK(!has_handled_response_);
   has_handled_response_ = true;
   if (request_) {
     request_->set_status(status);
-    if (request_->delegate())
-      request_->delegate()->OnResponseStarted(request_);
+    request_->ResponseStarted();
   }
 }
 
 void URLRequestJob::NotifyReadComplete(int bytes_read) {
   if (!request_ || !request_->delegate())
     return;  // The request was destroyed, so there is no more work to do.
 
   // TODO(darin): Bug 1004233. Re-enable this test once all of the chrome
   // unit_tests have been fixed to not trip this.
   //DCHECK(!request_->status().is_io_pending());
@@ skipping 80 matching lines @@
   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.
       request_->delegate()->OnReadCompleted(request_, -1);
     } else {
       has_handled_response_ = true;
-      request_->delegate()->OnResponseStarted(request_);
+      request_->ResponseStarted();
     }
   }
 }
 
 void URLRequestJob::NotifyCanceled() {
   if (!done_) {
     NotifyDone(URLRequestStatus(URLRequestStatus::CANCELED,
                                 net::ERR_ABORTED));
   }
 }
 
+void URLRequestJob::NotifyRestartRequired() {
+  DCHECK(!has_handled_response_);
+  if (GetStatus().status() != URLRequestStatus::CANCELED)
+    request_->Restart();
+}
+
 bool URLRequestJob::FilterHasData() {
     return filter_.get() && filter_->stream_data_len();
 }
 
 void URLRequestJob::FollowRedirect(const GURL& location,
                                    int http_status_code) {
   g_url_request_job_tracker.OnJobRedirect(this, location, http_status_code);
   Kill();
   // Kill could have notified the Delegate and destroyed the request.
   if (!request_)
@@ skipping 18 matching lines @@
     return request_->status();
   // If the request is gone, we must be cancelled.
   return URLRequestStatus(URLRequestStatus::CANCELED,
                           net::ERR_ABORTED);
 }
 
 void URLRequestJob::SetStatus(const URLRequestStatus &status) {
   if (request_)
     request_->set_status(status);
 }