OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2013, Google Inc. All rights reserved. | 2 * Copyright (c) 2013, 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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 | 109 |
110 TEST_F(RawResourceTest, DontIgnoreAcceptForCacheReuse) { | 110 TEST_F(RawResourceTest, DontIgnoreAcceptForCacheReuse) { |
111 ResourceRequest jpegRequest; | 111 ResourceRequest jpegRequest; |
112 jpegRequest.setHTTPAccept("image/jpeg"); | 112 jpegRequest.setHTTPAccept("image/jpeg"); |
113 | 113 |
114 RawResource* jpegResource(RawResource::create(jpegRequest, Resource::Raw)); | 114 RawResource* jpegResource(RawResource::create(jpegRequest, Resource::Raw)); |
115 | 115 |
116 ResourceRequest pngRequest; | 116 ResourceRequest pngRequest; |
117 pngRequest.setHTTPAccept("image/png"); | 117 pngRequest.setHTTPAccept("image/png"); |
118 | 118 |
119 EXPECT_FALSE(jpegResource->canReuse(pngRequest)); | 119 EXPECT_FALSE( |
| 120 jpegResource->canReuse(FetchRequest(pngRequest, FetchInitiatorInfo()))); |
120 } | 121 } |
121 | 122 |
122 class DummyClient final : public GarbageCollectedFinalized<DummyClient>, | 123 class DummyClient final : public GarbageCollectedFinalized<DummyClient>, |
123 public RawResourceClient { | 124 public RawResourceClient { |
124 USING_GARBAGE_COLLECTED_MIXIN(DummyClient); | 125 USING_GARBAGE_COLLECTED_MIXIN(DummyClient); |
125 | 126 |
126 public: | 127 public: |
127 DummyClient() : m_called(false), m_numberOfRedirectsReceived(0) {} | 128 DummyClient() : m_called(false), m_numberOfRedirectsReceived(0) {} |
128 ~DummyClient() override {} | 129 ~DummyClient() override {} |
129 | 130 |
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
569 | 570 |
570 resource->responseReceived(newResponse, nullptr); | 571 resource->responseReceived(newResponse, nullptr); |
571 } | 572 } |
572 | 573 |
573 TEST_F(RawResourceTest, | 574 TEST_F(RawResourceTest, |
574 CanReuseDevToolsEmulateNetworkConditionsClientIdHeader) { | 575 CanReuseDevToolsEmulateNetworkConditionsClientIdHeader) { |
575 ResourceRequest request("data:text/html,"); | 576 ResourceRequest request("data:text/html,"); |
576 request.setHTTPHeaderField( | 577 request.setHTTPHeaderField( |
577 HTTPNames::X_DevTools_Emulate_Network_Conditions_Client_Id, "Foo"); | 578 HTTPNames::X_DevTools_Emulate_Network_Conditions_Client_Id, "Foo"); |
578 Resource* raw = RawResource::create(request, Resource::Raw); | 579 Resource* raw = RawResource::create(request, Resource::Raw); |
579 EXPECT_TRUE(raw->canReuse(ResourceRequest("data:text/html,"))); | 580 EXPECT_TRUE(raw->canReuse( |
| 581 FetchRequest(ResourceRequest("data:text/html,"), FetchInitiatorInfo()))); |
580 } | 582 } |
581 | 583 |
582 TEST_F(RawResourceTest, CanReuseDevToolsRequestIdHeader) { | 584 TEST_F(RawResourceTest, CanReuseDevToolsRequestIdHeader) { |
583 ResourceRequest request("data:text/html,"); | 585 ResourceRequest request("data:text/html,"); |
584 request.setHTTPHeaderField(HTTPNames::X_DevTools_Request_Id, "12345"); | 586 request.setHTTPHeaderField(HTTPNames::X_DevTools_Request_Id, "12345"); |
585 Resource* raw = RawResource::create(request, Resource::Raw); | 587 Resource* raw = RawResource::create(request, Resource::Raw); |
586 EXPECT_TRUE(raw->canReuse(ResourceRequest("data:text/html,"))); | 588 EXPECT_TRUE(raw->canReuse( |
| 589 FetchRequest(ResourceRequest("data:text/html,"), FetchInitiatorInfo()))); |
587 } | 590 } |
588 | 591 |
589 } // namespace blink | 592 } // namespace blink |
OLD | NEW |