Change Interceptors into URLRequestJobFactory::ProtocolHandlers.

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 399 matching lines @@
   ftp_factory_.reset(
       new net::FtpNetworkLayer(io_thread_globals->host_resolver.get()));
   main_context->set_ftp_transaction_factory(ftp_factory_.get());
 #endif  // !defined(DISABLE_FTP_SUPPORT)
 
   main_context->set_chrome_url_data_manager_backend(
       chrome_url_data_manager_backend());
 
   scoped_ptr<net::URLRequestJobFactoryImpl> main_job_factory(
       new net::URLRequestJobFactoryImpl());
-  SetUpJobFactory(main_job_factory.get(),
-                  profile_params->protocol_handler_interceptor.Pass(),
-                  network_delegate(),
-                  main_context->ftp_transaction_factory(),
-                  main_context->ftp_auth_cache());
-  main_job_factory_ = main_job_factory.Pass();
+  main_job_factory_ = SetUpJobFactory(
+      main_job_factory.Pass(),
+      profile_params->protocol_handler_interceptor.Pass(),
+      network_delegate(),
+      main_context->ftp_transaction_factory(),
+      main_context->ftp_auth_cache());
   main_context->set_job_factory(main_job_factory_.get());
 
 #if defined(ENABLE_EXTENSIONS)
   InitializeExtensionsRequestContext(profile_params);
 #endif
 
   // Create a media request context based on the main context, but using a
   // media cache.  It shares the same job factory as the main context.
   StoragePartitionDescriptor details(profile_path_, false);
   media_request_context_.reset(InitializeMediaRequestContext(main_context,
@@ skipping 33 matching lines @@
 #endif  // !defined(DISABLE_FTP_SUPPORT)
 
   scoped_ptr<net::URLRequestJobFactoryImpl> extensions_job_factory(
       new net::URLRequestJobFactoryImpl());
   // TODO(shalev): The extensions_job_factory has a NULL NetworkDelegate.
   // Without a network_delegate, this protocol handler will never
   // handle file: requests, but as a side effect it makes
   // job_factory::IsHandledProtocol return true, which prevents attempts to
   // handle the protocol externally. We pass NULL in to
   // SetUpJobFactory() to get this effect.
-  SetUpJobFactory(extensions_job_factory.get(),
-                  scoped_ptr<net::URLRequestJobFactoryImpl::Interceptor>(NULL),
-                  NULL,
-                  extensions_context->ftp_transaction_factory(),
-                  extensions_context->ftp_auth_cache());
-  extensions_job_factory_ = extensions_job_factory.Pass();
+  extensions_job_factory_ = SetUpJobFactory(
+      extensions_job_factory.Pass(),
+      scoped_ptr<net::URLRequestJobFactoryImpl::Interceptor>(NULL),
+      NULL,
+      extensions_context->ftp_transaction_factory(),
+      extensions_context->ftp_auth_cache());
+
   extensions_context->set_job_factory(extensions_job_factory_.get());
 }
 
 ChromeURLRequestContext*
 ProfileImplIOData::InitializeAppRequestContext(
     ChromeURLRequestContext* main_context,
     const StoragePartitionDescriptor& partition_descriptor,
     scoped_ptr<net::URLRequestJobFactory::Interceptor>
         protocol_handler_interceptor) const {
   // Copy most state from the main context.
@@ skipping 55 matching lines @@
 
   // Transfer ownership of the cookies and cache to AppRequestContext.
   context->SetCookieStore(cookie_store);
   context->SetHttpTransactionFactory(
       scoped_ptr<net::HttpTransactionFactory>(app_http_cache));
 
   // Overwrite the job factory that we inherit from the main context so
   // that we can later provide our own handles for storage related protocols.
   // Install all the usual protocol handlers unless we are in a browser plugin
   // guest process, in which case only web-safe schemes are allowed.
-  scoped_ptr<net::URLRequestJobFactoryImpl> job_factory(
+  scoped_ptr<net::URLRequestJobFactoryImpl> base_job_factory(
       new net::URLRequestJobFactoryImpl());
+  scoped_ptr<net::URLRequestJobFactory> top_job_factory;
   if (!partition_descriptor.in_memory) {
-    SetUpJobFactory(job_factory.get(), protocol_handler_interceptor.Pass(),
-                    network_delegate(),
-                    context->ftp_transaction_factory(),
-                    context->ftp_auth_cache());
+    top_job_factory = SetUpJobFactory(base_job_factory.Pass(),
+                                      protocol_handler_interceptor.Pass(),
+                                      network_delegate(),
+                                      context->ftp_transaction_factory(),
+                                      context->ftp_auth_cache());
+  } else {
+    top_job_factory = base_job_factory.PassAs<net::URLRequestJobFactory>();
   }
-  context->SetJobFactory(job_factory.PassAs<net::URLRequestJobFactory>());
+  context->SetJobFactory(top_job_factory.Pass());
 
   return context;
 }
 
 ChromeURLRequestContext*
 ProfileImplIOData::InitializeMediaRequestContext(
     ChromeURLRequestContext* original_context,
     const StoragePartitionDescriptor& partition_descriptor) const {
   // If this is for a in_memory partition, we can simply use the original
   // context (like off-the-record mode).
@@ skipping 68 matching lines @@
       InitializeMediaRequestContext(app_context, partition_descriptor);
   DCHECK(media_request_context);
   return media_request_context;
 }
 
 chrome_browser_net::LoadTimeStats* ProfileImplIOData::GetLoadTimeStats(
     IOThread::Globals* io_thread_globals) const {
   return io_thread_globals->load_time_stats.get();
 }
 
-void ProfileImplIOData::SetUpJobFactory(
-    net::URLRequestJobFactoryImpl* job_factory,
+scoped_ptr<net::URLRequestJobFactory> ProfileImplIOData::SetUpJobFactory(
+    scoped_ptr<net::URLRequestJobFactoryImpl> job_factory,
     scoped_ptr<net::URLRequestJobFactory::Interceptor>
         protocol_handler_interceptor,
     net::NetworkDelegate* network_delegate,
     net::FtpTransactionFactory* ftp_transaction_factory,
     net::FtpAuthCache* ftp_auth_cache) const {
-  SetUpJobFactoryDefaults(job_factory, protocol_handler_interceptor.Pass(),
-                          network_delegate, ftp_transaction_factory,
-                          ftp_auth_cache);
-
-  job_factory->AddInterceptor(
-      new chrome_browser_net::ConnectInterceptor(predictor_.get()));
+  scoped_ptr<net::URLRequestJobFactory> top_job_factory =
+      SetUpJobFactoryDefaults(job_factory.Pass(),
+                              protocol_handler_interceptor.Pass(),
+                              network_delegate, ftp_transaction_factory,
+                              ftp_auth_cache);
+  return chrome_browser_net::ConnectInterceptor::CreateURLRequestJobFactory(
+      top_job_factory.Pass(), predictor_.get());
 }
 
 void ProfileImplIOData::ClearNetworkingHistorySinceOnIOThread(
     base::Time time,
     const base::Closure& completion) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   LazyInitialize();
 
   DCHECK(transport_security_state());
   transport_security_state()->DeleteSince(time);  // Completes synchronously.
   DCHECK(http_server_properties_manager());
   http_server_properties_manager()->Clear(completion);
 }