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

Side by Side Diff: net/url_request/url_request_context_storage.h

Issue 2883143002: Reorder URLRequestContextStorage members. (Closed)
Patch Set: Reorder setters, too Created 3 years, 7 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
« no previous file with comments | « no previous file | net/url_request/url_request_context_storage.cc » ('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) 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 NET_URL_REQUEST_URL_REQUEST_CONTEXT_STORAGE_H_ 5 #ifndef NET_URL_REQUEST_URL_REQUEST_CONTEXT_STORAGE_H_
6 #define NET_URL_REQUEST_URL_REQUEST_CONTEXT_STORAGE_H_ 6 #define NET_URL_REQUEST_URL_REQUEST_CONTEXT_STORAGE_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 // These setters will set both the member variables and call the setter on the 49 // These setters will set both the member variables and call the setter on the
50 // URLRequestContext object. In all cases, ownership is passed to |this|. 50 // URLRequestContext object. In all cases, ownership is passed to |this|.
51 51
52 void set_net_log(std::unique_ptr<NetLog> net_log); 52 void set_net_log(std::unique_ptr<NetLog> net_log);
53 void set_host_resolver(std::unique_ptr<HostResolver> host_resolver); 53 void set_host_resolver(std::unique_ptr<HostResolver> host_resolver);
54 void set_cert_verifier(std::unique_ptr<CertVerifier> cert_verifier); 54 void set_cert_verifier(std::unique_ptr<CertVerifier> cert_verifier);
55 void set_channel_id_service( 55 void set_channel_id_service(
56 std::unique_ptr<ChannelIDService> channel_id_service); 56 std::unique_ptr<ChannelIDService> channel_id_service);
57 void set_http_auth_handler_factory( 57 void set_http_auth_handler_factory(
58 std::unique_ptr<HttpAuthHandlerFactory> http_auth_handler_factory); 58 std::unique_ptr<HttpAuthHandlerFactory> http_auth_handler_factory);
59 void set_proxy_delegate(std::unique_ptr<ProxyDelegate> proxy_delegate);
60 void set_network_delegate(std::unique_ptr<NetworkDelegate> network_delegate);
59 void set_proxy_service(std::unique_ptr<ProxyService> proxy_service); 61 void set_proxy_service(std::unique_ptr<ProxyService> proxy_service);
60 void set_ssl_config_service(SSLConfigService* ssl_config_service); 62 void set_ssl_config_service(SSLConfigService* ssl_config_service);
61 void set_network_delegate(std::unique_ptr<NetworkDelegate> network_delegate);
62 void set_proxy_delegate(std::unique_ptr<ProxyDelegate> proxy_delegate);
63 void set_http_server_properties( 63 void set_http_server_properties(
64 std::unique_ptr<HttpServerProperties> http_server_properties); 64 std::unique_ptr<HttpServerProperties> http_server_properties);
65 void set_cookie_store(std::unique_ptr<CookieStore> cookie_store); 65 void set_cookie_store(std::unique_ptr<CookieStore> cookie_store);
66 void set_transport_security_state( 66 void set_transport_security_state(
67 std::unique_ptr<TransportSecurityState> transport_security_state); 67 std::unique_ptr<TransportSecurityState> transport_security_state);
68 void set_cert_transparency_verifier( 68 void set_cert_transparency_verifier(
69 std::unique_ptr<CTVerifier> cert_transparency_verifier); 69 std::unique_ptr<CTVerifier> cert_transparency_verifier);
70 void set_ct_policy_enforcer( 70 void set_ct_policy_enforcer(
71 std::unique_ptr<CTPolicyEnforcer> ct_policy_enforcer); 71 std::unique_ptr<CTPolicyEnforcer> ct_policy_enforcer);
72 void set_http_network_session( 72 void set_http_network_session(
(...skipping 19 matching lines...) Expand all
92 // Not owned. 92 // Not owned.
93 URLRequestContext* const context_; 93 URLRequestContext* const context_;
94 94
95 // Owned members. 95 // Owned members.
96 std::unique_ptr<NetLog> net_log_; 96 std::unique_ptr<NetLog> net_log_;
97 std::unique_ptr<HostResolver> host_resolver_; 97 std::unique_ptr<HostResolver> host_resolver_;
98 std::unique_ptr<CertVerifier> cert_verifier_; 98 std::unique_ptr<CertVerifier> cert_verifier_;
99 // The ChannelIDService must outlive the HttpTransactionFactory. 99 // The ChannelIDService must outlive the HttpTransactionFactory.
100 std::unique_ptr<ChannelIDService> channel_id_service_; 100 std::unique_ptr<ChannelIDService> channel_id_service_;
101 std::unique_ptr<HttpAuthHandlerFactory> http_auth_handler_factory_; 101 std::unique_ptr<HttpAuthHandlerFactory> http_auth_handler_factory_;
102 std::unique_ptr<ProxyDelegate> proxy_delegate_;
103 std::unique_ptr<NetworkDelegate> network_delegate_;
102 std::unique_ptr<ProxyService> proxy_service_; 104 std::unique_ptr<ProxyService> proxy_service_;
103 // TODO(willchan): Remove refcounting on this member. 105 // TODO(willchan): Remove refcounting on this member.
104 scoped_refptr<SSLConfigService> ssl_config_service_; 106 scoped_refptr<SSLConfigService> ssl_config_service_;
105 std::unique_ptr<NetworkDelegate> network_delegate_;
106 std::unique_ptr<ProxyDelegate> proxy_delegate_;
107 std::unique_ptr<HttpServerProperties> http_server_properties_; 107 std::unique_ptr<HttpServerProperties> http_server_properties_;
108 std::unique_ptr<HttpUserAgentSettings> http_user_agent_settings_; 108 std::unique_ptr<HttpUserAgentSettings> http_user_agent_settings_;
109 std::unique_ptr<CookieStore> cookie_store_; 109 std::unique_ptr<CookieStore> cookie_store_;
110 std::unique_ptr<TransportSecurityState> transport_security_state_; 110 std::unique_ptr<TransportSecurityState> transport_security_state_;
111 std::unique_ptr<CTVerifier> cert_transparency_verifier_; 111 std::unique_ptr<CTVerifier> cert_transparency_verifier_;
112 std::unique_ptr<CTPolicyEnforcer> ct_policy_enforcer_; 112 std::unique_ptr<CTPolicyEnforcer> ct_policy_enforcer_;
113 113
114 // Not actually pointed at by the URLRequestContext, but may be used (but not 114 // Not actually pointed at by the URLRequestContext, but may be used (but not
115 // owned) by the HttpTransactionFactory. 115 // owned) by the HttpTransactionFactory.
116 std::unique_ptr<HttpNetworkSession> http_network_session_; 116 std::unique_ptr<HttpNetworkSession> http_network_session_;
117 117
118 std::unique_ptr<HttpTransactionFactory> http_transaction_factory_; 118 std::unique_ptr<HttpTransactionFactory> http_transaction_factory_;
119 std::unique_ptr<URLRequestJobFactory> job_factory_; 119 std::unique_ptr<URLRequestJobFactory> job_factory_;
120 std::unique_ptr<URLRequestThrottlerManager> throttler_manager_; 120 std::unique_ptr<URLRequestThrottlerManager> throttler_manager_;
121 std::unique_ptr<SdchManager> sdch_manager_; 121 std::unique_ptr<SdchManager> sdch_manager_;
122 std::unique_ptr<ReportingService> reporting_service_; 122 std::unique_ptr<ReportingService> reporting_service_;
123 123
124 DISALLOW_COPY_AND_ASSIGN(URLRequestContextStorage); 124 DISALLOW_COPY_AND_ASSIGN(URLRequestContextStorage);
125 }; 125 };
126 126
127 } // namespace net 127 } // namespace net
128 128
129 #endif // NET_URL_REQUEST_URL_REQUEST_CONTEXT_STORAGE_H_ 129 #endif // NET_URL_REQUEST_URL_REQUEST_CONTEXT_STORAGE_H_
OLDNEW
« no previous file with comments | « no previous file | net/url_request/url_request_context_storage.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698