OLD | NEW |
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 #include "net/url_request/url_request_test_util.h" | 5 #include "net/url_request/url_request_test_util.h" |
6 | 6 |
7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "base/threading/thread.h" | 10 #include "base/threading/thread.h" |
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
402 EXPECT_TRUE(next_states_[req_id] & kStageSendHeaders) << | 402 EXPECT_TRUE(next_states_[req_id] & kStageSendHeaders) << |
403 event_order_[req_id]; | 403 event_order_[req_id]; |
404 next_states_[req_id] = | 404 next_states_[req_id] = |
405 kStageHeadersReceived | | 405 kStageHeadersReceived | |
406 kStageCompletedError; | 406 kStageCompletedError; |
407 } | 407 } |
408 | 408 |
409 int TestNetworkDelegate::OnHeadersReceived( | 409 int TestNetworkDelegate::OnHeadersReceived( |
410 URLRequest* request, | 410 URLRequest* request, |
411 const CompletionCallback& callback, | 411 const CompletionCallback& callback, |
| 412 GURL* new_url, |
412 const HttpResponseHeaders* original_response_headers, | 413 const HttpResponseHeaders* original_response_headers, |
413 scoped_refptr<HttpResponseHeaders>* override_response_headers) { | 414 scoped_refptr<HttpResponseHeaders>* override_response_headers) { |
414 int req_id = request->identifier(); | 415 int req_id = request->identifier(); |
415 event_order_[req_id] += "OnHeadersReceived\n"; | 416 event_order_[req_id] += "OnHeadersReceived\n"; |
416 InitRequestStatesIfNew(req_id); | 417 InitRequestStatesIfNew(req_id); |
417 EXPECT_TRUE(next_states_[req_id] & kStageHeadersReceived) << | 418 EXPECT_TRUE(next_states_[req_id] & kStageHeadersReceived) << |
418 event_order_[req_id]; | 419 event_order_[req_id]; |
419 next_states_[req_id] = | 420 next_states_[req_id] = |
420 kStageBeforeRedirect | | 421 kStageBeforeRedirect | |
421 kStageResponseStarted | | 422 kStageResponseStarted | |
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
614 URLRequestJob* job = main_intercept_job_; | 615 URLRequestJob* job = main_intercept_job_; |
615 main_intercept_job_ = NULL; | 616 main_intercept_job_ = NULL; |
616 return job; | 617 return job; |
617 } | 618 } |
618 | 619 |
619 void TestJobInterceptor::set_main_intercept_job(URLRequestJob* job) { | 620 void TestJobInterceptor::set_main_intercept_job(URLRequestJob* job) { |
620 main_intercept_job_ = job; | 621 main_intercept_job_ = job; |
621 } | 622 } |
622 | 623 |
623 } // namespace net | 624 } // namespace net |
OLD | NEW |