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 /chrome/browser/io_thread.h | |
| 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 'chrome/browser/io_thread.h')
| -rw-r--r-- | chrome/browser/io_thread.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h index 4319135..627dcfb 100644 --- a/chrome/browser/io_thread.h +++ b/chrome/browser/io_thread.h @@ -121,6 +121,8 @@ class IOThread : public content::BrowserThreadDelegate { scoped_ptr<net::ProxyService> proxy_script_fetcher_proxy_service; scoped_ptr<net::HttpTransactionFactory> proxy_script_fetcher_http_transaction_factory; + scoped_ptr<net::FtpTransactionFactory> + proxy_script_fetcher_ftp_transaction_factory; scoped_ptr<net::URLRequestThrottlerManager> throttler_manager; scoped_ptr<net::URLSecurityManager> url_security_manager; // TODO(willchan): Remove proxy script fetcher context since it's not @@ -132,6 +134,7 @@ class IOThread : public content::BrowserThreadDelegate { scoped_ptr<net::URLRequestContext> proxy_script_fetcher_context; scoped_ptr<net::ProxyService> system_proxy_service; scoped_ptr<net::HttpTransactionFactory> system_http_transaction_factory; + scoped_ptr<net::FtpTransactionFactory> system_ftp_transaction_factory; scoped_ptr<net::URLRequestContext> system_request_context; SystemRequestContextLeakChecker system_request_context_leak_checker; // |system_cookie_store| and |system_server_bound_cert_service| are shared |