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

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

Issue 11419034: net: Move ownership of UploadDataStream from URLRequestHttpJob to URLRequest (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix ASAN Created 8 years, 1 month 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
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_HTTP_JOB_H_ 5 #ifndef NET_URL_REQUEST_URL_REQUEST_HTTP_JOB_H_
6 #define NET_URL_REQUEST_URL_REQUEST_HTTP_JOB_H_ 6 #define NET_URL_REQUEST_URL_REQUEST_HTTP_JOB_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 63
64 // |result| should be net::OK, or the request is canceled. 64 // |result| should be net::OK, or the request is canceled.
65 void OnHeadersReceivedCallback(int result); 65 void OnHeadersReceivedCallback(int result);
66 void OnStartCompleted(int result); 66 void OnStartCompleted(int result);
67 void OnReadCompleted(int result); 67 void OnReadCompleted(int result);
68 void NotifyBeforeSendHeadersCallback(int result); 68 void NotifyBeforeSendHeadersCallback(int result);
69 69
70 void RestartTransactionWithAuth(const AuthCredentials& credentials); 70 void RestartTransactionWithAuth(const AuthCredentials& credentials);
71 71
72 // Overridden from URLRequestJob: 72 // Overridden from URLRequestJob:
73 virtual void SetUpload(UploadData* upload) OVERRIDE; 73 virtual void SetUpload(UploadDataStream* upload) OVERRIDE;
74 virtual void SetExtraRequestHeaders( 74 virtual void SetExtraRequestHeaders(
75 const HttpRequestHeaders& headers) OVERRIDE; 75 const HttpRequestHeaders& headers) OVERRIDE;
76 virtual void Start() OVERRIDE; 76 virtual void Start() OVERRIDE;
77 virtual void Kill() OVERRIDE; 77 virtual void Kill() OVERRIDE;
78 virtual LoadState GetLoadState() const OVERRIDE; 78 virtual LoadState GetLoadState() const OVERRIDE;
79 virtual UploadProgress GetUploadProgress() const OVERRIDE; 79 virtual UploadProgress GetUploadProgress() const OVERRIDE;
80 virtual bool GetMimeType(std::string* mime_type) const OVERRIDE; 80 virtual bool GetMimeType(std::string* mime_type) const OVERRIDE;
81 virtual bool GetCharset(std::string* charset) OVERRIDE; 81 virtual bool GetCharset(std::string* charset) OVERRIDE;
82 virtual void GetResponseInfo(HttpResponseInfo* info) OVERRIDE; 82 virtual void GetResponseInfo(HttpResponseInfo* info) OVERRIDE;
83 virtual bool GetResponseCookies(std::vector<std::string>* cookies) OVERRIDE; 83 virtual bool GetResponseCookies(std::vector<std::string>* cookies) OVERRIDE;
84 virtual int GetResponseCode() const OVERRIDE; 84 virtual int GetResponseCode() const OVERRIDE;
85 virtual Filter* SetupFilter() const OVERRIDE; 85 virtual Filter* SetupFilter() const OVERRIDE;
86 virtual bool IsSafeRedirect(const GURL& location) OVERRIDE; 86 virtual bool IsSafeRedirect(const GURL& location) OVERRIDE;
87 virtual bool NeedsAuth() OVERRIDE; 87 virtual bool NeedsAuth() OVERRIDE;
88 virtual void GetAuthChallengeInfo(scoped_refptr<AuthChallengeInfo>*) OVERRIDE; 88 virtual void GetAuthChallengeInfo(scoped_refptr<AuthChallengeInfo>*) OVERRIDE;
89 virtual void SetAuth(const AuthCredentials& credentials) OVERRIDE; 89 virtual void SetAuth(const AuthCredentials& credentials) OVERRIDE;
90 virtual void CancelAuth() OVERRIDE; 90 virtual void CancelAuth() OVERRIDE;
91 virtual void ContinueWithCertificate(X509Certificate* client_cert) OVERRIDE; 91 virtual void ContinueWithCertificate(X509Certificate* client_cert) OVERRIDE;
92 virtual void ContinueDespiteLastError() OVERRIDE; 92 virtual void ContinueDespiteLastError() OVERRIDE;
93 virtual bool ReadRawData(IOBuffer* buf, int buf_size, 93 virtual bool ReadRawData(IOBuffer* buf, int buf_size,
94 int* bytes_read) OVERRIDE; 94 int* bytes_read) OVERRIDE;
95 virtual void StopCaching() OVERRIDE; 95 virtual void StopCaching() OVERRIDE;
96 virtual void DoneReading() OVERRIDE; 96 virtual void DoneReading() OVERRIDE;
97 virtual HostPortPair GetSocketAddress() const OVERRIDE; 97 virtual HostPortPair GetSocketAddress() const OVERRIDE;
98 virtual void NotifyURLRequestDestroyed() OVERRIDE; 98 virtual void NotifyURLRequestDestroyed() OVERRIDE;
99 99
100 scoped_ptr<UploadDataStream> upload_data_stream_;
101
102 HttpRequestInfo request_info_; 100 HttpRequestInfo request_info_;
103 const HttpResponseInfo* response_info_; 101 const HttpResponseInfo* response_info_;
104 102
105 std::vector<std::string> response_cookies_; 103 std::vector<std::string> response_cookies_;
106 size_t response_cookies_save_index_; 104 size_t response_cookies_save_index_;
107 base::Time response_date_; 105 base::Time response_date_;
108 106
109 // Auth states for proxy and origin server. 107 // Auth states for proxy and origin server.
110 AuthState proxy_auth_state_; 108 AuthState proxy_auth_state_;
111 AuthState server_auth_state_; 109 AuthState server_auth_state_;
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 scoped_ptr<HttpTransactionDelegateImpl> http_transaction_delegate_; 249 scoped_ptr<HttpTransactionDelegateImpl> http_transaction_delegate_;
252 250
253 const HttpUserAgentSettings* http_user_agent_settings_; 251 const HttpUserAgentSettings* http_user_agent_settings_;
254 252
255 DISALLOW_COPY_AND_ASSIGN(URLRequestHttpJob); 253 DISALLOW_COPY_AND_ASSIGN(URLRequestHttpJob);
256 }; 254 };
257 255
258 } // namespace net 256 } // namespace net
259 257
260 #endif // NET_URL_REQUEST_URL_REQUEST_HTTP_JOB_H_ 258 #endif // NET_URL_REQUEST_URL_REQUEST_HTTP_JOB_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698