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

Side by Side Diff: net/http/http_network_layer.h

Issue 1604045: Fix crash on IP address change. (Closed)
Patch Set: Merge conflict Created 10 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:
View unified diff | Download patch
« no previous file with comments | « net/http/http_cache.cc ('k') | net/http/http_network_layer.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) 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 #ifndef NET_HTTP_HTTP_NETWORK_LAYER_H_ 5 #ifndef NET_HTTP_HTTP_NETWORK_LAYER_H_
6 #define NET_HTTP_HTTP_NETWORK_LAYER_H_ 6 #define NET_HTTP_HTTP_NETWORK_LAYER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/ref_counted.h" 10 #include "base/ref_counted.h"
11 #include "base/scoped_ptr.h" 11 #include "base/scoped_ptr.h"
12 #include "net/http/http_transaction_factory.h" 12 #include "net/http/http_transaction_factory.h"
13 13
14 namespace net { 14 namespace net {
15 15
16 class ClientSocketFactory; 16 class ClientSocketFactory;
17 class HostResolver; 17 class HostResolver;
18 class HttpAuthHandlerFactory; 18 class HttpAuthHandlerFactory;
19 class HttpNetworkSession; 19 class HttpNetworkSession;
20 class NetworkChangeNotifier; 20 class NetworkChangeNotifier;
21 class ProxyInfo; 21 class ProxyInfo;
22 class ProxyService; 22 class ProxyService;
23 class SpdySessionPool;
23 class SSLConfigService; 24 class SSLConfigService;
24 25
25 class HttpNetworkLayer : public HttpTransactionFactory { 26 class HttpNetworkLayer : public HttpTransactionFactory {
26 public: 27 public:
27 // |socket_factory|, |network_change_notifier|, |proxy_service| and 28 // |socket_factory|, |network_change_notifier|, |proxy_service| and
28 // |host_resolver| must remain valid for the lifetime of HttpNetworkLayer. 29 // |host_resolver| must remain valid for the lifetime of HttpNetworkLayer.
29 HttpNetworkLayer(ClientSocketFactory* socket_factory, 30 HttpNetworkLayer(ClientSocketFactory* socket_factory,
30 NetworkChangeNotifier* network_change_notifier, 31 NetworkChangeNotifier* network_change_notifier,
31 HostResolver* host_resolver, ProxyService* proxy_service, 32 HostResolver* host_resolver, ProxyService* proxy_service,
32 SSLConfigService* ssl_config_service, 33 SSLConfigService* ssl_config_service,
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 75
75 // The host resolver and proxy service that will be used when lazily 76 // The host resolver and proxy service that will be used when lazily
76 // creating |session_|. 77 // creating |session_|.
77 scoped_refptr<HostResolver> host_resolver_; 78 scoped_refptr<HostResolver> host_resolver_;
78 scoped_refptr<ProxyService> proxy_service_; 79 scoped_refptr<ProxyService> proxy_service_;
79 80
80 // The SSL config service being used for the session. 81 // The SSL config service being used for the session.
81 scoped_refptr<SSLConfigService> ssl_config_service_; 82 scoped_refptr<SSLConfigService> ssl_config_service_;
82 83
83 scoped_refptr<HttpNetworkSession> session_; 84 scoped_refptr<HttpNetworkSession> session_;
85 scoped_refptr<SpdySessionPool> spdy_session_pool_;
84 86
85 HttpAuthHandlerFactory* http_auth_handler_factory_; 87 HttpAuthHandlerFactory* http_auth_handler_factory_;
86 88
87 bool suspended_; 89 bool suspended_;
88 static bool force_spdy_; 90 static bool force_spdy_;
89 }; 91 };
90 92
91 } // namespace net 93 } // namespace net
92 94
93 #endif // NET_HTTP_HTTP_NETWORK_LAYER_H_ 95 #endif // NET_HTTP_HTTP_NETWORK_LAYER_H_
OLDNEW
« no previous file with comments | « net/http/http_cache.cc ('k') | net/http/http_network_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698