chrome/service/net/service_url_request_context.cc - Issue 11931024: Removed static factories for data, ftp, file, and about jobs.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/service/net/service_url_request_context.cc

Issue 11931024: Removed static factories for data, ftp, file, and about jobs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix latent merge conflict with r192649 Created 7 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/service/net/service_url_request_context.cc

diff --git a/chrome/service/net/service_url_request_context.cc b/chrome/service/net/service_url_request_context.cc

index 640e31017094bef892c9fe06f8f30dda9bdcd936..ee5e0ebcbf32647a93e48ae93ac763144b8a6fab 100644

--- a/chrome/service/net/service_url_request_context.cc

+++ b/chrome/service/net/service_url_request_context.cc

@@ -17,7 +17,6 @@

#include "net/cert/cert_verifier.h"

#include "net/cookies/cookie_monster.h"

#include "net/dns/host_resolver.h"

-#include "net/ftp/ftp_network_layer.h"

#include "net/http/http_auth_handler_factory.h"

#include "net/http/http_cache.h"

#include "net/http/http_network_session.h"

@@ -114,8 +113,6 @@ ServiceURLRequestContext::ServiceURLRequestContext(

storage_.set_proxy_service(net::ProxyService::CreateUsingSystemProxyResolver(

net_proxy_config_service, 0u, NULL));

storage_.set_cert_verifier(net::CertVerifier::CreateDefault());

- storage_.set_ftp_transaction_factory(

- new net::FtpNetworkLayer(host_resolver()));

storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults);

storage_.set_http_auth_handler_factory(

net::HttpAuthHandlerFactory::CreateDefault(host_resolver()));