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

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

Issue 10825073: Stop using ScopedAllowIO in content::ResourceDispatcherHostImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Chrome Frame fix Created 8 years, 4 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 NET_HTTP_HTTP_NETWORK_TRANSACTION_H_ 5 #ifndef NET_HTTP_HTTP_NETWORK_TRANSACTION_H_
6 #define NET_HTTP_HTTP_NETWORK_TRANSACTION_H_ 6 #define NET_HTTP_HTTP_NETWORK_TRANSACTION_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 10 matching lines...) Expand all
21 #include "net/http/http_stream_factory.h" 21 #include "net/http/http_stream_factory.h"
22 #include "net/http/http_transaction.h" 22 #include "net/http/http_transaction.h"
23 #include "net/proxy/proxy_service.h" 23 #include "net/proxy/proxy_service.h"
24 24
25 namespace net { 25 namespace net {
26 26
27 class HttpAuthController; 27 class HttpAuthController;
28 class HttpNetworkSession; 28 class HttpNetworkSession;
29 class HttpStream; 29 class HttpStream;
30 class HttpStreamRequest; 30 class HttpStreamRequest;
31 class HttpTransactionDelegate;
31 class IOBuffer; 32 class IOBuffer;
32 class UploadDataStream; 33 class UploadDataStream;
33 struct HttpRequestInfo; 34 struct HttpRequestInfo;
34 35
35 class NET_EXPORT_PRIVATE HttpNetworkTransaction 36 class NET_EXPORT_PRIVATE HttpNetworkTransaction
36 : public HttpTransaction, 37 : public HttpTransaction,
37 public HttpStreamRequest::Delegate { 38 public HttpStreamRequest::Delegate {
38 public: 39 public:
39 explicit HttpNetworkTransaction(HttpNetworkSession* session); 40 explicit HttpNetworkTransaction(HttpNetworkSession* session);
40 41
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 const SSLConfig& used_ssl_config, 77 const SSLConfig& used_ssl_config,
77 const ProxyInfo& used_proxy_info, 78 const ProxyInfo& used_proxy_info,
78 HttpAuthController* auth_controller) OVERRIDE; 79 HttpAuthController* auth_controller) OVERRIDE;
79 virtual void OnNeedsClientAuth(const SSLConfig& used_ssl_config, 80 virtual void OnNeedsClientAuth(const SSLConfig& used_ssl_config,
80 SSLCertRequestInfo* cert_info) OVERRIDE; 81 SSLCertRequestInfo* cert_info) OVERRIDE;
81 virtual void OnHttpsProxyTunnelResponse(const HttpResponseInfo& response_info, 82 virtual void OnHttpsProxyTunnelResponse(const HttpResponseInfo& response_info,
82 const SSLConfig& used_ssl_config, 83 const SSLConfig& used_ssl_config,
83 const ProxyInfo& used_proxy_info, 84 const ProxyInfo& used_proxy_info,
84 HttpStream* stream) OVERRIDE; 85 HttpStream* stream) OVERRIDE;
85 86
87 void set_delegate(HttpTransactionDelegate* delegate) {
88 delegate_ = delegate;
89 }
90
86 private: 91 private:
87 FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionSpdy2Test, 92 FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionSpdy2Test,
88 ResetStateForRestart); 93 ResetStateForRestart);
89 FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionSpdy3Test, 94 FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionSpdy3Test,
90 ResetStateForRestart); 95 ResetStateForRestart);
91 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy2Test, 96 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy2Test,
92 WindowUpdateReceived); 97 WindowUpdateReceived);
93 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy2Test, 98 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy2Test,
94 WindowUpdateSent); 99 WindowUpdateSent);
95 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy2Test, 100 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy2Test,
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 // The time the Start method was called. 292 // The time the Start method was called.
288 base::Time start_time_; 293 base::Time start_time_;
289 294
290 // The next state in the state machine. 295 // The next state in the state machine.
291 State next_state_; 296 State next_state_;
292 297
293 // True when the tunnel is in the process of being established - we can't 298 // True when the tunnel is in the process of being established - we can't
294 // read from the socket until the tunnel is done. 299 // read from the socket until the tunnel is done.
295 bool establishing_tunnel_; 300 bool establishing_tunnel_;
296 301
302 HttpTransactionDelegate* delegate_;
303
297 DISALLOW_COPY_AND_ASSIGN(HttpNetworkTransaction); 304 DISALLOW_COPY_AND_ASSIGN(HttpNetworkTransaction);
298 }; 305 };
299 306
300 } // namespace net 307 } // namespace net
301 308
302 #endif // NET_HTTP_HTTP_NETWORK_TRANSACTION_H_ 309 #endif // NET_HTTP_HTTP_NETWORK_TRANSACTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698