Patch on top of https://codereview.chromium.org/433793002/

Source/modules/serviceworkers/Cache.h

Index: Source/modules/serviceworkers/Cache.h
diff --git a/Source/modules/serviceworkers/Cache.h b/Source/modules/serviceworkers/Cache.h
index 0f9af52fe19528b9d09315873431678b001d28c7..68d46b25ce65624f1049d33eca0877cecd97302f 100644
--- a/Source/modules/serviceworkers/Cache.h
+++ b/Source/modules/serviceworkers/Cache.h
@@ -25,26 +25,26 @@ class Request;
 class ScriptState;
 class WebServiceWorkerCache;
 
-class Cache FINAL : public GarbageCollected<Cache>, public ScriptWrappable, public WebServiceWorkerCache::ProxyInterface {
+class Cache FINAL : public GarbageCollectedFinalized<Cache>, public ScriptWrappable, public WebServiceWorkerCache::ProxyInterface {
     DEFINE_WRAPPERTYPEINFO();
     WTF_MAKE_NONCOPYABLE(Cache);
 public:
     static Cache* fromWebServiceWorkerCache(WebServiceWorkerCache*);
 
     // From Cache.idl:
-    ScriptPromise match(ScriptState*, Request*, const Dictionary& queryParams);
+    ScriptPromise match(ScriptState*, const Request*, const Dictionary& queryParams);
     ScriptPromise match(ScriptState*, const String&, const Dictionary& queryParams);
-    ScriptPromise matchAll(ScriptState*, Request*, const Dictionary& queryParams);
+    ScriptPromise matchAll(ScriptState*, const Request*, const Dictionary& queryParams);
     ScriptPromise matchAll(ScriptState*, const String&, const Dictionary& queryParams);
-    ScriptPromise add(ScriptState*, Request*);
+    ScriptPromise add(ScriptState*, const Request*);
     ScriptPromise add(ScriptState*, const String&);
     ScriptPromise addAll(ScriptState*, const Vector<ScriptValue>&);
-    ScriptPromise deleteFunction(ScriptState*, Request*, const Dictionary& queryParams);
+    ScriptPromise deleteFunction(ScriptState*, const Request*, const Dictionary& queryParams);
     ScriptPromise deleteFunction(ScriptState*, const String&, const Dictionary& queryParams);
-    ScriptPromise put(ScriptState*, Request*, Response*);
-    ScriptPromise put(ScriptState*, const String&, Response*);
+    ScriptPromise put(ScriptState*, const Request*, const Response*);
+    ScriptPromise put(ScriptState*, const String&, const Response*);
     ScriptPromise keys(ScriptState*);
-    ScriptPromise keys(ScriptState*, Request*, const Dictionary& queryParams);
+    ScriptPromise keys(ScriptState*, const Request*, const Dictionary& queryParams);
     ScriptPromise keys(ScriptState*, const String&, const Dictionary& queryParams);
 
     void trace(Visitor*) { }
@@ -54,16 +54,16 @@ public:
 private:
     explicit Cache(WebServiceWorkerCache*);
 
-    static PassRefPtrWillBeRawPtr<Cache> create(WebServiceWorkerCache*);
+    static Cache* create(WebServiceWorkerCache*);
 
-    ScriptPromise matchImpl(ScriptState*, PassRefPtrWillBeRawPtr<Request>, const Dictionary& queryParams);
-    ScriptPromise matchAllImpl(ScriptState*, PassRefPtrWillBeRawPtr<Request>, const Dictionary& queryParams);
-    ScriptPromise addImpl(ScriptState*, PassRefPtrWillBeRawPtr<Request>);
-    ScriptPromise addAllImpl(ScriptState*, Vector<RefPtrWillBeRawPtr<Request> >);
-    ScriptPromise deleteImpl(ScriptState*, PassRefPtrWillBeRawPtr<Request>, const Dictionary& queryParams);
-    ScriptPromise putImpl(ScriptState*, PassRefPtrWillBeRawPtr<Request>, Response*);
+    ScriptPromise matchImpl(ScriptState*, Request*, const Dictionary& queryParams);
+    ScriptPromise matchAllImpl(ScriptState*, Request*, const Dictionary& queryParams);
+    ScriptPromise addImpl(ScriptState*, Request*);
+    ScriptPromise addAllImpl(ScriptState*, Vector<Request*>);
+    ScriptPromise deleteImpl(ScriptState*, Request*, const Dictionary& queryParams);
+    ScriptPromise putImpl(ScriptState*, Request*, const Response*);
     ScriptPromise keysImpl(ScriptState*);
-    ScriptPromise keysImpl(ScriptState*, PassRefPtrWillBeRawPtr<Request>, const Dictionary& queryParams);
+    ScriptPromise keysImpl(ScriptState*, Request*, const Dictionary& queryParams);
 
     OwnPtr<WebServiceWorkerCache> m_webCache;
 };