Kill URLRequestJobTracker.

net/url_request/url_request_job.cc

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 3073414d421426aa7e3b086300840e6069007db1..c597a055294c9ea0fce0d57831f3c47becb2446f 100644
--- a/net/url_request/url_request_job.cc
+++ b/net/url_request/url_request_job.cc
@@ -17,7 +17,6 @@
 #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_tracker.h"
 
 namespace net {
 
@@ -32,16 +31,12 @@ URLRequestJob::URLRequestJob(URLRequest* request)
       has_handled_response_(false),
       expected_content_size_(-1),
       deferred_redirect_status_code_(-1),
-      ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
-  g_url_request_job_tracker.AddNewJob(this);
-}
+      ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {}

[rvargas (doing something else), 2011/05/18 21:45:18]

nit: Could you move the closing bracket to the next line? I think we use that
pattern more often for methods that are not being declared at the same time. You
do the same at line 39, but line 36 has the more common pattern.

[willchan no longer on Chromium, 2011/05/18 23:55:55]

Done.

 
 void URLRequestJob::SetUpload(UploadData* upload) {
 }
 
-void URLRequestJob::SetExtraRequestHeaders(
-    const HttpRequestHeaders& headers) {
-}
+void URLRequestJob::SetExtraRequestHeaders(const HttpRequestHeaders& headers) {}
 
 void URLRequestJob::Kill() {
   // Make sure the request is notified that we are done.  We assume that the
@@ -203,10 +198,12 @@ HostPortPair URLRequestJob::GetSocketAddress() const {
   return HostPortPair();
 }
 
-URLRequestJob::~URLRequestJob() {
-  g_url_request_job_tracker.RemoveJob(this);
+void URLRequestJob::OnSuspend() {
+  Kill();
 }
 
+URLRequestJob::~URLRequestJob() {}
+
 void URLRequestJob::NotifyHeadersComplete() {
   if (!request_ || !request_->delegate())
     return;  // The request was destroyed, so there is no more work to do.
@@ -362,8 +359,6 @@ void URLRequestJob::NotifyDone(const URLRequestStatus &status) {
       request_->set_status(status);
   }
 
-  g_url_request_job_tracker.OnJobDone(this, status);
-
   if (request_ && request_->context() &&
       request_->context()->network_delegate()) {
     request_->context()->network_delegate()->NotifyCompleted(request_);
@@ -578,8 +573,6 @@ bool URLRequestJob::ReadRawDataHelper(IOBuffer* buf, int buf_size,
 }
 
 void URLRequestJob::FollowRedirect(const GURL& location, int http_status_code) {
-  g_url_request_job_tracker.OnJobRedirect(this, location, http_status_code);
-
   int rv = request_->Redirect(location, http_status_code);
   if (rv != OK)
     NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, rv));
@@ -596,8 +589,9 @@ void URLRequestJob::OnRawReadComplete(int bytes_read) {
 void URLRequestJob::RecordBytesRead(int bytes_read) {
   filter_input_byte_count_ += bytes_read;
   UpdatePacketReadTimes();  // Facilitate stats recording if it is active.
-  g_url_request_job_tracker.OnBytesRead(this, raw_read_buffer_->data(),
-                                        bytes_read);
+  const URLRequestContext* context = request_->context();
+  if (context && context->network_delegate())
+    context->network_delegate()->NotifyBytesRead(*request_, bytes_read);
 }
 
 bool URLRequestJob::FilterHasData() {