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

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

Issue 24246016: Make HttpNetworkTransaction no longer own a reference to HttpNetworkSession. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Sync, fix new test Created 7 years, 2 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
« no previous file with comments | « no previous file | net/http/http_network_transaction.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_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 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 auth_controllers_[HttpAuth::AUTH_NUM_TARGETS]; 249 auth_controllers_[HttpAuth::AUTH_NUM_TARGETS];
250 250
251 // Whether this transaction is waiting for proxy auth, server auth, or is 251 // Whether this transaction is waiting for proxy auth, server auth, or is
252 // not waiting for any auth at all. |pending_auth_target_| is read and 252 // not waiting for any auth at all. |pending_auth_target_| is read and
253 // cleared by RestartWithAuth(). 253 // cleared by RestartWithAuth().
254 HttpAuth::Target pending_auth_target_; 254 HttpAuth::Target pending_auth_target_;
255 255
256 CompletionCallback io_callback_; 256 CompletionCallback io_callback_;
257 CompletionCallback callback_; 257 CompletionCallback callback_;
258 258
259 scoped_refptr<HttpNetworkSession> session_; 259 HttpNetworkSession* session_;
260 260
261 BoundNetLog net_log_; 261 BoundNetLog net_log_;
262 const HttpRequestInfo* request_; 262 const HttpRequestInfo* request_;
263 RequestPriority priority_; 263 RequestPriority priority_;
264 HttpResponseInfo response_; 264 HttpResponseInfo response_;
265 265
266 // |proxy_info_| is the ProxyInfo used by the HttpStreamRequest. 266 // |proxy_info_| is the ProxyInfo used by the HttpStreamRequest.
267 ProxyInfo proxy_info_; 267 ProxyInfo proxy_info_;
268 268
269 scoped_ptr<HttpStreamRequest> stream_request_; 269 scoped_ptr<HttpStreamRequest> stream_request_;
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 // True when the tunnel is in the process of being established - we can't 305 // True when the tunnel is in the process of being established - we can't
306 // read from the socket until the tunnel is done. 306 // read from the socket until the tunnel is done.
307 bool establishing_tunnel_; 307 bool establishing_tunnel_;
308 308
309 DISALLOW_COPY_AND_ASSIGN(HttpNetworkTransaction); 309 DISALLOW_COPY_AND_ASSIGN(HttpNetworkTransaction);
310 }; 310 };
311 311
312 } // namespace net 312 } // namespace net
313 313
314 #endif // NET_HTTP_HTTP_NETWORK_TRANSACTION_H_ 314 #endif // NET_HTTP_HTTP_NETWORK_TRANSACTION_H_
OLDNEW
« no previous file with comments | « no previous file | net/http/http_network_transaction.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698