Rename WebFrameLoadType::ReloadFromOrigin to ReloadBypassingCache

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 415 matching lines @@
     FrameFetchContext* childFetchContext = createChildFrame();
 
     // Child frame as part of back/forward
     document->frame()->loader().setLoadType(FrameLoadTypeBackForward);
     EXPECT_EQ(ReturnCacheDataElseLoad, childFetchContext->resourceRequestCachePolicy(request, Resource::MainResource));
 
     // Child frame as part of reload
     document->frame()->loader().setLoadType(FrameLoadTypeReload);
     EXPECT_EQ(ValidatingCacheData, childFetchContext->resourceRequestCachePolicy(request, Resource::MainResource));
 
-    // Child frame as part of end to end reload
-    document->frame()->loader().setLoadType(FrameLoadTypeReloadFromOrigin);
+    // Child frame as part of reload bypassing cache
+    document->frame()->loader().setLoadType(FrameLoadTypeReloadBypassingCache);
     EXPECT_EQ(BypassingCache, childFetchContext->resourceRequestCachePolicy(request, Resource::MainResource));
 }
 
 TEST_F(FrameFetchContextTest, ModifyPriorityForExperiments)
 {
     Settings* settings = document->frame()->settings();
     FetchRequest request(ResourceRequest("http://www.example.com"), FetchInitiatorInfo());
 
     FetchRequest preloadRequest(ResourceRequest("http://www.example.com"), FetchInitiatorInfo());
     preloadRequest.setForPreload(true);
@@ skipping 261 matching lines @@
         fetchContext->addAdditionalRequestHeaders(mainRequest, FetchMainResource);
         EXPECT_EQ(mainRequest.isExternalRequest(), test.isExternalExpectation);
 
         ResourceRequest subRequest(test.url);
         fetchContext->addAdditionalRequestHeaders(subRequest, FetchSubresource);
         EXPECT_EQ(subRequest.isExternalRequest(), test.isExternalExpectation);
     }
 }
 
 } // namespace blink