Introduce WebCachePolicy to merge cache policy enums

third_party/WebKit/Source/core/fetch/FetchContext.cpp

 /*
  * Copyright (C) 2013 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 11 matching lines @@
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * 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 "core/fetch/FetchContext.h"
-
+#include "public/platform/WebCachePolicy.h"
 
 namespace blink {
 
 FetchContext& FetchContext::nullInstance()
 {
     DEFINE_STATIC_LOCAL(FetchContext, instance, (new FetchContext));
     return instance;
 }
 
 void FetchContext::dispatchDidChangeResourcePriority(unsigned long, ResourceLoadPriority, int)
 {
 }
 
 void FetchContext::addAdditionalRequestHeaders(ResourceRequest&, FetchResourceType)
 {
 }
 
 void FetchContext::setFirstPartyForCookies(ResourceRequest&)
 {
 }
 
 CachePolicy FetchContext::getCachePolicy() const
 {
     return CachePolicyVerify;
 }
 
-ResourceRequestCachePolicy FetchContext::resourceRequestCachePolicy(const ResourceRequest&, Resource::Type) const
+WebCachePolicy FetchContext::resourceRequestCachePolicy(const ResourceRequest&, Resource::Type) const
 {
-    return UseProtocolCachePolicy;
+    return WebCachePolicy::UseProtocolCachePolicy;
 }
 
 void FetchContext::dispatchWillSendRequest(unsigned long, ResourceRequest&, const ResourceResponse&, const FetchInitiatorInfo&)
 {
 }
 
 void FetchContext::dispatchDidLoadResourceFromMemoryCache(const Resource*, WebURLRequest::FrameType, WebURLRequest::RequestContext)
 {
 }
 
@@ skipping 43 matching lines @@
 
 void FetchContext::addClientHintsIfNecessary(FetchRequest&)
 {
 }
 
 void FetchContext::addCSPHeaderIfNecessary(Resource::Type, FetchRequest&)
 {
 }
 
 } // namespace blink