| Index: third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp b/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
|
| index d2b768c448c6371a73a7f764d179468a05290ef1..bebdd12e71b4b28f08ba1e2b816773b748847578 100644
|
| --- a/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
|
| @@ -435,59 +435,69 @@ TEST_F(FrameFetchContextHintsTest, MonitorAllHints) {
|
| }
|
|
|
| TEST_F(FrameFetchContextTest, MainResource) {
|
| + std::pair<AtomicString, AtomicString> header;
|
| +
|
| // Default case
|
| ResourceRequest request("http://www.example.com");
|
| - EXPECT_EQ(WebCachePolicy::UseProtocolCachePolicy,
|
| - fetchContext->resourceRequestCachePolicy(
|
| - request, Resource::MainResource, FetchRequest::NoDefer));
|
| + EXPECT_EQ(
|
| + WebCachePolicy::UseProtocolCachePolicy,
|
| + fetchContext->resourceRequestCachePolicy(request, Resource::MainResource,
|
| + FetchRequest::NoDefer, header));
|
|
|
| // Post
|
| ResourceRequest postRequest("http://www.example.com");
|
| postRequest.setHTTPMethod("POST");
|
| - EXPECT_EQ(WebCachePolicy::ValidatingCacheData,
|
| - fetchContext->resourceRequestCachePolicy(
|
| - postRequest, Resource::MainResource, FetchRequest::NoDefer));
|
| + EXPECT_EQ(
|
| + WebCachePolicy::ValidatingCacheData,
|
| + fetchContext->resourceRequestCachePolicy(
|
| + postRequest, Resource::MainResource, FetchRequest::NoDefer, header));
|
|
|
| // Re-post
|
| document->frame()->loader().setLoadType(FrameLoadTypeBackForward);
|
| - EXPECT_EQ(WebCachePolicy::ReturnCacheDataDontLoad,
|
| - fetchContext->resourceRequestCachePolicy(
|
| - postRequest, Resource::MainResource, FetchRequest::NoDefer));
|
| + EXPECT_EQ(
|
| + WebCachePolicy::ReturnCacheDataDontLoad,
|
| + fetchContext->resourceRequestCachePolicy(
|
| + postRequest, Resource::MainResource, FetchRequest::NoDefer, header));
|
|
|
| // FrameLoadTypeReloadMainResource
|
| document->frame()->loader().setLoadType(FrameLoadTypeReloadMainResource);
|
| - EXPECT_EQ(WebCachePolicy::ValidatingCacheData,
|
| - fetchContext->resourceRequestCachePolicy(
|
| - request, Resource::MainResource, FetchRequest::NoDefer));
|
| + EXPECT_EQ(
|
| + WebCachePolicy::ValidatingCacheData,
|
| + fetchContext->resourceRequestCachePolicy(request, Resource::MainResource,
|
| + FetchRequest::NoDefer, header));
|
|
|
| // Conditional request
|
| document->frame()->loader().setLoadType(FrameLoadTypeStandard);
|
| ResourceRequest conditional("http://www.example.com");
|
| conditional.setHTTPHeaderField(HTTPNames::If_Modified_Since, "foo");
|
| - EXPECT_EQ(WebCachePolicy::ValidatingCacheData,
|
| - fetchContext->resourceRequestCachePolicy(
|
| - conditional, Resource::MainResource, FetchRequest::NoDefer));
|
| + EXPECT_EQ(
|
| + WebCachePolicy::ValidatingCacheData,
|
| + fetchContext->resourceRequestCachePolicy(
|
| + conditional, Resource::MainResource, FetchRequest::NoDefer, header));
|
|
|
| // Set up a child frame
|
| FrameFetchContext* childFetchContext = createChildFrame();
|
|
|
| // Child frame as part of back/forward
|
| document->frame()->loader().setLoadType(FrameLoadTypeBackForward);
|
| - EXPECT_EQ(WebCachePolicy::ReturnCacheDataElseLoad,
|
| - childFetchContext->resourceRequestCachePolicy(
|
| - request, Resource::MainResource, FetchRequest::NoDefer));
|
| + EXPECT_EQ(
|
| + WebCachePolicy::ReturnCacheDataElseLoad,
|
| + childFetchContext->resourceRequestCachePolicy(
|
| + request, Resource::MainResource, FetchRequest::NoDefer, header));
|
|
|
| // Child frame as part of reload
|
| document->frame()->loader().setLoadType(FrameLoadTypeReload);
|
| - EXPECT_EQ(WebCachePolicy::ValidatingCacheData,
|
| - childFetchContext->resourceRequestCachePolicy(
|
| - request, Resource::MainResource, FetchRequest::NoDefer));
|
| + EXPECT_EQ(
|
| + WebCachePolicy::ValidatingCacheData,
|
| + childFetchContext->resourceRequestCachePolicy(
|
| + request, Resource::MainResource, FetchRequest::NoDefer, header));
|
|
|
| // Child frame as part of reload bypassing cache
|
| document->frame()->loader().setLoadType(FrameLoadTypeReloadBypassingCache);
|
| - EXPECT_EQ(WebCachePolicy::BypassingCache,
|
| - childFetchContext->resourceRequestCachePolicy(
|
| - request, Resource::MainResource, FetchRequest::NoDefer));
|
| + EXPECT_EQ(
|
| + WebCachePolicy::BypassingCache,
|
| + childFetchContext->resourceRequestCachePolicy(
|
| + request, Resource::MainResource, FetchRequest::NoDefer, header));
|
| }
|
|
|
| TEST_F(FrameFetchContextTest, PopulateRequestData) {
|
|
|