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

net/url_request/url_request_http_job.h

 // Copyright (c) 2012 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_HTTP_JOB_H_
 #define NET_URL_REQUEST_URL_REQUEST_HTTP_JOB_H_
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time.h"
 #include "net/base/auth.h"
 #include "net/base/completion_callback.h"
 #include "net/cookies/cookie_store.h"
 #include "net/http/http_request_info.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_throttler_entry_interface.h"
 
 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;

[mmenke, 2012/07/24 15:24:34]

This should be at the top of the private section.

[shalev, 2012/07/25 20:22:45]

Done.

   static URLRequestJob* Factory(URLRequest* request,
                                 const std::string& scheme);
 
  protected:
-  explicit URLRequestHttpJob(URLRequest* request);
+  URLRequestHttpJob(
+      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();
 
   // Shadows URLRequestJob's method so we can record histograms.
   void NotifyDone(const URLRequestStatus& status);
 
   void DestroyTransaction();
 
   void AddExtraHeaders();
@@ skipping 179 matching lines @@
   // layers of the network stack.
   scoped_refptr<HttpResponseHeaders> override_response_headers_;
 
   // Flag used to verify that |this| is not deleted while we are awaiting
   // a callback from the NetworkDelegate. Used as a fail-fast mechanism.
   // True if we are waiting a callback and
   // NetworkDelegate::NotifyURLRequestDestroyed has not been called, yet,
   // to inform the NetworkDelegate that it may not call back.
   bool awaiting_callback_;
 
+  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_;
+
   DISALLOW_COPY_AND_ASSIGN(URLRequestHttpJob);
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_HTTP_JOB_H_