Remove the chrome:// protocol interceptor since it's not used anymore now that the chrome job facto…

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 113 matching lines @@
   return io_data_->GetResourceContext();
 }
 
 scoped_refptr<ChromeURLRequestContextGetter>
 ProfileImplIOData::Handle::CreateMainRequestContextGetter(
     scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
         blob_protocol_handler,
     scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
         file_system_protocol_handler,
     scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
-        developer_protocol_handler,
-    scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
         chrome_protocol_handler,
     scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
         chrome_devtools_protocol_handler,
     PrefService* local_state,
     IOThread* io_thread) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   LazyInitialize();
   DCHECK(!main_request_context_getter_);
   main_request_context_getter_ = ChromeURLRequestContextGetter::CreateOriginal(
       profile_, io_data_, blob_protocol_handler.Pass(),
-      file_system_protocol_handler.Pass(), developer_protocol_handler.Pass(),
-      chrome_protocol_handler.Pass(), chrome_devtools_protocol_handler.Pass());
+      file_system_protocol_handler.Pass(), chrome_protocol_handler.Pass(),
+      chrome_devtools_protocol_handler.Pass());
 
   io_data_->predictor_->InitNetworkPredictor(profile_->GetPrefs(),
                                              local_state,
                                              io_thread,
                                              main_request_context_getter_);
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PROFILE_URL_REQUEST_CONTEXT_GETTER_INITIALIZED,
       content::Source<Profile>(profile_),
       content::NotificationService::NoDetails());
@@ skipping 26 matching lines @@
 
 scoped_refptr<ChromeURLRequestContextGetter>
 ProfileImplIOData::Handle::CreateIsolatedAppRequestContextGetter(
     const base::FilePath& partition_path,
     bool in_memory,
     scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
         blob_protocol_handler,
     scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
         file_system_protocol_handler,
     scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
-        developer_protocol_handler,
-    scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
         chrome_protocol_handler,
     scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
         chrome_devtools_protocol_handler) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // Check that the partition_path is not the same as the base profile path. We
   // expect isolated partition, which will never go to the default profile path.
   CHECK(partition_path != profile_->GetPath());
   LazyInitialize();
 
   // Keep a map of request context getters, one per requested storage partition.
   StoragePartitionDescriptor descriptor(partition_path, in_memory);
   ChromeURLRequestContextGetterMap::iterator iter =
       app_request_context_getter_map_.find(descriptor);
   if (iter != app_request_context_getter_map_.end())
     return iter->second;
 
   scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
       protocol_handler_interceptor(
           ProtocolHandlerRegistryFactory::GetForProfile(profile_)->
               CreateJobInterceptorFactory());
   ChromeURLRequestContextGetter* context =
       ChromeURLRequestContextGetter::CreateOriginalForIsolatedApp(
           profile_, io_data_, descriptor,
           protocol_handler_interceptor.Pass(), blob_protocol_handler.Pass(),
-          file_system_protocol_handler.Pass(),
-          developer_protocol_handler.Pass(), chrome_protocol_handler.Pass(),
+          file_system_protocol_handler.Pass(), chrome_protocol_handler.Pass(),
           chrome_devtools_protocol_handler.Pass());
   app_request_context_getter_map_[descriptor] = context;
 
   return context;
 }
 
 scoped_refptr<ChromeURLRequestContextGetter>
 ProfileImplIOData::Handle::GetIsolatedMediaRequestContextGetter(
     const base::FilePath& partition_path,
     bool in_memory) const {
@@ skipping 81 matching lines @@
     media_request_context_->AssertNoURLRequests();
 }
 
 void ProfileImplIOData::InitializeInternal(
     ProfileParams* profile_params,
     scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
         blob_protocol_handler,
     scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
         file_system_protocol_handler,
     scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
-        developer_protocol_handler,
-    scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
         chrome_protocol_handler,
     scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
         chrome_devtools_protocol_handler) const {
   ChromeURLRequestContext* main_context = main_request_context();
 
   IOThread* const io_thread = profile_params->io_thread;
   IOThread::Globals* const io_thread_globals = io_thread->globals();
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   // Only allow Record Mode if we are in a Debug build or where we are running
   // a cycle, and the user has limited control.
@@ skipping 119 matching lines @@
   set_protocol = main_job_factory->SetProtocolHandler(
       chrome::kChromeDevToolsScheme,
       chrome_devtools_protocol_handler.release());
   DCHECK(set_protocol);
   main_job_factory_ = SetUpJobFactoryDefaults(
       main_job_factory.Pass(),
       profile_params->protocol_handler_interceptor.Pass(),
       network_delegate(),
       main_context->ftp_transaction_factory(),
       main_context->ftp_auth_cache());
-  main_job_factory_.reset(new net::ProtocolInterceptJobFactory(
-      main_job_factory_.Pass(), developer_protocol_handler.Pass()));
   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 53 matching lines @@
 ProfileImplIOData::InitializeAppRequestContext(
     ChromeURLRequestContext* main_context,
     const StoragePartitionDescriptor& partition_descriptor,
     scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
         protocol_handler_interceptor,
     scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
         blob_protocol_handler,
     scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
         file_system_protocol_handler,
     scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
-        developer_protocol_handler,
-    scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
         chrome_protocol_handler,
     scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
         chrome_devtools_protocol_handler) const {
   // Copy most state from the main context.
   AppRequestContext* context = new AppRequestContext(load_time_stats());
   context->CopyFrom(main_context);
 
   base::FilePath cookie_path = partition_descriptor.path.Append(
       chrome::kCookieFilename);
   base::FilePath cache_path =
@@ skipping 75 matching lines @@
   // guest process, in which case only web-safe schemes are allowed.
   if (!partition_descriptor.in_memory) {
     top_job_factory = SetUpJobFactoryDefaults(
         job_factory.Pass(), protocol_handler_interceptor.Pass(),
         network_delegate(),
         context->ftp_transaction_factory(),
         context->ftp_auth_cache());
   } else {
     top_job_factory = job_factory.PassAs<net::URLRequestJobFactory>();
   }
-  top_job_factory.reset(new net::ProtocolInterceptJobFactory(
-      top_job_factory.Pass(), developer_protocol_handler.Pass()));
   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
@@ skipping 50 matching lines @@
 ProfileImplIOData::AcquireIsolatedAppRequestContext(
     ChromeURLRequestContext* main_context,
     const StoragePartitionDescriptor& partition_descriptor,
     scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
         protocol_handler_interceptor,
     scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
         blob_protocol_handler,
     scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
         file_system_protocol_handler,
     scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
-        developer_protocol_handler,
-    scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
         chrome_protocol_handler,
     scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
         chrome_devtools_protocol_handler) const {
   // We create per-app contexts on demand, unlike the others above.
   ChromeURLRequestContext* app_request_context =
       InitializeAppRequestContext(main_context, partition_descriptor,
                                   protocol_handler_interceptor.Pass(),
                                   blob_protocol_handler.Pass(),
                                   file_system_protocol_handler.Pass(),
-                                  developer_protocol_handler.Pass(),
                                   chrome_protocol_handler.Pass(),
                                   chrome_devtools_protocol_handler.Pass());
   DCHECK(app_request_context);
   return app_request_context;
 }
 
 ChromeURLRequestContext*
 ProfileImplIOData::AcquireIsolatedMediaRequestContext(
     ChromeURLRequestContext* app_context,
     const StoragePartitionDescriptor& partition_descriptor) const {
@@ skipping 13 matching lines @@
     base::Time time,
     const base::Closure& completion) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(initialized());
 
   DCHECK(transport_security_state());
   transport_security_state()->DeleteSince(time);  // Completes synchronously.
   DCHECK(http_server_properties_manager_);
   http_server_properties_manager_->Clear(completion);
 }