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

chrome/browser/profiles/profile_impl_io_data.cc

 // 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.
 
 #include "chrome/browser/profiles/profile_impl_io_data.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 15 matching lines @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/resource_context.h"
 #include "net/base/server_bound_cert_service.h"
 #include "net/ftp/ftp_network_layer.h"
 #include "net/http/http_cache.h"
 #include "net/url_request/ftp_protocol_handler.h"
+#include "net/url_request/http_protocol_handler.h"
 #include "net/url_request/url_request_job_factory.h"
 #include "webkit/quota/special_storage_policy.h"
 
 using content::BrowserThread;
 
 ProfileImplIOData::Handle::Handle(Profile* profile)
     : io_data_(new ProfileImplIOData),
       profile_(profile),
       initialized_(false) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 401 matching lines @@
 
   main_job_factory_.reset(new net::URLRequestJobFactory);
   media_request_job_factory_.reset(new net::URLRequestJobFactory);
   extensions_job_factory_.reset(new net::URLRequestJobFactory);
 
   net::URLRequestJobFactory* job_factories[3];
   job_factories[0] = main_job_factory_.get();
   job_factories[1] = media_request_job_factory_.get();
   job_factories[2] = extensions_job_factory_.get();
 
-  net::FtpAuthCache* ftp_auth_caches[3];
-  ftp_auth_caches[0] = main_context->ftp_auth_cache();
-  ftp_auth_caches[1] = media_request_context_->ftp_auth_cache();
-  ftp_auth_caches[2] = extensions_context->ftp_auth_cache();
+  bool set_protocol = main_job_factory_->SetProtocolHandler(
+      chrome::kHttpScheme,
+      new net::HttpProtocolHandler(main_cache,
+                                   network_delegate(),
+                                   io_thread_globals->throttler_manager.get(),
+                                   main_context->accept_language(),
+                                   main_context->accept_charset(),
+                                   cookie_store,
+                                   fraudulent_certificate_reporter(),
+                                   main_context->ssl_config_service(),
+                                   transport_security_state()));
+  DCHECK(set_protocol);
+  set_protocol = media_request_job_factory_->SetProtocolHandler(
+      chrome::kHttpScheme,
+      new net::HttpProtocolHandler(media_cache,
+                                   network_delegate(),
+                                   io_thread_globals->throttler_manager.get(),
+                                   main_context->accept_language(),
+                                   main_context->accept_charset(),
+                                   cookie_store,
+                                   fraudulent_certificate_reporter(),
+                                   main_context->ssl_config_service(),
+                                   transport_security_state()));
+  DCHECK(set_protocol);
+  set_protocol = extensions_job_factory_->SetProtocolHandler(
+      chrome::kHttpScheme,
+      new net::HttpProtocolHandler(NULL,
+                                   NULL,
+                                   io_thread_globals->throttler_manager.get(),
+                                   main_context->accept_language(),
+                                   main_context->accept_charset(),
+                                   extensions_cookie_store,
+                                   NULL,
+                                   main_context->ssl_config_service(),
+                                   transport_security_state()));
+  DCHECK(set_protocol);
+  CreateFtpProtocolHandler(
+      job_factories[0], main_context->ftp_auth_cache(), network_delegate());
+  CreateFtpProtocolHandler(
+      job_factories[1], media_request_context_->ftp_auth_cache(),

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

Nit: this wrapping is non-conforming.

Put all three in the form

CreateFtpProtocolHandler(job_factories[0],
                         main_context->ftp_auth_cache(),
                         network_delegate());

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

Done.

+      network_delegate());
+  CreateFtpProtocolHandler(
+      job_factories[2], extensions_context->ftp_auth_cache(), NULL);
 
   for (int i = 0; i < 3; i++) {
     SetUpJobFactoryDefaults(job_factories[i]);
-    CreateFtpProtocolHandler(job_factories[i], ftp_auth_caches[i]);
     job_factories[i]->AddInterceptor(
         new chrome_browser_net::ConnectInterceptor(predictor_.get()));
   }
 
   main_context->set_job_factory(main_job_factory_.get());
   media_request_context_->set_job_factory(media_request_job_factory_.get());
   extensions_context->set_job_factory(extensions_job_factory_.get());
 
   lazy_params_.reset();
 }
@@ skipping 84 matching lines @@
     const std::string& app_id) const {
   // We create per-app contexts on demand, unlike the others above.
   ChromeURLRequestContext* app_request_context =
       InitializeAppRequestContext(main_context, app_id);
   DCHECK(app_request_context);
   return app_request_context;
 }
 
 void ProfileImplIOData::CreateFtpProtocolHandler(
     net::URLRequestJobFactory* job_factory,
-    net::FtpAuthCache* ftp_auth_cache) const {
-  job_factory->SetProtocolHandler(
+    net::FtpAuthCache* ftp_auth_cache,
+    net::NetworkDelegate* network_delegate) const {
+  bool set_protocol = job_factory->SetProtocolHandler(
       chrome::kFtpScheme,
-      new net::FtpProtocolHandler(network_delegate(),
+      new net::FtpProtocolHandler(network_delegate,
                                   ftp_factory_.get(),
                                   ftp_auth_cache));
+  DCHECK(set_protocol);
 }
 
 void ProfileImplIOData::ClearNetworkingHistorySinceOnIOThread(
     base::Time time) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   LazyInitialize();
 
   DCHECK(transport_security_state());
   transport_security_state()->DeleteSince(time);
   DCHECK(http_server_properties_manager());
   http_server_properties_manager()->Clear();
 }