diff options
| author | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-19 03:05:50 +0000 |
|---|---|---|
| committer | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-19 03:05:50 +0000 |
| commit | e13c14645c5e2777d15c586483d7f29255f260fa (patch) | |
| tree | 6eba85cf6b97ce1636a2a1dc4873cd11d6d122e4 /net/url_request/url_request_job_manager.cc | |
| parent | 433739c4481fee1967d815207863a9a06fd18db2 (diff) | |
| download | chromium_src-e13c14645c5e2777d15c586483d7f29255f260fa.zip chromium_src-e13c14645c5e2777d15c586483d7f29255f260fa.tar.gz chromium_src-e13c14645c5e2777d15c586483d7f29255f260fa.tar.bz2 | |
Revert 188912 "Removed static factories for data, ftp, file, and..."
Broke layout tests userscripts/user-script-plugin-document.html and plugins/plugin-document-back-forward.html on all platforms.
> Removed static factories for data, ftp, file, and about jobs.
> Instead add corresponding ProtocolHandlers as needed.
> Remove URLRequestContext members used by these static
> factories. Bake FtpAuthCache into FtpProtocolHandler as it
> was already unique per FtpProtocolHandler.
> This is a revived version of http://crrev.com/10836206
>
> BUG=142945
>
>
> Review URL: https://chromiumcodereview.appspot.com/11931024
TBR=pauljensen@chromium.org
Review URL: https://codereview.chromium.org/12605011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188927 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request/url_request_job_manager.cc')
| -rw-r--r-- | net/url_request/url_request_job_manager.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/net/url_request/url_request_job_manager.cc b/net/url_request/url_request_job_manager.cc index 5a64b41..283ee0d 100644 --- a/net/url_request/url_request_job_manager.cc +++ b/net/url_request/url_request_job_manager.cc @@ -12,8 +12,12 @@ #include "net/base/load_flags.h" #include "net/base/net_errors.h" #include "net/base/network_delegate.h" +#include "net/url_request/url_request_about_job.h" #include "net/url_request/url_request_context.h" +#include "net/url_request/url_request_data_job.h" #include "net/url_request/url_request_error_job.h" +#include "net/url_request/url_request_file_job.h" +#include "net/url_request/url_request_ftp_job.h" #include "net/url_request/url_request_http_job.h" #include "net/url_request/url_request_job_factory.h" @@ -32,6 +36,12 @@ struct SchemeToFactory { static const SchemeToFactory kBuiltinFactories[] = { { "http", URLRequestHttpJob::Factory }, { "https", URLRequestHttpJob::Factory }, + { "file", URLRequestFileJob::Factory }, +#if !defined(DISABLE_FTP_SUPPORT) + { "ftp", URLRequestFtpJob::Factory }, +#endif + { "about", URLRequestAboutJob::Factory }, + { "data", URLRequestDataJob::Factory }, }; // static |