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

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

Issue 8511063: Improve merging of header modifications in webRequest.OnHeadersReceived (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Disabled browser tests again Created 9 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 | Annotate | Revision Log
« no previous file with comments | « net/http/http_response_headers_unittest.cc ('k') | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 213
214 // The start time for the job, ignoring re-starts. 214 // The start time for the job, ignoring re-starts.
215 base::TimeTicks start_time_; 215 base::TimeTicks start_time_;
216 216
217 scoped_ptr<HttpFilterContext> filter_context_; 217 scoped_ptr<HttpFilterContext> filter_context_;
218 ScopedRunnableMethodFactory<URLRequestHttpJob> method_factory_; 218 ScopedRunnableMethodFactory<URLRequestHttpJob> method_factory_;
219 base::WeakPtrFactory<URLRequestHttpJob> weak_ptr_factory_; 219 base::WeakPtrFactory<URLRequestHttpJob> weak_ptr_factory_;
220 220
221 OldCompletionCallbackImpl<URLRequestHttpJob> on_headers_received_callback_; 221 OldCompletionCallbackImpl<URLRequestHttpJob> on_headers_received_callback_;
222 222
223 // We allow the network delegate to modify a copy of the response headers.
224 // This prevents modifications of headers that are shared with the underlying
225 // layers of the network stack.
223 scoped_refptr<HttpResponseHeaders> override_response_headers_; 226 scoped_refptr<HttpResponseHeaders> override_response_headers_;
224 227
225 // Flag used to verify that |this| is not deleted while we are awaiting 228 // Flag used to verify that |this| is not deleted while we are awaiting
226 // a callback from the NetworkDelegate. Used as a fail-fast mechanism. 229 // a callback from the NetworkDelegate. Used as a fail-fast mechanism.
227 // True if we are waiting a callback and 230 // True if we are waiting a callback and
228 // NetworkDelegate::NotifyURLRequestDestroyed has not been called, yet, 231 // NetworkDelegate::NotifyURLRequestDestroyed has not been called, yet,
229 // to inform the NetworkDelegate that it may not call back. 232 // to inform the NetworkDelegate that it may not call back.
230 bool awaiting_callback_; 233 bool awaiting_callback_;
231 234
232 DISALLOW_COPY_AND_ASSIGN(URLRequestHttpJob); 235 DISALLOW_COPY_AND_ASSIGN(URLRequestHttpJob);
233 }; 236 };
234 237
235 } // namespace net 238 } // namespace net
236 239
237 #endif // NET_URL_REQUEST_URL_REQUEST_HTTP_JOB_H_ 240 #endif // NET_URL_REQUEST_URL_REQUEST_HTTP_JOB_H_
OLDNEW
« no previous file with comments | « net/http/http_response_headers_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698