Introduce WebCachePolicy to merge cache policy enums

third_party/WebKit/Source/platform/exported/WebURLRequest.cpp

 /*
  * Copyright (C) 2009 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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "public/platform/WebURLRequest.h"
 
 #include "platform/exported/WebURLRequestPrivate.h"
 #include "platform/network/ResourceRequest.h"
+#include "public/platform/WebCachePolicy.h"
 #include "public/platform/WebHTTPBody.h"
 #include "public/platform/WebHTTPHeaderVisitor.h"
 #include "public/platform/WebSecurityOrigin.h"
 #include "public/platform/WebURL.h"
 #include "wtf/Allocator.h"
 #include "wtf/Noncopyable.h"
 
 namespace blink {
 
 namespace {
@@ skipping 95 matching lines @@
 bool WebURLRequest::allowStoredCredentials() const
 {
     return m_private->m_resourceRequest->allowStoredCredentials();
 }
 
 void WebURLRequest::setAllowStoredCredentials(bool allowStoredCredentials)
 {
     m_private->m_resourceRequest->setAllowStoredCredentials(allowStoredCredentials);
 }
 
-WebURLRequest::CachePolicy WebURLRequest::getCachePolicy() const
+WebCachePolicy WebURLRequest::getCachePolicy() const
 {
-    return static_cast<WebURLRequest::CachePolicy>(
-        m_private->m_resourceRequest->getCachePolicy());
+    return m_private->m_resourceRequest->getCachePolicy();
 }
 
-void WebURLRequest::setCachePolicy(CachePolicy cachePolicy)
+void WebURLRequest::setCachePolicy(WebCachePolicy cachePolicy)
 {
-    m_private->m_resourceRequest->setCachePolicy(
-        static_cast<ResourceRequestCachePolicy>(cachePolicy));
+    m_private->m_resourceRequest->setCachePolicy(cachePolicy);
 }
 
 WebString WebURLRequest::httpMethod() const
 {
     return m_private->m_resourceRequest->httpMethod();
 }
 
 void WebURLRequest::setHTTPMethod(const WebString& httpMethod)
 {
     m_private->m_resourceRequest->setHTTPMethod(httpMethod);
@@ skipping 316 matching lines @@
     // Subclasses may call this directly so a self-assignment check is needed
     // here as well as in the public assign method.
     if (m_private == p)
         return;
     if (m_private)
         m_private->dispose();
     m_private = p;
 }
 
 } // namespace blink