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

Side by Side Diff: content/browser/loader/intercepting_resource_handler_unittest.cc

Issue 2484633004: Change Lo-Fi bool to bitmask to support multiple Previews types (Closed)
Patch Set: fix ContentResourceProviderTest Created 3 years, 11 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "content/browser/loader/intercepting_resource_handler.h" 5 #include "content/browser/loader/intercepting_resource_handler.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
11 11
12 #include "base/files/file_path.h" 12 #include "base/files/file_path.h"
13 #include "base/location.h" 13 #include "base/location.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/memory/ptr_util.h" 16 #include "base/memory/ptr_util.h"
17 #include "base/single_thread_task_runner.h" 17 #include "base/single_thread_task_runner.h"
18 #include "base/threading/thread_task_runner_handle.h" 18 #include "base/threading/thread_task_runner_handle.h"
19 #include "content/browser/loader/resource_controller.h" 19 #include "content/browser/loader/resource_controller.h"
20 #include "content/browser/loader/test_resource_handler.h" 20 #include "content/browser/loader/test_resource_handler.h"
21 #include "content/public/browser/resource_request_info.h" 21 #include "content/public/browser/resource_request_info.h"
22 #include "content/public/common/previews_state.h"
22 #include "content/public/common/resource_response.h" 23 #include "content/public/common/resource_response.h"
23 #include "content/public/common/webplugininfo.h" 24 #include "content/public/common/webplugininfo.h"
24 #include "content/public/test/test_browser_thread_bundle.h" 25 #include "content/public/test/test_browser_thread_bundle.h"
25 #include "content/public/test/test_utils.h" 26 #include "content/public/test/test_utils.h"
26 #include "net/base/net_errors.h" 27 #include "net/base/net_errors.h"
27 #include "net/url_request/url_request_context.h" 28 #include "net/url_request/url_request_context.h"
28 #include "net/url_request/url_request_status.h" 29 #include "net/url_request/url_request_status.h"
29 #include "testing/gtest/include/gtest/gtest.h" 30 #include "testing/gtest/include/gtest/gtest.h"
30 #include "url/gurl.h" 31 #include "url/gurl.h"
31 32
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 ResourceRequestInfo::AllocateForTesting(request.get(), 67 ResourceRequestInfo::AllocateForTesting(request.get(),
67 RESOURCE_TYPE_MAIN_FRAME, 68 RESOURCE_TYPE_MAIN_FRAME,
68 nullptr, // context 69 nullptr, // context
69 0, // render_process_id 70 0, // render_process_id
70 0, // render_view_id 71 0, // render_view_id
71 0, // render_frame_id 72 0, // render_frame_id
72 true, // is_main_frame 73 true, // is_main_frame
73 false, // parent_is_main_frame 74 false, // parent_is_main_frame
74 true, // allow_download 75 true, // allow_download
75 true, // is_async 76 true, // is_async
76 false); // is_using_lofi 77 PREVIEWS_OFF); // previews_state
77 78
78 net::URLRequestStatus old_handler_status; 79 net::URLRequestStatus old_handler_status;
79 std::string old_handler_body; 80 std::string old_handler_body;
80 std::unique_ptr<TestResourceHandler> old_handler( 81 std::unique_ptr<TestResourceHandler> old_handler(
81 new TestResourceHandler(&old_handler_status, &old_handler_body)); 82 new TestResourceHandler(&old_handler_status, &old_handler_body));
82 TestResourceHandler* old_test_handler = old_handler.get(); 83 TestResourceHandler* old_test_handler = old_handler.get();
83 std::unique_ptr<InterceptingResourceHandler> intercepting_handler( 84 std::unique_ptr<InterceptingResourceHandler> intercepting_handler(
84 new InterceptingResourceHandler(std::move(old_handler), request.get())); 85 new InterceptingResourceHandler(std::move(old_handler), request.get()));
85 86
86 scoped_refptr<ResourceResponse> response(new ResourceResponse); 87 scoped_refptr<ResourceResponse> response(new ResourceResponse);
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 ResourceRequestInfo::AllocateForTesting(request.get(), 136 ResourceRequestInfo::AllocateForTesting(request.get(),
136 RESOURCE_TYPE_MAIN_FRAME, 137 RESOURCE_TYPE_MAIN_FRAME,
137 nullptr, // context 138 nullptr, // context
138 0, // render_process_id 139 0, // render_process_id
139 0, // render_view_id 140 0, // render_view_id
140 0, // render_frame_id 141 0, // render_frame_id
141 true, // is_main_frame 142 true, // is_main_frame
142 false, // parent_is_main_frame 143 false, // parent_is_main_frame
143 true, // allow_download 144 true, // allow_download
144 true, // is_async 145 true, // is_async
145 false); // is_using_lofi 146 PREVIEWS_OFF); // previews_state
146 147
147 net::URLRequestStatus old_handler_status; 148 net::URLRequestStatus old_handler_status;
148 std::string old_handler_body; 149 std::string old_handler_body;
149 std::unique_ptr<TestResourceHandler> old_handler( 150 std::unique_ptr<TestResourceHandler> old_handler(
150 new TestResourceHandler(&old_handler_status, &old_handler_body)); 151 new TestResourceHandler(&old_handler_status, &old_handler_body));
151 scoped_refptr<net::IOBuffer> old_buffer = old_handler.get()->buffer(); 152 scoped_refptr<net::IOBuffer> old_buffer = old_handler.get()->buffer();
152 std::unique_ptr<InterceptingResourceHandler> intercepting_handler( 153 std::unique_ptr<InterceptingResourceHandler> intercepting_handler(
153 new InterceptingResourceHandler(std::move(old_handler), request.get())); 154 new InterceptingResourceHandler(std::move(old_handler), request.get()));
154 155
155 scoped_refptr<ResourceResponse> response(new ResourceResponse); 156 scoped_refptr<ResourceResponse> response(new ResourceResponse);
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 ResourceRequestInfo::AllocateForTesting(request.get(), 221 ResourceRequestInfo::AllocateForTesting(request.get(),
221 RESOURCE_TYPE_MAIN_FRAME, 222 RESOURCE_TYPE_MAIN_FRAME,
222 nullptr, // context 223 nullptr, // context
223 0, // render_process_id 224 0, // render_process_id
224 0, // render_view_id 225 0, // render_view_id
225 0, // render_frame_id 226 0, // render_frame_id
226 true, // is_main_frame 227 true, // is_main_frame
227 false, // parent_is_main_frame 228 false, // parent_is_main_frame
228 true, // allow_download 229 true, // allow_download
229 true, // is_async 230 true, // is_async
230 false); // is_using_lofi 231 PREVIEWS_OFF); // previews_state
231 232
232 net::URLRequestStatus old_handler_status; 233 net::URLRequestStatus old_handler_status;
233 std::string old_handler_body; 234 std::string old_handler_body;
234 std::unique_ptr<TestResourceHandler> old_handler_scoped( 235 std::unique_ptr<TestResourceHandler> old_handler_scoped(
235 new TestResourceHandler(&old_handler_status, &old_handler_body)); 236 new TestResourceHandler(&old_handler_status, &old_handler_body));
236 // When sending a payload to the old ResourceHandler, the 237 // When sending a payload to the old ResourceHandler, the
237 // InterceptingResourceHandler doesn't send a final EOF read. 238 // InterceptingResourceHandler doesn't send a final EOF read.
238 // TODO(mmenke): Should it? Or can we just get rid of that 0-byte read 239 // TODO(mmenke): Should it? Or can we just get rid of that 0-byte read
239 // entirely? 240 // entirely?
240 old_handler_scoped->set_expect_eof_read(false); 241 old_handler_scoped->set_expect_eof_read(false);
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 ResourceRequestInfo::AllocateForTesting(request.get(), 317 ResourceRequestInfo::AllocateForTesting(request.get(),
317 RESOURCE_TYPE_MAIN_FRAME, 318 RESOURCE_TYPE_MAIN_FRAME,
318 nullptr, // context 319 nullptr, // context
319 0, // render_process_id 320 0, // render_process_id
320 0, // render_view_id 321 0, // render_view_id
321 0, // render_frame_id 322 0, // render_frame_id
322 true, // is_main_frame 323 true, // is_main_frame
323 false, // parent_is_main_frame 324 false, // parent_is_main_frame
324 true, // allow_download 325 true, // allow_download
325 true, // is_async 326 true, // is_async
326 false); // is_using_lofi 327 PREVIEWS_OFF); // previews_state
327 328
328 net::URLRequestStatus old_handler_status; 329 net::URLRequestStatus old_handler_status;
329 std::string old_handler_body; 330 std::string old_handler_body;
330 std::unique_ptr<TestResourceHandler> old_handler( 331 std::unique_ptr<TestResourceHandler> old_handler(
331 new TestResourceHandler(&old_handler_status, &old_handler_body)); 332 new TestResourceHandler(&old_handler_status, &old_handler_body));
332 old_handler->set_on_will_read_result(false); 333 old_handler->set_on_will_read_result(false);
333 std::unique_ptr<InterceptingResourceHandler> intercepting_handler( 334 std::unique_ptr<InterceptingResourceHandler> intercepting_handler(
334 new InterceptingResourceHandler(std::move(old_handler), request.get())); 335 new InterceptingResourceHandler(std::move(old_handler), request.get()));
335 336
336 scoped_refptr<ResourceResponse> response(new ResourceResponse); 337 scoped_refptr<ResourceResponse> response(new ResourceResponse);
(...skipping 17 matching lines...) Expand all
354 ResourceRequestInfo::AllocateForTesting(request.get(), 355 ResourceRequestInfo::AllocateForTesting(request.get(),
355 RESOURCE_TYPE_MAIN_FRAME, 356 RESOURCE_TYPE_MAIN_FRAME,
356 nullptr, // context 357 nullptr, // context
357 0, // render_process_id 358 0, // render_process_id
358 0, // render_view_id 359 0, // render_view_id
359 0, // render_frame_id 360 0, // render_frame_id
360 true, // is_main_frame 361 true, // is_main_frame
361 false, // parent_is_main_frame 362 false, // parent_is_main_frame
362 true, // allow_download 363 true, // allow_download
363 true, // is_async 364 true, // is_async
364 false); // is_using_lofi 365 PREVIEWS_OFF); // previews_state
365 366
366 net::URLRequestStatus old_handler_status; 367 net::URLRequestStatus old_handler_status;
367 std::string old_handler_body; 368 std::string old_handler_body;
368 std::unique_ptr<TestResourceHandler> old_handler( 369 std::unique_ptr<TestResourceHandler> old_handler(
369 new TestResourceHandler(&old_handler_status, &old_handler_body)); 370 new TestResourceHandler(&old_handler_status, &old_handler_body));
370 scoped_refptr<net::IOBuffer> old_buffer = old_handler.get()->buffer(); 371 scoped_refptr<net::IOBuffer> old_buffer = old_handler.get()->buffer();
371 std::unique_ptr<InterceptingResourceHandler> intercepting_handler( 372 std::unique_ptr<InterceptingResourceHandler> intercepting_handler(
372 new InterceptingResourceHandler(std::move(old_handler), request.get())); 373 new InterceptingResourceHandler(std::move(old_handler), request.get()));
373 374
374 scoped_refptr<ResourceResponse> response(new ResourceResponse); 375 scoped_refptr<ResourceResponse> response(new ResourceResponse);
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 ResourceRequestInfo::AllocateForTesting(request.get(), 410 ResourceRequestInfo::AllocateForTesting(request.get(),
410 RESOURCE_TYPE_MAIN_FRAME, 411 RESOURCE_TYPE_MAIN_FRAME,
411 nullptr, // context 412 nullptr, // context
412 0, // render_process_id 413 0, // render_process_id
413 0, // render_view_id 414 0, // render_view_id
414 0, // render_frame_id 415 0, // render_frame_id
415 true, // is_main_frame 416 true, // is_main_frame
416 false, // parent_is_main_frame 417 false, // parent_is_main_frame
417 true, // allow_download 418 true, // allow_download
418 true, // is_async 419 true, // is_async
419 false); // is_using_lofi 420 PREVIEWS_OFF); // previews_state
420 421
421 net::URLRequestStatus old_handler_status; 422 net::URLRequestStatus old_handler_status;
422 std::string old_handler_body; 423 std::string old_handler_body;
423 std::unique_ptr<TestResourceHandler> old_handler( 424 std::unique_ptr<TestResourceHandler> old_handler(
424 new TestResourceHandler(&old_handler_status, &old_handler_body)); 425 new TestResourceHandler(&old_handler_status, &old_handler_body));
425 scoped_refptr<net::IOBuffer> old_buffer = old_handler.get()->buffer(); 426 scoped_refptr<net::IOBuffer> old_buffer = old_handler.get()->buffer();
426 std::unique_ptr<InterceptingResourceHandler> intercepting_handler( 427 std::unique_ptr<InterceptingResourceHandler> intercepting_handler(
427 new InterceptingResourceHandler(std::move(old_handler), request.get())); 428 new InterceptingResourceHandler(std::move(old_handler), request.get()));
428 429
429 scoped_refptr<ResourceResponse> response(new ResourceResponse); 430 scoped_refptr<ResourceResponse> response(new ResourceResponse);
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 ResourceRequestInfo::AllocateForTesting(request.get(), 464 ResourceRequestInfo::AllocateForTesting(request.get(),
464 RESOURCE_TYPE_MAIN_FRAME, 465 RESOURCE_TYPE_MAIN_FRAME,
465 nullptr, // context 466 nullptr, // context
466 0, // render_process_id 467 0, // render_process_id
467 0, // render_view_id 468 0, // render_view_id
468 0, // render_frame_id 469 0, // render_frame_id
469 true, // is_main_frame 470 true, // is_main_frame
470 false, // parent_is_main_frame 471 false, // parent_is_main_frame
471 true, // allow_download 472 true, // allow_download
472 true, // is_async 473 true, // is_async
473 false); // is_using_lofi 474 PREVIEWS_OFF); // previews_state
474 475
475 net::URLRequestStatus old_handler_status; 476 net::URLRequestStatus old_handler_status;
476 std::string old_handler_body; 477 std::string old_handler_body;
477 std::unique_ptr<TestResourceHandler> old_handler( 478 std::unique_ptr<TestResourceHandler> old_handler(
478 new TestResourceHandler(&old_handler_status, &old_handler_body)); 479 new TestResourceHandler(&old_handler_status, &old_handler_body));
479 scoped_refptr<net::IOBuffer> old_buffer = old_handler.get()->buffer(); 480 scoped_refptr<net::IOBuffer> old_buffer = old_handler.get()->buffer();
480 std::unique_ptr<InterceptingResourceHandler> intercepting_handler( 481 std::unique_ptr<InterceptingResourceHandler> intercepting_handler(
481 new InterceptingResourceHandler(std::move(old_handler), request.get())); 482 new InterceptingResourceHandler(std::move(old_handler), request.get()));
482 483
483 scoped_refptr<ResourceResponse> response(new ResourceResponse); 484 scoped_refptr<ResourceResponse> response(new ResourceResponse);
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 ResourceRequestInfo::AllocateForTesting(request.get(), 527 ResourceRequestInfo::AllocateForTesting(request.get(),
527 RESOURCE_TYPE_MAIN_FRAME, 528 RESOURCE_TYPE_MAIN_FRAME,
528 nullptr, // context 529 nullptr, // context
529 0, // render_process_id 530 0, // render_process_id
530 0, // render_view_id 531 0, // render_view_id
531 0, // render_frame_id 532 0, // render_frame_id
532 true, // is_main_frame 533 true, // is_main_frame
533 false, // parent_is_main_frame 534 false, // parent_is_main_frame
534 true, // allow_download 535 true, // allow_download
535 true, // is_async 536 true, // is_async
536 false); // is_using_lofi 537 PREVIEWS_OFF); // previews_state
537 538
538 net::URLRequestStatus old_handler_status; 539 net::URLRequestStatus old_handler_status;
539 std::string old_handler_body; 540 std::string old_handler_body;
540 std::unique_ptr<TestResourceHandler> old_handler( 541 std::unique_ptr<TestResourceHandler> old_handler(
541 new TestResourceHandler(&old_handler_status, &old_handler_body)); 542 new TestResourceHandler(&old_handler_status, &old_handler_body));
542 scoped_refptr<net::IOBuffer> old_buffer = old_handler.get()->buffer(); 543 scoped_refptr<net::IOBuffer> old_buffer = old_handler.get()->buffer();
543 std::unique_ptr<InterceptingResourceHandler> intercepting_handler( 544 std::unique_ptr<InterceptingResourceHandler> intercepting_handler(
544 new InterceptingResourceHandler(std::move(old_handler), request.get())); 545 new InterceptingResourceHandler(std::move(old_handler), request.get()));
545 546
546 scoped_refptr<ResourceResponse> response(new ResourceResponse); 547 scoped_refptr<ResourceResponse> response(new ResourceResponse);
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 ResourceRequestInfo::AllocateForTesting(request.get(), 590 ResourceRequestInfo::AllocateForTesting(request.get(),
590 RESOURCE_TYPE_MAIN_FRAME, 591 RESOURCE_TYPE_MAIN_FRAME,
591 nullptr, // context 592 nullptr, // context
592 0, // render_process_id 593 0, // render_process_id
593 0, // render_view_id 594 0, // render_view_id
594 0, // render_frame_id 595 0, // render_frame_id
595 true, // is_main_frame 596 true, // is_main_frame
596 false, // parent_is_main_frame 597 false, // parent_is_main_frame
597 true, // allow_download 598 true, // allow_download
598 true, // is_async 599 true, // is_async
599 false); // is_using_lofi 600 PREVIEWS_OFF); // previews_state
600 601
601 std::unique_ptr<TestResourceController> resource_controller = 602 std::unique_ptr<TestResourceController> resource_controller =
602 base::MakeUnique<TestResourceController>(); 603 base::MakeUnique<TestResourceController>();
603 net::URLRequestStatus old_handler_status = {net::URLRequestStatus::IO_PENDING, 604 net::URLRequestStatus old_handler_status = {net::URLRequestStatus::IO_PENDING,
604 0}; 605 0};
605 std::string old_handler_body; 606 std::string old_handler_body;
606 std::unique_ptr<TestResourceHandler> old_handler( 607 std::unique_ptr<TestResourceHandler> old_handler(
607 new TestResourceHandler(&old_handler_status, &old_handler_body)); 608 new TestResourceHandler(&old_handler_status, &old_handler_body));
608 // When sending a payload to the old ResourceHandler, the 609 // When sending a payload to the old ResourceHandler, the
609 // InterceptingResourceHandler doesn't send a final EOF read. 610 // InterceptingResourceHandler doesn't send a final EOF read.
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
718 ResourceRequestInfo::AllocateForTesting(request.get(), 719 ResourceRequestInfo::AllocateForTesting(request.get(),
719 RESOURCE_TYPE_MAIN_FRAME, 720 RESOURCE_TYPE_MAIN_FRAME,
720 nullptr, // context 721 nullptr, // context
721 0, // render_process_id 722 0, // render_process_id
722 0, // render_view_id 723 0, // render_view_id
723 0, // render_frame_id 724 0, // render_frame_id
724 true, // is_main_frame 725 true, // is_main_frame
725 false, // parent_is_main_frame 726 false, // parent_is_main_frame
726 true, // allow_download 727 true, // allow_download
727 true, // is_async 728 true, // is_async
728 false); // is_using_lofi 729 PREVIEWS_OFF); // previews_state
729 730
730 std::unique_ptr<TestResourceController> resource_controller = 731 std::unique_ptr<TestResourceController> resource_controller =
731 base::MakeUnique<TestResourceController>(); 732 base::MakeUnique<TestResourceController>();
732 net::URLRequestStatus old_handler_status = {net::URLRequestStatus::IO_PENDING, 733 net::URLRequestStatus old_handler_status = {net::URLRequestStatus::IO_PENDING,
733 0}; 734 0};
734 std::string old_handler_body; 735 std::string old_handler_body;
735 std::unique_ptr<TestResourceHandler> old_handler( 736 std::unique_ptr<TestResourceHandler> old_handler(
736 new TestResourceHandler(&old_handler_status, &old_handler_body)); 737 new TestResourceHandler(&old_handler_status, &old_handler_body));
737 738
738 std::unique_ptr<InterceptingResourceHandler> intercepting_handler( 739 std::unique_ptr<InterceptingResourceHandler> intercepting_handler(
(...skipping 19 matching lines...) Expand all
758 ResourceRequestInfo::AllocateForTesting(request.get(), 759 ResourceRequestInfo::AllocateForTesting(request.get(),
759 RESOURCE_TYPE_MAIN_FRAME, 760 RESOURCE_TYPE_MAIN_FRAME,
760 nullptr, // context 761 nullptr, // context
761 0, // render_process_id 762 0, // render_process_id
762 0, // render_view_id 763 0, // render_view_id
763 0, // render_frame_id 764 0, // render_frame_id
764 true, // is_main_frame 765 true, // is_main_frame
765 false, // parent_is_main_frame 766 false, // parent_is_main_frame
766 true, // allow_download 767 true, // allow_download
767 true, // is_async 768 true, // is_async
768 false); // is_using_lofi 769 PREVIEWS_OFF); // previews_state
769 770
770 std::unique_ptr<TestResourceController> resource_controller = 771 std::unique_ptr<TestResourceController> resource_controller =
771 base::MakeUnique<TestResourceController>(); 772 base::MakeUnique<TestResourceController>();
772 net::URLRequestStatus old_handler_status = {net::URLRequestStatus::IO_PENDING, 773 net::URLRequestStatus old_handler_status = {net::URLRequestStatus::IO_PENDING,
773 0}; 774 0};
774 std::string old_handler_body; 775 std::string old_handler_body;
775 std::unique_ptr<TestResourceHandler> old_handler( 776 std::unique_ptr<TestResourceHandler> old_handler(
776 new TestResourceHandler(&old_handler_status, &old_handler_body)); 777 new TestResourceHandler(&old_handler_status, &old_handler_body));
777 // When sending a payload to the old ResourceHandler, the 778 // When sending a payload to the old ResourceHandler, the
778 // InterceptingResourceHandler doesn't send a final EOF read. 779 // InterceptingResourceHandler doesn't send a final EOF read.
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
837 ResourceRequestInfo::AllocateForTesting(request.get(), 838 ResourceRequestInfo::AllocateForTesting(request.get(),
838 RESOURCE_TYPE_MAIN_FRAME, 839 RESOURCE_TYPE_MAIN_FRAME,
839 nullptr, // context 840 nullptr, // context
840 0, // render_process_id 841 0, // render_process_id
841 0, // render_view_id 842 0, // render_view_id
842 0, // render_frame_id 843 0, // render_frame_id
843 true, // is_main_frame 844 true, // is_main_frame
844 false, // parent_is_main_frame 845 false, // parent_is_main_frame
845 true, // allow_download 846 true, // allow_download
846 true, // is_async 847 true, // is_async
847 false); // is_using_lofi 848 PREVIEWS_OFF); // previews_state
848 849
849 std::unique_ptr<TestResourceController> resource_controller = 850 std::unique_ptr<TestResourceController> resource_controller =
850 base::MakeUnique<TestResourceController>(); 851 base::MakeUnique<TestResourceController>();
851 net::URLRequestStatus old_handler_status = {net::URLRequestStatus::IO_PENDING, 852 net::URLRequestStatus old_handler_status = {net::URLRequestStatus::IO_PENDING,
852 0}; 853 0};
853 std::string old_handler_body; 854 std::string old_handler_body;
854 std::unique_ptr<TestResourceHandler> old_handler( 855 std::unique_ptr<TestResourceHandler> old_handler(
855 new TestResourceHandler(&old_handler_status, &old_handler_body)); 856 new TestResourceHandler(&old_handler_status, &old_handler_body));
856 old_handler->set_defer_on_read_completed(true); 857 old_handler->set_defer_on_read_completed(true);
857 858
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
898 {net::URLRequestStatus::CANCELED, net::ERR_FAILED}, &defer); 899 {net::URLRequestStatus::CANCELED, net::ERR_FAILED}, &defer);
899 ASSERT_TRUE(defer); 900 ASSERT_TRUE(defer);
900 EXPECT_EQ(0, resource_controller->resume_calls()); 901 EXPECT_EQ(0, resource_controller->resume_calls());
901 EXPECT_EQ(net::URLRequestStatus::CANCELED, old_handler_status.status()); 902 EXPECT_EQ(net::URLRequestStatus::CANCELED, old_handler_status.status());
902 EXPECT_EQ(net::URLRequestStatus::CANCELED, new_handler_status.status()); 903 EXPECT_EQ(net::URLRequestStatus::CANCELED, new_handler_status.status());
903 } 904 }
904 905
905 } // namespace 906 } // namespace
906 907
907 } // namespace content 908 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698