FrameFetchContext should respect BypassingCache

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

 /*
  * Copyright (C) 2013 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 239 matching lines @@
     case FrameLoadTypeBackForward:
       // Mutates the policy for POST requests to avoid form resubmission.
       return method == RequestMethod::kIsPost
                  ? WebCachePolicy::ReturnCacheDataDontLoad
                  : WebCachePolicy::ReturnCacheDataElseLoad;
     case FrameLoadTypeReload:
       return resourceType == ResourceType::kIsMainResource
                  ? WebCachePolicy::ValidatingCacheData
                  : WebCachePolicy::UseProtocolCachePolicy;
     case FrameLoadTypeReloadBypassingCache:
-      // TODO(toyoshim): Should return BypassingCache always, but keep legacy
-      // logic as is. To be changed in a follow-up patch soon.
-      return (resourceType == ResourceType::kIsMainResource &&
-              (requestType == RequestType::kIsConditional ||
-               method == RequestMethod::kIsPost))
-                 ? WebCachePolicy::ValidatingCacheData
-                 : WebCachePolicy::BypassingCache;
+      return WebCachePolicy::BypassingCache;
   }
   NOTREACHED();
   return WebCachePolicy::UseProtocolCachePolicy;
 }
 
 // TODO(toyoshim): Remove |resourceType|. See comments in
 // resourceRequestCachePolicy().
 WebCachePolicy determineFrameWebCachePolicy(Frame* frame,
                                             ResourceType resourceType) {
   if (!frame)
@@ skipping 777 matching lines @@
   return frame()->frameScheduler()->loadingTaskRunner();
 }
 
 DEFINE_TRACE(FrameFetchContext) {
   visitor->trace(m_document);
   visitor->trace(m_documentLoader);
   FetchContext::trace(visitor);
 }
 
 }  // namespace blink