Introduce WebCachePolicy to merge cache policy enums

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

Index: third_party/WebKit/Source/platform/network/ResourceRequest.cpp
diff --git a/third_party/WebKit/Source/platform/network/ResourceRequest.cpp b/third_party/WebKit/Source/platform/network/ResourceRequest.cpp
index 8ab07862b0ad733e0c723ba09ff3be9f6280a39a..e2fa90ae08a0e9d6ea78701640d440be0d94d2d9 100644
--- a/third_party/WebKit/Source/platform/network/ResourceRequest.cpp
+++ b/third_party/WebKit/Source/platform/network/ResourceRequest.cpp
@@ -31,6 +31,7 @@
 #include "platform/weborigin/SecurityOrigin.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebAddressSpace.h"
+#include "public/platform/WebCachePolicy.h"
 #include "public/platform/WebURLRequest.h"
 
 namespace blink {
@@ -149,12 +150,12 @@ void ResourceRequest::removeCredentials()
     m_url.setPass(String());
 }
 
-ResourceRequestCachePolicy ResourceRequest::getCachePolicy() const
+WebCachePolicy ResourceRequest::getCachePolicy() const
 {
     return m_cachePolicy;
 }
 
-void ResourceRequest::setCachePolicy(ResourceRequestCachePolicy cachePolicy)
+void ResourceRequest::setCachePolicy(WebCachePolicy cachePolicy)
 {
     m_cachePolicy = cachePolicy;
 }
@@ -397,7 +398,7 @@ bool ResourceRequest::hasCacheValidatorFields() const
 void ResourceRequest::initialize(const KURL& url)
 {
     m_url = url;
-    m_cachePolicy = UseProtocolCachePolicy;
+    m_cachePolicy = WebCachePolicy::UseProtocolCachePolicy;
     m_timeoutInterval = s_defaultTimeoutInterval;
     m_httpMethod = HTTPNames::GET;
     m_allowStoredCredentials = true;