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

Side by Side Diff: Source/core/fetch/CachingCorrectnessTest.cpp

Issue 673243002: Rename Resource::willSendRequest() to willFollowRedirect() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Addressed #4 Created 6 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
« no previous file with comments | « no previous file | Source/core/fetch/RawResource.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014, Google Inc. All rights reserved. 2 * Copyright (c) 2014, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 388
389 ResourceResponse fresh301Response; 389 ResourceResponse fresh301Response;
390 fresh301Response.setURL(redirectUrl); 390 fresh301Response.setURL(redirectUrl);
391 fresh301Response.setHTTPStatusCode(301); 391 fresh301Response.setHTTPStatusCode(301);
392 fresh301Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString); 392 fresh301Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString);
393 fresh301Response.setHTTPHeaderField("Location", redirectTargetUrlString); 393 fresh301Response.setHTTPHeaderField("Location", redirectTargetUrlString);
394 fresh301Response.setHTTPHeaderField("Cache-Control", "max-age=600"); 394 fresh301Response.setHTTPHeaderField("Cache-Control", "max-age=600");
395 395
396 // Add the redirect to our request. 396 // Add the redirect to our request.
397 ResourceRequest redirectRequest = ResourceRequest(redirectTargetUrl); 397 ResourceRequest redirectRequest = ResourceRequest(redirectTargetUrl);
398 firstResource->willSendRequest(redirectRequest, fresh301Response); 398 firstResource->willFollowRedirect(redirectRequest, fresh301Response);
399 399
400 // Add the final response to our request. 400 // Add the final response to our request.
401 ResourceResponse fresh200Response; 401 ResourceResponse fresh200Response;
402 fresh200Response.setURL(redirectTargetUrl); 402 fresh200Response.setURL(redirectTargetUrl);
403 fresh200Response.setHTTPStatusCode(200); 403 fresh200Response.setHTTPStatusCode(200);
404 fresh200Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString); 404 fresh200Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString);
405 fresh200Response.setHTTPHeaderField("Expires", kOneDayAfterOriginalRequest); 405 fresh200Response.setHTTPHeaderField("Expires", kOneDayAfterOriginalRequest);
406 406
407 firstResource->setResponse(fresh200Response); 407 firstResource->setResponse(fresh200Response);
408 memoryCache()->add(firstResource.get()); 408 memoryCache()->add(firstResource.get());
(...skipping 13 matching lines...) Expand all
422 ResourcePtr<Resource> firstResource = new Resource(ResourceRequest(redirectU rl), Resource::Raw); 422 ResourcePtr<Resource> firstResource = new Resource(ResourceRequest(redirectU rl), Resource::Raw);
423 423
424 ResourceResponse stale301Response; 424 ResourceResponse stale301Response;
425 stale301Response.setURL(redirectUrl); 425 stale301Response.setURL(redirectUrl);
426 stale301Response.setHTTPStatusCode(301); 426 stale301Response.setHTTPStatusCode(301);
427 stale301Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString); 427 stale301Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString);
428 stale301Response.setHTTPHeaderField("Location", redirectTargetUrlString); 428 stale301Response.setHTTPHeaderField("Location", redirectTargetUrlString);
429 429
430 // Add the redirect to our request. 430 // Add the redirect to our request.
431 ResourceRequest redirectRequest = ResourceRequest(redirectTargetUrl); 431 ResourceRequest redirectRequest = ResourceRequest(redirectTargetUrl);
432 firstResource->willSendRequest(redirectRequest, stale301Response); 432 firstResource->willFollowRedirect(redirectRequest, stale301Response);
433 433
434 // Add the final response to our request. 434 // Add the final response to our request.
435 ResourceResponse fresh200Response; 435 ResourceResponse fresh200Response;
436 fresh200Response.setURL(redirectTargetUrl); 436 fresh200Response.setURL(redirectTargetUrl);
437 fresh200Response.setHTTPStatusCode(200); 437 fresh200Response.setHTTPStatusCode(200);
438 fresh200Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString); 438 fresh200Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString);
439 fresh200Response.setHTTPHeaderField("Expires", kOneDayAfterOriginalRequest); 439 fresh200Response.setHTTPHeaderField("Expires", kOneDayAfterOriginalRequest);
440 440
441 firstResource->setResponse(fresh200Response); 441 firstResource->setResponse(fresh200Response);
442 memoryCache()->add(firstResource.get()); 442 memoryCache()->add(firstResource.get());
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 474
475 ResourceResponse fresh302Response; 475 ResourceResponse fresh302Response;
476 fresh302Response.setURL(redirectUrl); 476 fresh302Response.setURL(redirectUrl);
477 fresh302Response.setHTTPStatusCode(302); 477 fresh302Response.setHTTPStatusCode(302);
478 fresh302Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString); 478 fresh302Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString);
479 fresh302Response.setHTTPHeaderField("Last-Modified", kOneDayBeforeOriginalRe quest); 479 fresh302Response.setHTTPHeaderField("Last-Modified", kOneDayBeforeOriginalRe quest);
480 fresh302Response.setHTTPHeaderField("Location", redirectTargetUrlString); 480 fresh302Response.setHTTPHeaderField("Location", redirectTargetUrlString);
481 481
482 // Add the redirect to our request. 482 // Add the redirect to our request.
483 ResourceRequest redirectRequest = ResourceRequest(redirectTargetUrl); 483 ResourceRequest redirectRequest = ResourceRequest(redirectTargetUrl);
484 firstResource->willSendRequest(redirectRequest, fresh302Response); 484 firstResource->willFollowRedirect(redirectRequest, fresh302Response);
485 485
486 // Add the final response to our request. 486 // Add the final response to our request.
487 ResourceResponse fresh200Response; 487 ResourceResponse fresh200Response;
488 fresh200Response.setURL(redirectTargetUrl); 488 fresh200Response.setURL(redirectTargetUrl);
489 fresh200Response.setHTTPStatusCode(200); 489 fresh200Response.setHTTPStatusCode(200);
490 fresh200Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString); 490 fresh200Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString);
491 fresh200Response.setHTTPHeaderField("Expires", kOneDayAfterOriginalRequest); 491 fresh200Response.setHTTPHeaderField("Expires", kOneDayAfterOriginalRequest);
492 492
493 firstResource->setResponse(fresh200Response); 493 firstResource->setResponse(fresh200Response);
494 memoryCache()->add(firstResource.get()); 494 memoryCache()->add(firstResource.get());
(...skipping 14 matching lines...) Expand all
509 509
510 ResourceResponse fresh302Response; 510 ResourceResponse fresh302Response;
511 fresh302Response.setURL(redirectUrl); 511 fresh302Response.setURL(redirectUrl);
512 fresh302Response.setHTTPStatusCode(302); 512 fresh302Response.setHTTPStatusCode(302);
513 fresh302Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString); 513 fresh302Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString);
514 fresh302Response.setHTTPHeaderField("Cache-Control", "max-age=600"); 514 fresh302Response.setHTTPHeaderField("Cache-Control", "max-age=600");
515 fresh302Response.setHTTPHeaderField("Location", redirectTargetUrlString); 515 fresh302Response.setHTTPHeaderField("Location", redirectTargetUrlString);
516 516
517 // Add the redirect to our request. 517 // Add the redirect to our request.
518 ResourceRequest redirectRequest = ResourceRequest(redirectTargetUrl); 518 ResourceRequest redirectRequest = ResourceRequest(redirectTargetUrl);
519 firstResource->willSendRequest(redirectRequest, fresh302Response); 519 firstResource->willFollowRedirect(redirectRequest, fresh302Response);
520 520
521 // Add the final response to our request. 521 // Add the final response to our request.
522 ResourceResponse fresh200Response; 522 ResourceResponse fresh200Response;
523 fresh200Response.setURL(redirectTargetUrl); 523 fresh200Response.setURL(redirectTargetUrl);
524 fresh200Response.setHTTPStatusCode(200); 524 fresh200Response.setHTTPStatusCode(200);
525 fresh200Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString); 525 fresh200Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString);
526 fresh200Response.setHTTPHeaderField("Expires", kOneDayAfterOriginalRequest); 526 fresh200Response.setHTTPHeaderField("Expires", kOneDayAfterOriginalRequest);
527 527
528 firstResource->setResponse(fresh200Response); 528 firstResource->setResponse(fresh200Response);
529 memoryCache()->add(firstResource.get()); 529 memoryCache()->add(firstResource.get());
(...skipping 14 matching lines...) Expand all
544 544
545 ResourceResponse fresh302Response; 545 ResourceResponse fresh302Response;
546 fresh302Response.setURL(redirectUrl); 546 fresh302Response.setURL(redirectUrl);
547 fresh302Response.setHTTPStatusCode(302); 547 fresh302Response.setHTTPStatusCode(302);
548 fresh302Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString); 548 fresh302Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString);
549 fresh302Response.setHTTPHeaderField("Expires", kOneDayAfterOriginalRequest); 549 fresh302Response.setHTTPHeaderField("Expires", kOneDayAfterOriginalRequest);
550 fresh302Response.setHTTPHeaderField("Location", redirectTargetUrlString); 550 fresh302Response.setHTTPHeaderField("Location", redirectTargetUrlString);
551 551
552 // Add the redirect to our request. 552 // Add the redirect to our request.
553 ResourceRequest redirectRequest = ResourceRequest(redirectTargetUrl); 553 ResourceRequest redirectRequest = ResourceRequest(redirectTargetUrl);
554 firstResource->willSendRequest(redirectRequest, fresh302Response); 554 firstResource->willFollowRedirect(redirectRequest, fresh302Response);
555 555
556 // Add the final response to our request. 556 // Add the final response to our request.
557 ResourceResponse fresh200Response; 557 ResourceResponse fresh200Response;
558 fresh200Response.setURL(redirectTargetUrl); 558 fresh200Response.setURL(redirectTargetUrl);
559 fresh200Response.setHTTPStatusCode(200); 559 fresh200Response.setHTTPStatusCode(200);
560 fresh200Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString); 560 fresh200Response.setHTTPHeaderField("Date", kOriginalRequestDateAsString);
561 fresh200Response.setHTTPHeaderField("Expires", kOneDayAfterOriginalRequest); 561 fresh200Response.setHTTPHeaderField("Expires", kOneDayAfterOriginalRequest);
562 562
563 firstResource->setResponse(fresh200Response); 563 firstResource->setResponse(fresh200Response);
564 memoryCache()->add(firstResource.get()); 564 memoryCache()->add(firstResource.get());
565 565
566 advanceClock(500.); 566 advanceClock(500.);
567 567
568 ResourcePtr<Resource> fetched = fetch(); 568 ResourcePtr<Resource> fetched = fetch();
569 EXPECT_EQ(firstResource, fetched); 569 EXPECT_EQ(firstResource, fetched);
570 } 570 }
571 571
572 } // namespace 572 } // namespace
OLDNEW
« no previous file with comments | « no previous file | Source/core/fetch/RawResource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698