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

net/url_request/url_request_job.h

 // Copyright (c) 2011 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.
 
 #ifndef NET_URL_REQUEST_URL_REQUEST_JOB_H_
 #define NET_URL_REQUEST_URL_REQUEST_JOB_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/system_monitor/system_monitor.h"
 #include "base/time.h"

[mmenke, 2012/06/22 20:23:43]

While you're here, could you also remove this include?  It's no longer used in
this file.

[shalev, 2012/06/22 20:53:55]

Done.

 #include "googleurl/src/gurl.h"
 #include "net/base/filter.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/load_states.h"
 #include "net/base/net_export.h"
 
 namespace net {
 
 class AuthChallengeInfo;
 class AuthCredentials;
 class CookieList;
 class CookieOptions;
 class HttpRequestHeaders;
 class HttpResponseInfo;
 class IOBuffer;
+class NetworkDelegate;
 class SSLCertRequestInfo;
 class SSLInfo;
 class URLRequest;
 class UploadData;
 class URLRequestStatus;
 class X509Certificate;
 
 class NET_EXPORT URLRequestJob : public base::RefCounted<URLRequestJob>,
                                  public base::SystemMonitor::PowerObserver {
  public:
-  explicit URLRequestJob(URLRequest* request);
+  explicit URLRequestJob(URLRequest* request,
+                         NetworkDelegate* network_delegate);
 
   // Returns the request that owns this job. THIS POINTER MAY BE NULL if the
   // request was destroyed.
   URLRequest* request() const {
     return request_;
   }
 
   // Sets the upload data, most requests have no upload data, so this is a NOP.
   // Job types supporting upload data will override this.
   virtual void SetUpload(UploadData* upload);
@@ skipping 312 matching lines @@
   // OnResponseStarted callback and potentially redirect callbacks as well.
   bool has_handled_response_;
 
   // Expected content size
   int64 expected_content_size_;
 
   // Set when a redirect is deferred.
   GURL deferred_redirect_url_;
   int deferred_redirect_status_code_;
 
+  NetworkDelegate* network_delegate_;
+
   base::WeakPtrFactory<URLRequestJob> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestJob);
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_JOB_H_