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

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

Issue 12605011: Revert 188912 "Removed static factories for data, ftp, file, and..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 9 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
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 <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 // This TransportSecurityState doesn't load or save any state. It's only 114 // This TransportSecurityState doesn't load or save any state. It's only
115 // used to enforce pinning for system requests and will only use built-in 115 // used to enforce pinning for system requests and will only use built-in
116 // pins. 116 // pins.
117 scoped_ptr<net::TransportSecurityState> transport_security_state; 117 scoped_ptr<net::TransportSecurityState> transport_security_state;
118 scoped_refptr<net::SSLConfigService> ssl_config_service; 118 scoped_refptr<net::SSLConfigService> ssl_config_service;
119 scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory; 119 scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory;
120 scoped_ptr<net::HttpServerProperties> http_server_properties; 120 scoped_ptr<net::HttpServerProperties> http_server_properties;
121 scoped_ptr<net::ProxyService> proxy_script_fetcher_proxy_service; 121 scoped_ptr<net::ProxyService> proxy_script_fetcher_proxy_service;
122 scoped_ptr<net::HttpTransactionFactory> 122 scoped_ptr<net::HttpTransactionFactory>
123 proxy_script_fetcher_http_transaction_factory; 123 proxy_script_fetcher_http_transaction_factory;
124 scoped_ptr<net::FtpTransactionFactory>
125 proxy_script_fetcher_ftp_transaction_factory;
124 scoped_ptr<net::URLRequestThrottlerManager> throttler_manager; 126 scoped_ptr<net::URLRequestThrottlerManager> throttler_manager;
125 scoped_ptr<net::URLSecurityManager> url_security_manager; 127 scoped_ptr<net::URLSecurityManager> url_security_manager;
126 // TODO(willchan): Remove proxy script fetcher context since it's not 128 // TODO(willchan): Remove proxy script fetcher context since it's not
127 // necessary now that I got rid of refcounting URLRequestContexts. 129 // necessary now that I got rid of refcounting URLRequestContexts.
128 // 130 //
129 // The first URLRequestContext is |system_url_request_context|. We introduce 131 // The first URLRequestContext is |system_url_request_context|. We introduce
130 // |proxy_script_fetcher_context| for the second context. It has a direct 132 // |proxy_script_fetcher_context| for the second context. It has a direct
131 // ProxyService, since we always directly connect to fetch the PAC script. 133 // ProxyService, since we always directly connect to fetch the PAC script.
132 scoped_ptr<net::URLRequestContext> proxy_script_fetcher_context; 134 scoped_ptr<net::URLRequestContext> proxy_script_fetcher_context;
133 scoped_ptr<net::ProxyService> system_proxy_service; 135 scoped_ptr<net::ProxyService> system_proxy_service;
134 scoped_ptr<net::HttpTransactionFactory> system_http_transaction_factory; 136 scoped_ptr<net::HttpTransactionFactory> system_http_transaction_factory;
137 scoped_ptr<net::FtpTransactionFactory> system_ftp_transaction_factory;
135 scoped_ptr<net::URLRequestContext> system_request_context; 138 scoped_ptr<net::URLRequestContext> system_request_context;
136 SystemRequestContextLeakChecker system_request_context_leak_checker; 139 SystemRequestContextLeakChecker system_request_context_leak_checker;
137 // |system_cookie_store| and |system_server_bound_cert_service| are shared 140 // |system_cookie_store| and |system_server_bound_cert_service| are shared
138 // between |proxy_script_fetcher_context| and |system_request_context|. 141 // between |proxy_script_fetcher_context| and |system_request_context|.
139 scoped_refptr<net::CookieStore> system_cookie_store; 142 scoped_refptr<net::CookieStore> system_cookie_store;
140 scoped_refptr<extensions::EventRouterForwarder> 143 scoped_refptr<extensions::EventRouterForwarder>
141 extension_event_router_forwarder; 144 extension_event_router_forwarder;
142 scoped_ptr<chrome_browser_net::HttpPipeliningCompatibilityClient> 145 scoped_ptr<chrome_browser_net::HttpPipeliningCompatibilityClient>
143 http_pipelining_compatibility_client; 146 http_pipelining_compatibility_client;
144 scoped_ptr<chrome_browser_net::LoadTimeStats> load_time_stats; 147 scoped_ptr<chrome_browser_net::LoadTimeStats> load_time_stats;
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 299
297 // True if SPDY is disabled by policy. 300 // True if SPDY is disabled by policy.
298 bool is_spdy_disabled_by_policy_; 301 bool is_spdy_disabled_by_policy_;
299 302
300 base::WeakPtrFactory<IOThread> weak_factory_; 303 base::WeakPtrFactory<IOThread> weak_factory_;
301 304
302 DISALLOW_COPY_AND_ASSIGN(IOThread); 305 DISALLOW_COPY_AND_ASSIGN(IOThread);
303 }; 306 };
304 307
305 #endif // CHROME_BROWSER_IO_THREAD_H_ 308 #endif // CHROME_BROWSER_IO_THREAD_H_
OLDNEW
« no previous file with comments | « trunk/src/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc ('k') | trunk/src/chrome/browser/io_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698