Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(651)

Side by Side Diff: chrome/service/net/service_url_request_context.cc

Issue 3846005: Revert 62918 - net: clean up SSLHostInfo construction.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 2 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/net/connection_tester.cc ('k') | chrome/test/plugin/plugin_test.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/service/net/service_url_request_context.h" 5 #include "chrome/service/net/service_url_request_context.h"
6 6
7 #include "chrome/service/service_process.h" 7 #include "chrome/service/service_process.h"
8 #include "net/base/cookie_monster.h" 8 #include "net/base/cookie_monster.h"
9 #include "net/base/cookie_policy.h" 9 #include "net/base/cookie_policy.h"
10 #include "net/base/dnsrr_resolver.h" 10 #include "net/base/dnsrr_resolver.h"
(...skipping 25 matching lines...) Expand all
36 proxy_service_ = net::ProxyService::CreateUsingSystemProxyResolver( 36 proxy_service_ = net::ProxyService::CreateUsingSystemProxyResolver(
37 proxy_config_service, 0u, NULL); 37 proxy_config_service, 0u, NULL);
38 dnsrr_resolver_ = new net::DnsRRResolver; 38 dnsrr_resolver_ = new net::DnsRRResolver;
39 ftp_transaction_factory_ = new net::FtpNetworkLayer(host_resolver_); 39 ftp_transaction_factory_ = new net::FtpNetworkLayer(host_resolver_);
40 ssl_config_service_ = new net::SSLConfigServiceDefaults; 40 ssl_config_service_ = new net::SSLConfigServiceDefaults;
41 http_auth_handler_factory_ = net::HttpAuthHandlerFactory::CreateDefault( 41 http_auth_handler_factory_ = net::HttpAuthHandlerFactory::CreateDefault(
42 host_resolver_); 42 host_resolver_);
43 http_transaction_factory_ = new net::HttpCache( 43 http_transaction_factory_ = new net::HttpCache(
44 net::HttpNetworkLayer::CreateFactory(host_resolver_, 44 net::HttpNetworkLayer::CreateFactory(host_resolver_,
45 dnsrr_resolver_, 45 dnsrr_resolver_,
46 NULL /* ssl_host_info_factory */,
47 proxy_service_, 46 proxy_service_,
48 ssl_config_service_, 47 ssl_config_service_,
49 http_auth_handler_factory_, 48 http_auth_handler_factory_,
50 NULL /* network_delegate */, 49 NULL /* network_delegate */,
51 NULL /* net_log */), 50 NULL /* net_log */),
52 net::HttpCache::DefaultBackend::InMemory(0)); 51 net::HttpCache::DefaultBackend::InMemory(0));
53 // In-memory cookie store. 52 // In-memory cookie store.
54 cookie_store_ = new net::CookieMonster(NULL, NULL); 53 cookie_store_ = new net::CookieMonster(NULL, NULL);
55 accept_language_ = "en-us,fr"; 54 accept_language_ = "en-us,fr";
56 accept_charset_ = "iso-8859-1,*,utf-8"; 55 accept_charset_ = "iso-8859-1,*,utf-8";
57 } 56 }
58 57
59 ServiceURLRequestContext::~ServiceURLRequestContext() { 58 ServiceURLRequestContext::~ServiceURLRequestContext() {
60 delete ftp_transaction_factory_; 59 delete ftp_transaction_factory_;
61 delete http_transaction_factory_; 60 delete http_transaction_factory_;
62 delete http_auth_handler_factory_; 61 delete http_auth_handler_factory_;
63 delete dnsrr_resolver_; 62 delete dnsrr_resolver_;
64 } 63 }
OLDNEW
« no previous file with comments | « chrome/browser/net/connection_tester.cc ('k') | chrome/test/plugin/plugin_test.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698