Move the code in ResourceFetcher handling calls from WebURLLoaderImpl to ResourceLoader

third_party/WebKit/Source/core/fetch/ResourceFetcher.h

Index: third_party/WebKit/Source/core/fetch/ResourceFetcher.h
diff --git a/third_party/WebKit/Source/core/fetch/ResourceFetcher.h b/third_party/WebKit/Source/core/fetch/ResourceFetcher.h
index 10991d53bc1c1f9a5faf09c75fcd50f4e2971b0d..80547476d06f662d296e9bc74680467e881c7a14 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.h
+++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.h
@@ -117,30 +117,14 @@ class CORE_EXPORT ResourceFetcher
   void stopFetching();
   bool isFetching() const;
 
-  bool willFollowRedirect(Resource*, ResourceRequest&, const ResourceResponse&);
-  enum DidFinishLoadingReason {
-    DidFinishLoading,
-    DidFinishFirstPartInMultipart
-  };
-  void didFinishLoading(Resource*,
-                        double finishTime,
-                        DidFinishLoadingReason);
-  void didFailLoading(Resource*, const ResourceError&);
-  void didReceiveResponse(Resource*,
-                          const ResourceResponse&,
-                          std::unique_ptr<WebDataConsumerHandle>);
-  void didReceiveData(const Resource*,
-                      const char* data,
-                      int dataLength,
-                      int encodedDataLength);
-  void didDownloadData(const Resource*, int dataLength, int encodedDataLength);
-  bool defersLoading() const;
-  bool isControlledByServiceWorker() const;
+  bool shouldDeferImageLoad(const KURL&) const;
 
-  void acceptDataFromThreadedReceiver(unsigned long identifier,
-                                      const char* data,
-                                      int dataLength,
-                                      int encodedDataLength);
+  void recordResourceTimingOnRedirect(Resource*, const ResourceResponse&, bool);
+
+  enum LoaderFinishType { DidFinishLoading, DidFinishFirstPartInMultipart };
+  void handleLoaderFinish(Resource*, double finishTime, LoaderFinishType);
+  void handleLoaderError(Resource*, const ResourceError&);
+  bool isControlledByServiceWorker() const;
 
   enum ResourceLoadStartType {
     ResourceLoadingFromNetwork,
@@ -197,18 +181,13 @@ class CORE_EXPORT ResourceFetcher
   void moveCachedNonBlockingResourceToBlocking(Resource*, const FetchRequest&);
   void moveResourceLoaderToNonBlocking(ResourceLoader*);
   void removeResourceLoader(ResourceLoader*);
+  void handleLoadCompletion(Resource*);
 
   void initializeResourceRequest(ResourceRequest&,
                                  Resource::Type,
                                  FetchRequest::DeferOption);
-  void willSendRequest(unsigned long identifier,
-                       ResourceRequest&,
-                       const ResourceResponse&,
-                       const ResourceLoaderOptions&);
-  bool canAccessResponse(Resource*, const ResourceResponse&) const;
 
   bool resourceNeedsLoad(Resource*, const FetchRequest&, RevalidationPolicy);
-  bool shouldDeferImageLoad(const KURL&) const;
 
   void resourceTimingReportTimerFired(TimerBase*);