[CacheStorage] Use QueryCache everywhere

third_party/WebKit/Source/modules/cachestorage/CacheStorage.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/cachestorage/CacheStorage.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "modules/cachestorage/CacheStorageError.h"
 #include "modules/fetch/Request.h"
 #include "modules/fetch/Response.h"
 #include "platform/RuntimeEnabledFeatures.h"

[nhiroki, 2016/08/18 00:05:43]

Can you remove this inclusion?

[jkarlin, 2016/08/18 14:08:24]

Done.

 #include "public/platform/modules/serviceworker/WebServiceWorkerCacheError.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerCacheStorage.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
 
 namespace blink {
 
 namespace {
 
 DOMException* createNoImplementationException()
 {
     return DOMException::create(NotSupportedError, "No CacheStorage implementation provided.");
 }
 
 bool commonChecks(ScriptState* scriptState, ExceptionState& exceptionState)
 {
     ExecutionContext* executionContext = scriptState->getExecutionContext();
     // FIXME: May be null due to worker termination: http://crbug.com/413518.
     if (!executionContext)
         return false;
 
     String errorMessage;
     if (!executionContext->isSecureContext(errorMessage)) {
         exceptionState.throwSecurityError(errorMessage);
         return false;
     }
     return true;
 }
 
-void checkCacheQueryOptions(const CacheQueryOptions& options, ExecutionContext* context)
-{
-    if (!RuntimeEnabledFeatures::cacheIgnoreSearchOptionEnabled() && options.ignoreSearch())
-        context->addConsoleMessage(ConsoleMessage::create(JSMessageSource, WarningMessageLevel, "Cache.match() does not support 'ignoreSearch' option yet. See http://crbug.com/520784"));
-    if (options.ignoreMethod())
-        context->addConsoleMessage(ConsoleMessage::create(JSMessageSource, WarningMessageLevel, "Cache.match() does not support 'ignoreMethod' option yet. See http://crbug.com/482256"));
-    if (options.ignoreVary())
-        context->addConsoleMessage(ConsoleMessage::create(JSMessageSource, WarningMessageLevel, "Cache.match() does not support 'ignoreVary' option yet. See http://crbug.com/499216"));
-}
-
 } // namespace
 
 // FIXME: Consider using CallbackPromiseAdapter.
 class CacheStorage::Callbacks final : public WebServiceWorkerCacheStorage::CacheStorageCallbacks {
     WTF_MAKE_NONCOPYABLE(Callbacks);
 public:
     explicit Callbacks(ScriptPromiseResolver* resolver)
         : m_resolver(resolver) { }
     ~Callbacks() override { }
 
@@ skipping 243 matching lines @@
     Request* newRequest = Request::create(scriptState, request.getAsUSVString(), exceptionState);
     if (exceptionState.hadException())
         return ScriptPromise();
     return matchImpl(scriptState, newRequest, options);
 }
 
 ScriptPromise CacheStorage::matchImpl(ScriptState* scriptState, const Request* request, const CacheQueryOptions& options)
 {
     WebServiceWorkerRequest webRequest;
     request->populateWebServiceWorkerRequest(webRequest);
-    checkCacheQueryOptions(options, scriptState->getExecutionContext());
 
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     const ScriptPromise promise = resolver->promise();
 
     if (request->method() != HTTPNames::GET && !options.ignoreMethod()) {
         resolver->resolve();
         return promise;
     }
 
     if (m_webCacheStorage)
@@ skipping 19 matching lines @@
     m_webCacheStorage.reset();
 }
 
 DEFINE_TRACE(CacheStorage)
 {
     visitor->trace(m_scopedFetcher);
     visitor->trace(m_nameToCacheMap);
 }
 
 } // namespace blink