Introduce WebCachePolicy to merge cache policy enums

third_party/WebKit/Source/platform/network/ResourceRequest.h

 /*
  * Copyright (C) 2003, 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
  * Copyright (C) 2009, 2012 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 24 matching lines @@
 #include "platform/network/ResourceLoadPriority.h"
 #include "platform/weborigin/KURL.h"
 #include "platform/weborigin/Referrer.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "public/platform/WebAddressSpace.h"
 #include "public/platform/WebURLRequest.h"
 #include "wtf/OwnPtr.h"
 
 namespace blink {
 
-// Should be same with WebURLRequest::CachePolicy.
-// TODO(crbug.com/599364): Merge this with WebURLRequest::CachePolicy
-enum ResourceRequestCachePolicy {
-    UseProtocolCachePolicy, // normal load
-    ValidatingCacheData, // reload
-    BypassingCache, // end-to-end reload
-    ReturnCacheDataElseLoad, // back/forward or encoding change - allow stale data
-    ReturnCacheDataDontLoad, // results of a post - allow stale data and only use cache
-};
+enum class WebCachePolicy;
 
 enum ResourceRequestBlockedReason {
     ResourceRequestBlockedReasonCSP,
     ResourceRequestBlockedReasonMixedContent,
     ResourceRequestBlockedReasonOrigin,
     ResourceRequestBlockedReasonInspector,
     ResourceRequestBlockedReasonOther,
     ResourceRequestBlockedReasonNone
 };
 
@@ skipping 34 matching lines @@
     PassOwnPtr<CrossThreadResourceRequestData> copyData() const;
 
     bool isNull() const;
     bool isEmpty() const;
 
     const KURL& url() const;
     void setURL(const KURL& url);
 
     void removeCredentials();
 
-    ResourceRequestCachePolicy getCachePolicy() const;
-    void setCachePolicy(ResourceRequestCachePolicy cachePolicy);
+    WebCachePolicy getCachePolicy() const;
+    void setCachePolicy(WebCachePolicy);
 
     double timeoutInterval() const; // May return 0 when using platform default.
     void setTimeoutInterval(double timeoutInterval);
 
     const KURL& firstPartyForCookies() const;
     void setFirstPartyForCookies(const KURL& firstPartyForCookies);
 
     PassRefPtr<SecurityOrigin> requestorOrigin() const;
     void setRequestorOrigin(PassRefPtr<SecurityOrigin>);
 
@@ skipping 130 matching lines @@
 
     void setFollowedRedirect(bool followed) { m_followedRedirect = followed; }
     bool followedRedirect() const { return m_followedRedirect; }
 
 private:
     void initialize(const KURL&);
 
     const CacheControlHeader& cacheControlHeader() const;
 
     KURL m_url;
-    ResourceRequestCachePolicy m_cachePolicy;
+    WebCachePolicy m_cachePolicy;
     double m_timeoutInterval; // 0 is a magic value for platform default on platforms that have one.
     KURL m_firstPartyForCookies;
     RefPtr<SecurityOrigin> m_requestorOrigin;
     AtomicString m_httpMethod;
     HTTPHeaderMap m_httpHeaderFields;
     RefPtr<EncodedFormData> m_httpBody;
     bool m_allowStoredCredentials : 1;
     bool m_reportUploadProgress : 1;
     bool m_reportRawHeaders : 1;
     bool m_hasUserGesture : 1;
@@ skipping 29 matching lines @@
 
 inline bool operator==(const ResourceRequest& a, const ResourceRequest& b) { return ResourceRequest::compare(a, b); }
 inline bool operator!=(ResourceRequest& a, const ResourceRequest& b) { return !(a == b); }
 
 struct CrossThreadResourceRequestData {
     WTF_MAKE_NONCOPYABLE(CrossThreadResourceRequestData); USING_FAST_MALLOC(CrossThreadResourceRequestData);
 public:
     CrossThreadResourceRequestData() { }
     KURL m_url;
 
-    ResourceRequestCachePolicy m_cachePolicy;
+    WebCachePolicy m_cachePolicy;
     double m_timeoutInterval;
     KURL m_firstPartyForCookies;
     RefPtr<SecurityOrigin> m_requestorOrigin;
 
     String m_httpMethod;
     OwnPtr<CrossThreadHTTPHeaderMapData> m_httpHeaders;
     RefPtr<EncodedFormData> m_httpBody;
     bool m_allowStoredCredentials;
     bool m_reportUploadProgress;
     bool m_hasUserGesture;
@@ skipping 17 matching lines @@
     bool m_checkForBrowserSideNavigation;
     double m_uiStartTime;
     bool m_isExternalRequest;
     InputToLoadPerfMetricReportPolicy m_inputPerfMetricReportPolicy;
     bool m_followedRedirect;
 };
 
 } // namespace blink
 
 #endif // ResourceRequest_h