- Restore FTP protocol support that was removed by a recent Chromium update.

- Register the net resource provider for render processes (issue #999).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1287 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-06-24 18:57:05 +00:00
parent 7e259aa9f2
commit 8c5a5c8ff1
10 changed files with 55 additions and 14 deletions

View File

@@ -13,17 +13,24 @@
#include "content/public/common/url_constants.h"
#include "net/url_request/data_protocol_handler.h"
#include "net/url_request/file_protocol_handler.h"
#include "net/url_request/ftp_protocol_handler.h"
#include "net/url_request/url_request_job_factory_impl.h"
namespace scheme {
void InstallInternalProtectedHandlers(
net::URLRequestJobFactoryImpl* job_factory,
content::ProtocolHandlerMap* protocol_handlers) {
content::ProtocolHandlerMap* protocol_handlers,
net::FtpTransactionFactory* ftp_transaction_factory) {
protocol_handlers->insert(
std::make_pair(chrome::kDataScheme, new net::DataProtocolHandler));
protocol_handlers->insert(
std::make_pair(chrome::kFileScheme, new net::FileProtocolHandler));
#if !defined(DISABLE_FTP_SUPPORT)
protocol_handlers->insert(
std::make_pair(chrome::kFtpScheme,
new net::FtpProtocolHandler(ftp_transaction_factory)));
#endif
for (content::ProtocolHandlerMap::iterator it =
protocol_handlers->begin();