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

Side by Side Diff: chrome/browser/io_thread.h

Issue 1342613002: Revert of Remove reference counting from HttpNetworkSession. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_IO_THREAD_H_ 5 #ifndef CHROME_BROWSER_IO_THREAD_H_
6 #define CHROME_BROWSER_IO_THREAD_H_ 6 #define CHROME_BROWSER_IO_THREAD_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 namespace net { 47 namespace net {
48 class CertPolicyEnforcer; 48 class CertPolicyEnforcer;
49 class CertVerifier; 49 class CertVerifier;
50 class ChannelIDService; 50 class ChannelIDService;
51 class CookieStore; 51 class CookieStore;
52 class CTVerifier; 52 class CTVerifier;
53 class FtpTransactionFactory; 53 class FtpTransactionFactory;
54 class HostMappingRules; 54 class HostMappingRules;
55 class HostResolver; 55 class HostResolver;
56 class HttpAuthHandlerFactory; 56 class HttpAuthHandlerFactory;
57 class HttpNetworkSession;
58 class HttpServerProperties; 57 class HttpServerProperties;
59 class HttpTransactionFactory; 58 class HttpTransactionFactory;
60 class HttpUserAgentSettings; 59 class HttpUserAgentSettings;
61 class NetworkDelegate; 60 class NetworkDelegate;
62 class NetworkQualityEstimator; 61 class NetworkQualityEstimator;
63 class ProxyConfigService; 62 class ProxyConfigService;
64 class ProxyService; 63 class ProxyService;
65 class SSLConfigService; 64 class SSLConfigService;
66 class TransportSecurityState; 65 class TransportSecurityState;
67 class URLRequestBackoffManager; 66 class URLRequestBackoffManager;
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 // This TransportSecurityState doesn't load or save any state. It's only 128 // This TransportSecurityState doesn't load or save any state. It's only
130 // used to enforce pinning for system requests and will only use built-in 129 // used to enforce pinning for system requests and will only use built-in
131 // pins. 130 // pins.
132 scoped_ptr<net::TransportSecurityState> transport_security_state; 131 scoped_ptr<net::TransportSecurityState> transport_security_state;
133 scoped_ptr<net::CTVerifier> cert_transparency_verifier; 132 scoped_ptr<net::CTVerifier> cert_transparency_verifier;
134 scoped_ptr<net::CertPolicyEnforcer> cert_policy_enforcer; 133 scoped_ptr<net::CertPolicyEnforcer> cert_policy_enforcer;
135 scoped_refptr<net::SSLConfigService> ssl_config_service; 134 scoped_refptr<net::SSLConfigService> ssl_config_service;
136 scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory; 135 scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory;
137 scoped_ptr<net::HttpServerProperties> http_server_properties; 136 scoped_ptr<net::HttpServerProperties> http_server_properties;
138 scoped_ptr<net::ProxyService> proxy_script_fetcher_proxy_service; 137 scoped_ptr<net::ProxyService> proxy_script_fetcher_proxy_service;
139 scoped_ptr<net::HttpNetworkSession>
140 proxy_script_fetcher_http_network_session;
141 scoped_ptr<net::HttpTransactionFactory> 138 scoped_ptr<net::HttpTransactionFactory>
142 proxy_script_fetcher_http_transaction_factory; 139 proxy_script_fetcher_http_transaction_factory;
143 scoped_ptr<net::FtpTransactionFactory> 140 scoped_ptr<net::FtpTransactionFactory>
144 proxy_script_fetcher_ftp_transaction_factory; 141 proxy_script_fetcher_ftp_transaction_factory;
145 scoped_ptr<net::URLRequestJobFactory> 142 scoped_ptr<net::URLRequestJobFactory>
146 proxy_script_fetcher_url_request_job_factory; 143 proxy_script_fetcher_url_request_job_factory;
147 scoped_ptr<net::URLRequestBackoffManager> url_request_backoff_manager; 144 scoped_ptr<net::URLRequestBackoffManager> url_request_backoff_manager;
148 scoped_ptr<net::URLSecurityManager> url_security_manager; 145 scoped_ptr<net::URLSecurityManager> url_security_manager;
149 // TODO(willchan): Remove proxy script fetcher context since it's not 146 // TODO(willchan): Remove proxy script fetcher context since it's not
150 // necessary now that I got rid of refcounting URLRequestContexts. 147 // necessary now that I got rid of refcounting URLRequestContexts.
151 // 148 //
152 // The first URLRequestContext is |system_url_request_context|. We introduce 149 // The first URLRequestContext is |system_url_request_context|. We introduce
153 // |proxy_script_fetcher_context| for the second context. It has a direct 150 // |proxy_script_fetcher_context| for the second context. It has a direct
154 // ProxyService, since we always directly connect to fetch the PAC script. 151 // ProxyService, since we always directly connect to fetch the PAC script.
155 scoped_ptr<net::URLRequestContext> proxy_script_fetcher_context; 152 scoped_ptr<net::URLRequestContext> proxy_script_fetcher_context;
156 scoped_ptr<net::ProxyService> system_proxy_service; 153 scoped_ptr<net::ProxyService> system_proxy_service;
157 scoped_ptr<net::HttpNetworkSession> system_http_network_session;
158 scoped_ptr<net::HttpTransactionFactory> system_http_transaction_factory; 154 scoped_ptr<net::HttpTransactionFactory> system_http_transaction_factory;
159 scoped_ptr<net::URLRequestJobFactory> system_url_request_job_factory; 155 scoped_ptr<net::URLRequestJobFactory> system_url_request_job_factory;
160 scoped_ptr<net::URLRequestContext> system_request_context; 156 scoped_ptr<net::URLRequestContext> system_request_context;
161 SystemRequestContextLeakChecker system_request_context_leak_checker; 157 SystemRequestContextLeakChecker system_request_context_leak_checker;
162 // |system_cookie_store| and |system_channel_id_service| are shared 158 // |system_cookie_store| and |system_channel_id_service| are shared
163 // between |proxy_script_fetcher_context| and |system_request_context|. 159 // between |proxy_script_fetcher_context| and |system_request_context|.
164 scoped_refptr<net::CookieStore> system_cookie_store; 160 scoped_refptr<net::CookieStore> system_cookie_store;
165 #if defined(ENABLE_EXTENSIONS) 161 #if defined(ENABLE_EXTENSIONS)
166 scoped_refptr<extensions::EventRouterForwarder> 162 scoped_refptr<extensions::EventRouterForwarder>
167 extension_event_router_forwarder; 163 extension_event_router_forwarder;
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 bool is_quic_allowed_by_policy_; 498 bool is_quic_allowed_by_policy_;
503 499
504 const base::TimeTicks creation_time_; 500 const base::TimeTicks creation_time_;
505 501
506 base::WeakPtrFactory<IOThread> weak_factory_; 502 base::WeakPtrFactory<IOThread> weak_factory_;
507 503
508 DISALLOW_COPY_AND_ASSIGN(IOThread); 504 DISALLOW_COPY_AND_ASSIGN(IOThread);
509 }; 505 };
510 506
511 #endif // CHROME_BROWSER_IO_THREAD_H_ 507 #endif // CHROME_BROWSER_IO_THREAD_H_
OLDNEW
« no previous file with comments | « android_webview/browser/net/aw_url_request_context_getter.cc ('k') | chrome/browser/io_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698