Introduce WebCachePolicy to merge cache policy enums

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

 /*
  * Copyright (C) 2003, 2006 Apple Computer, Inc.  All rights reserved.
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 13 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "platform/network/ResourceRequest.h"
 
 #include "platform/HTTPNames.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #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 {
 
 double ResourceRequest::s_defaultTimeoutInterval = INT_MAX;
 
 ResourceRequest::ResourceRequest(CrossThreadResourceRequestData* data)
     : ResourceRequest()
 {
     setURL(data->m_url);
@@ skipping 95 matching lines @@
 
 void ResourceRequest::removeCredentials()
 {
     if (m_url.user().isEmpty() && m_url.pass().isEmpty())
         return;
 
     m_url.setUser(String());
     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;
 }
 
 double ResourceRequest::timeoutInterval() const
 {
     return m_timeoutInterval;
 }
 
 void ResourceRequest::setTimeoutInterval(double timeoutInterval)
@@ skipping 255 matching lines @@
 }
 
 bool ResourceRequest::hasCacheValidatorFields() const
 {
     return !m_httpHeaderFields.get(HTTPNames::Last_Modified).isEmpty() || !m_httpHeaderFields.get(HTTPNames::ETag).isEmpty();
 }
 
 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;
     m_reportUploadProgress = false;
     m_reportRawHeaders = false;
     m_hasUserGesture = false;
     m_downloadToFile = false;
     m_useStreamOnResponse = false;
     m_skipServiceWorker = false;
     m_shouldResetAppCache = false;
@@ skipping 12 matching lines @@
     m_didSetHTTPReferrer = false;
     m_checkForBrowserSideNavigation = true;
     m_uiStartTime = 0;
     m_isExternalRequest = false;
     m_inputPerfMetricReportPolicy = InputToLoadPerfMetricReportPolicy::NoReport;
     m_followedRedirect = false;
     m_requestorOrigin = SecurityOrigin::createUnique();
 }
 
 } // namespace blink