Introduce WebCachePolicy to merge cache policy enums

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

Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
index 31009e703b5f5b11f9bc5d07331eceb57eedda46..c5228e769bb3454df421ffc0eff880f9c6686e81 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -92,6 +92,7 @@
 #include "platform/weborigin/SecurityOrigin.h"
 #include "platform/weborigin/SecurityPolicy.h"
 #include "platform/weborigin/Suborigin.h"
+#include "public/platform/WebCachePolicy.h"
 #include "public/platform/WebURLRequest.h"
 #include "wtf/TemporaryChange.h"
 #include "wtf/text/CString.h"
@@ -115,8 +116,7 @@ static bool needsHistoryItemRestore(FrameLoadType type)
 }
 
 // static
-ResourceRequest FrameLoader::resourceRequestFromHistoryItem(HistoryItem* item,
-    ResourceRequestCachePolicy cachePolicy)
+ResourceRequest FrameLoader::resourceRequestFromHistoryItem(HistoryItem* item, WebCachePolicy cachePolicy)
 {
     RefPtr<EncodedFormData> formData = item->formData();
     ResourceRequest request(item->url());
@@ -136,7 +136,7 @@ ResourceRequest FrameLoader::resourceRequestForReload(FrameLoadType frameLoadTyp
     const KURL& overrideURL, ClientRedirectPolicy clientRedirectPolicy)
 {
     ASSERT(frameLoadType == FrameLoadTypeReload || frameLoadType == FrameLoadTypeReloadBypassingCache);
-    ResourceRequestCachePolicy cachePolicy = frameLoadType == FrameLoadTypeReloadBypassingCache ? BypassingCache : ValidatingCacheData;
+    WebCachePolicy cachePolicy = frameLoadType == FrameLoadTypeReloadBypassingCache ? WebCachePolicy::BypassingCache : WebCachePolicy::ValidatingCacheData;
     if (!m_currentItem)
         return ResourceRequest();
     ResourceRequest request = resourceRequestFromHistoryItem(m_currentItem.get(), cachePolicy);
@@ -773,9 +773,9 @@ FrameLoadType FrameLoader::determineFrameLoadType(const FrameLoadRequest& reques
         return FrameLoadTypeStandard;
     if (m_provisionalDocumentLoader && request.substituteData().failingURL() == m_provisionalDocumentLoader->url() && m_loadType == FrameLoadTypeBackForward)
         return FrameLoadTypeBackForward;
-    if (request.resourceRequest().getCachePolicy() == ValidatingCacheData)
+    if (request.resourceRequest().getCachePolicy() == WebCachePolicy::ValidatingCacheData)
         return FrameLoadTypeReload;
-    if (request.resourceRequest().getCachePolicy() == BypassingCache)
+    if (request.resourceRequest().getCachePolicy() == WebCachePolicy::BypassingCache)
         return FrameLoadTypeReloadBypassingCache;
     // From the HTML5 spec for location.assign():
     //  "If the browsing context's session history contains only one Document,