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

Unified Diff: third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp

Issue 2653673006: Move loadType() to DocumentLoader (Closed)
Patch Set: Rebase 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 side-by-side diff with in-line comments
Download patch
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 5fb9dca5f46835c5df48fef9819b45d455d9c468..6173625309aa443cd6d7dfe081cb234d4a3753f9 100644
--- a/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
@@ -497,19 +497,19 @@ TEST_F(FrameFetchContextTest, MainResource) {
postRequest, Resource::MainResource, FetchRequest::NoDefer));
// Re-post
- document->frame()->loader().setLoadType(FrameLoadTypeBackForward);
+ document->loader()->setLoadType(FrameLoadTypeBackForward);
EXPECT_EQ(WebCachePolicy::ReturnCacheDataDontLoad,
fetchContext->resourceRequestCachePolicy(
postRequest, Resource::MainResource, FetchRequest::NoDefer));
// FrameLoadTypeReloadMainResource
- document->frame()->loader().setLoadType(FrameLoadTypeReloadMainResource);
+ document->loader()->setLoadType(FrameLoadTypeReloadMainResource);
EXPECT_EQ(WebCachePolicy::ValidatingCacheData,
fetchContext->resourceRequestCachePolicy(
request, Resource::MainResource, FetchRequest::NoDefer));
// Conditional request
- document->frame()->loader().setLoadType(FrameLoadTypeStandard);
+ document->loader()->setLoadType(FrameLoadTypeStandard);
ResourceRequest conditional("http://www.example.com");
conditional.setHTTPHeaderField(HTTPNames::If_Modified_Since, "foo");
EXPECT_EQ(WebCachePolicy::ValidatingCacheData,
@@ -520,19 +520,19 @@ TEST_F(FrameFetchContextTest, MainResource) {
FrameFetchContext* childFetchContext = createChildFrame();
// Child frame as part of back/forward
- document->frame()->loader().setLoadType(FrameLoadTypeBackForward);
+ document->loader()->setLoadType(FrameLoadTypeBackForward);
EXPECT_EQ(WebCachePolicy::ReturnCacheDataElseLoad,
childFetchContext->resourceRequestCachePolicy(
request, Resource::MainResource, FetchRequest::NoDefer));
// Child frame as part of reload
- document->frame()->loader().setLoadType(FrameLoadTypeReload);
+ document->loader()->setLoadType(FrameLoadTypeReload);
EXPECT_EQ(WebCachePolicy::ValidatingCacheData,
childFetchContext->resourceRequestCachePolicy(
request, Resource::MainResource, FetchRequest::NoDefer));
// Child frame as part of reload bypassing cache
- document->frame()->loader().setLoadType(FrameLoadTypeReloadBypassingCache);
+ document->loader()->setLoadType(FrameLoadTypeReloadBypassingCache);
EXPECT_EQ(WebCachePolicy::BypassingCache,
childFetchContext->resourceRequestCachePolicy(
request, Resource::MainResource, FetchRequest::NoDefer));
« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameFetchContext.cpp ('k') | third_party/WebKit/Source/core/loader/FrameLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698