Decouple URLRequestJob from URLRequestContext; access NetworkDelegate as a contructor parameter.

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 b384ace16b5ac73df375f4f7e8b13a7bf480ea71..bb5b369151c273ff774cfbc4eb29bec4eb85315a 100644
--- a/net/url_request/url_request_job.cc
+++ b/net/url_request/url_request_job.cc
@@ -17,11 +17,11 @@
 #include "net/base/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"
 
 namespace net {
 
-URLRequestJob::URLRequestJob(URLRequest* request)
+URLRequestJob::URLRequestJob(URLRequest* request,
+                             NetworkDelegate* network_delegate)
     : request_(request),
       done_(false),
       prefilter_bytes_read_(0),
@@ -32,6 +32,7 @@ URLRequestJob::URLRequestJob(URLRequest* request)
       has_handled_response_(false),
       expected_content_size_(-1),
       deferred_redirect_status_code_(-1),
+      network_delegate_(network_delegate),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   base::SystemMonitor* system_monitor = base::SystemMonitor::Get();
   if (system_monitor)
@@ -694,9 +695,8 @@ void URLRequestJob::RecordBytesRead(int bytes_read) {
            << " pre total = " << prefilter_bytes_read_
            << " post total = " << postfilter_bytes_read_;
   UpdatePacketReadTimes();  // Facilitate stats recording if it is active.
-  const URLRequestContext* context = request_->context();
-  if (context && context->network_delegate())

[willchan no longer on Chromium, 2012/06/13 19:07:33]

Is this safe? We're losing the NULL check on |context| in your new code. I don't
know if there's actually a case where context is NULL. Can you hit the
tryservers with this changelist?

[shalev, 2012/06/21 20:03:55]

Done.

-    context->network_delegate()->NotifyRawBytesRead(*request_, bytes_read);
+  if (network_delegate_)
+    network_delegate_->NotifyRawBytesRead(*request_, bytes_read);
 }
 
 bool URLRequestJob::FilterHasData() {