Move FrameFetchContext::dispatchDidLoadResourceFromMemoryCache logic into ResourceFetcher

third_party/WebKit/Source/core/loader/FrameFetchContext.h

 /*
  * 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 69 matching lines @@
       Resource::Type,
       FetchRequest::DeferOption) const override;
   void dispatchDidChangeResourcePriority(unsigned long identifier,
                                          ResourceLoadPriority,
                                          int intraPriorityValue) override;
   void dispatchWillSendRequest(
       unsigned long identifier,
       ResourceRequest&,
       const ResourceResponse& redirectResponse,
       const FetchInitiatorInfo& = FetchInitiatorInfo()) override;
-  void dispatchDidLoadResourceFromMemoryCache(
-      unsigned long identifier,
-      Resource*,
-      WebURLRequest::FrameType,
-      WebURLRequest::RequestContext) override;
+  void dispatchDidLoadResourceFromMemoryCache(unsigned long identifier,
+                                              const ResourceRequest&,
+                                              const ResourceResponse&) override;
   void dispatchDidReceiveResponse(unsigned long identifier,
                                   const ResourceResponse&,
                                   WebURLRequest::FrameType,
                                   WebURLRequest::RequestContext,
-                                  Resource*) override;
+                                  Resource*,
+                                  ResourceLoadStartType) override;
   void dispatchDidReceiveData(unsigned long identifier,
                               const char* data,
                               int dataLength) override;
   void dispatchDidReceiveEncodedData(unsigned long identifier,
                                      int encodedDataLength) override;
   void dispatchDidDownloadData(unsigned long identifier,
                                int dataLength,
                                int encodedDataLength) override;
   void dispatchDidFinishLoading(unsigned long identifier,
                                 double finishTime,
@@ skipping 99 matching lines @@
   // FIXME: Oilpan: Ideally this should just be a traced Member but that will
   // currently leak because ComputedStyle and its data are not on the heap.
   // See crbug.com/383860 for details.
   WeakMember<Document> m_document;
   Member<DocumentLoader> m_documentLoader;
 };
 
 }  // namespace blink
 
 #endif