Change FrameLoadTypeReload to take FrameLoadTypeReloadMainResource's behavior

third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp

 /*
  * Copyright (c) 2015, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 550 matching lines @@
   EXPECT_EQ(WebCachePolicy::ValidatingCacheData,
             fetchContext->resourceRequestCachePolicy(
                 postRequest, Resource::MainResource, FetchRequest::NoDefer));
 
   // Re-post
   document->loader()->setLoadType(FrameLoadTypeBackForward);
   EXPECT_EQ(WebCachePolicy::ReturnCacheDataDontLoad,
             fetchContext->resourceRequestCachePolicy(
                 postRequest, Resource::MainResource, FetchRequest::NoDefer));
 
-  // FrameLoadTypeReloadMainResource
-  document->loader()->setLoadType(FrameLoadTypeReloadMainResource);
+  // FrameLoadTypeReload
+  document->loader()->setLoadType(FrameLoadTypeReload);
   EXPECT_EQ(WebCachePolicy::ValidatingCacheData,
             fetchContext->resourceRequestCachePolicy(
                 request, Resource::MainResource, FetchRequest::NoDefer));
 
   // Conditional request
   document->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));
 
   // Set up a child frame
   FrameFetchContext* childFetchContext = createChildFrame();
 
   // Child frame as part of back/forward
   document->loader()->setLoadType(FrameLoadTypeBackForward);
   EXPECT_EQ(WebCachePolicy::ReturnCacheDataElseLoad,
             childFetchContext->resourceRequestCachePolicy(
                 request, Resource::MainResource, FetchRequest::NoDefer));
 
   // Child frame as part of reload
   document->loader()->setLoadType(FrameLoadTypeReload);
-  EXPECT_EQ(WebCachePolicy::ValidatingCacheData,
+  EXPECT_EQ(WebCachePolicy::UseProtocolCachePolicy,
             childFetchContext->resourceRequestCachePolicy(
                 request, Resource::MainResource, FetchRequest::NoDefer));
 
   // Child frame as part of reload bypassing cache
   document->loader()->setLoadType(FrameLoadTypeReloadBypassingCache);
   EXPECT_EQ(WebCachePolicy::BypassingCache,
             childFetchContext->resourceRequestCachePolicy(
                 request, Resource::MainResource, FetchRequest::NoDefer));
 }
 
@@ skipping 112 matching lines @@
 
 // Tests if reload variants can reflect the current data saver setting.
 TEST_F(FrameFetchContextTest, ChangeDataSaverConfig) {
   Settings* settings = document->frame()->settings();
   settings->setDataSaverEnabled(true);
   ResourceRequest resourceRequest("http://www.example.com");
   fetchContext->addAdditionalRequestHeaders(resourceRequest, FetchMainResource);
   EXPECT_EQ("on", resourceRequest.httpHeaderField("Save-Data"));
 
   settings->setDataSaverEnabled(false);
-  document->loader()->setLoadType(FrameLoadTypeReloadMainResource);
+  document->loader()->setLoadType(FrameLoadTypeReload);
   fetchContext->addAdditionalRequestHeaders(resourceRequest, FetchMainResource);
   EXPECT_EQ(String(), resourceRequest.httpHeaderField("Save-Data"));
 
   settings->setDataSaverEnabled(true);
   fetchContext->addAdditionalRequestHeaders(resourceRequest, FetchMainResource);
   EXPECT_EQ("on", resourceRequest.httpHeaderField("Save-Data"));
 
   settings->setDataSaverEnabled(false);
-  document->loader()->setLoadType(FrameLoadTypeReloadMainResource);
+  document->loader()->setLoadType(FrameLoadTypeReload);
   fetchContext->addAdditionalRequestHeaders(resourceRequest, FetchMainResource);
   EXPECT_EQ(String(), resourceRequest.httpHeaderField("Save-Data"));
 }
 
 // Tests that the embedder gets correct notification when a resource is loaded
 // from the memory cache.
 TEST_F(FrameFetchContextMockedLocalFrameClientTest,
        DispatchDidLoadResourceFromMemoryCache) {
   ResourceRequest resourceRequest(url);
   Resource* resource = MockResource::create(resourceRequest);
@@ skipping 182 matching lines @@
   setFilterPolicy(WebDocumentSubresourceFilter::WouldDisallow);
 
   EXPECT_EQ(ResourceRequestBlockedReason::None, canRequest());
   EXPECT_EQ(0, getFilteredLoadCallCount());
 
   EXPECT_EQ(ResourceRequestBlockedReason::None, canRequestPreload());
   EXPECT_EQ(0, getFilteredLoadCallCount());
 }
 
 }  // namespace blink