Replaced static URLRequestHTTPJob factory with non-static protocol handler for HTTP jobs.

net/url_request/url_request_http_job.h

Index: net/url_request/url_request_http_job.h
diff --git a/net/url_request/url_request_http_job.h b/net/url_request/url_request_http_job.h
index 39451c63687f0920c197e9a8569984fa38e6829b..06bafbee228875fc747556f91cafbfb3088b1ce7 100644
--- a/net/url_request/url_request_http_job.h
+++ b/net/url_request/url_request_http_job.h
@@ -21,20 +21,38 @@
 
 namespace net {
 
+class CookieStore;
+class FraudulentCertificateReporter;
 class HttpResponseHeaders;
 class HttpResponseInfo;
 class HttpTransaction;
+class HttpTransactionFactory;
+class NetworkDelegate;
+class SSLConfigService;
+class TransportSecurityState;
 class URLRequestContext;
+class URLRequestThrottlerManager;
 
 // A URLRequestJob subclass that is built on top of HttpTransaction.  It
 // provides an implementation for both HTTP and HTTPS.
 class URLRequestHttpJob : public URLRequestJob {
  public:
+  friend class HttpProtocolHandler;
   static URLRequestJob* Factory(URLRequest* request,
                                 const std::string& scheme);
 
  protected:
-  explicit URLRequestHttpJob(URLRequest* request);
+  explicit URLRequestHttpJob(

[erikwright (departed), 2012/07/17 19:42:45]

-explicit

[shalev, 2012/07/17 20:20:18]

Done.

+      URLRequest* request,
+      HttpTransactionFactory* http_transaction_factory,
+      NetworkDelegate* network_delegate,
+      URLRequestThrottlerManager* throttler_manager,
+      const std::string& accept_language,
+      const std::string& accept_charset,
+      CookieStore* cookie_store,
+      FraudulentCertificateReporter* fraudulent_certificate_reporter,
+      SSLConfigService* ssl_config_service,
+      TransportSecurityState* transport_security_state);
 
   // Shadows URLRequestJob's version of this method so we can grab cookies.
   void NotifyHeadersComplete();
@@ -234,6 +252,16 @@ class URLRequestHttpJob : public URLRequestJob {
   // to inform the NetworkDelegate that it may not call back.
   bool awaiting_callback_;
 
+  HttpTransactionFactory* http_transaction_factory_;
+  NetworkDelegate* network_delegate_;
+  URLRequestThrottlerManager* throttler_manager_;
+  std::string accept_language_;
+  std::string accept_charset_;
+  CookieStore* cookie_store_;
+  FraudulentCertificateReporter* fraudulent_certificate_reporter_;
+  SSLConfigService* ssl_config_service_;
+  TransportSecurityState* transport_security_state_;
+
   DISALLOW_COPY_AND_ASSIGN(URLRequestHttpJob);
 };