Remove some calls to URLRequestContext::network_delegate().

net/url_request/url_request_http_job.cc

Index: net/url_request/url_request_http_job.cc
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index b26812dfa397a0da4d29e81c727729fb94ec4c08..57180ba80cb8d4339c3690f60f6ad15d6a7d9c8f 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -82,7 +82,7 @@ class URLRequestHttpJob::HttpTransactionDelegateImpl
  public:
   explicit HttpTransactionDelegateImpl(URLRequest* request)
       : request_(request),
-        network_delegate_(request->context()->network_delegate()),
+        network_delegate_(request->network_delegate()),

[erikwright (departed), 2013/02/25 15:07:23]

In the various job implementations, the change should be adapted as follows:

1) The protocol handler should take a NetworkDelegate* as a parameter, and store
it as a member.
2) The URLRequestJob subclass should take a NetworkDelegate* as a parameter, and
store it as a member.
3) If there is still a static Factory function, it should fetch the
NetworkDelegate from the context (or request) and pass it to the Job subclass's
constructor.
4) Any objects created by the job (such as the HTTPTransactionDelegateImpl)
should accept the NetworkDelegate as a constructor parameter and receive it from
the job

         cache_active_(false),
         network_active_(false) {
   }
@@ -335,8 +335,8 @@ void URLRequestHttpJob::DestroyTransaction() {
 }
 
 void URLRequestHttpJob::StartTransaction() {
-  if (request_->context()->network_delegate()) {
-    int rv = request_->context()->network_delegate()->NotifyBeforeSendHeaders(
+  if (request_->network_delegate()) {
+    int rv = request_->network_delegate()->NotifyBeforeSendHeaders(
         request_, notify_before_headers_sent_callback_,
         &request_info_.extra_headers);
     // If an extension blocks the request, we rely on the callback to
@@ -380,8 +380,8 @@ void URLRequestHttpJob::StartTransactionInternal() {
 
   int rv;
 
-  if (request_->context()->network_delegate()) {
-    request_->context()->network_delegate()->NotifySendHeaders(
+  if (request_->network_delegate()) {
+    request_->network_delegate()->NotifySendHeaders(
         request_, request_info_.extra_headers);
   }
 
@@ -764,11 +764,11 @@ void URLRequestHttpJob::OnStartCompleted(int result) {
 
   if (result == OK) {
     scoped_refptr<HttpResponseHeaders> headers = GetResponseHeaders();
-    if (context->network_delegate()) {
+    if (request_->network_delegate()) {
       // Note that |this| may not be deleted until
       // |on_headers_received_callback_| or
       // |NetworkDelegate::URLRequestDestroyed()| has been called.
-      int error = context->network_delegate()->
+      int error = request_->network_delegate()->
           NotifyHeadersReceived(request_, on_headers_received_callback_,
                                 headers, &override_response_headers_);
       if (error != net::OK) {