Move the code in ResourceFetcher handling calls from WebURLLoaderImpl to ResourceLoader

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

Index: third_party/WebKit/Source/core/fetch/ResourceLoader.h
diff --git a/third_party/WebKit/Source/core/fetch/ResourceLoader.h b/third_party/WebKit/Source/core/fetch/ResourceLoader.h
index 5caf8327657fefd0915ba98ac4627751c6fcd155..5d6d6490f62e1877cebfcf071571254f6fd1df50 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceLoader.h
+++ b/third_party/WebKit/Source/core/fetch/ResourceLoader.h
@@ -39,6 +39,7 @@
 
 namespace blink {
 
+class FetchContext;
 class Resource;
 class ResourceError;
 class ResourceFetcher;
@@ -51,16 +52,12 @@ class CORE_EXPORT ResourceLoader final
   ~ResourceLoader() override;
   DECLARE_TRACE();
 
-  void start(const ResourceRequest&,
-             WebTaskRunner* loadingTaskRunner,
-             bool defersLoading);
+  void start(const ResourceRequest&);
 
   // This method is currently only used for service worker fallback request and
   // cache-aware loading, other users should be careful not to break
   // ResourceLoader state.
-  void restart(const ResourceRequest&,
-               WebTaskRunner* loadingTaskRunner,
-               bool defersLoading);
+  void restart(const ResourceRequest&);

[Nate Chapin, 2016/12/07 19:13:00]

This can be private now I think.

[tyoshino (SeeGerritForStatus), 2016/12/12 11:10:55]

Done.

 
   void cancel();
 
@@ -106,12 +103,16 @@ class CORE_EXPORT ResourceLoader final
                int64_t encodedBodyLength) override;
 
   void didFinishLoadingFirstPartInMultipart();
-  void didFail(const ResourceError&);
 
  private:
   // Assumes ResourceFetcher and Resource are non-null.
   ResourceLoader(ResourceFetcher*, Resource*);
 
+  FetchContext& context() const;
+  bool canAccessResponse(Resource*, const ResourceResponse&) const;
+  void handleError(const ResourceError&);
+
+  void cancelWithURL(const KURL&);

[Nate Chapin, 2016/12/07 19:13:01]

This is unused?

[tyoshino (SeeGerritForStatus), 2016/12/12 11:10:55]

Oh, right. Removed.

   void cancelForRedirectAccessCheckError(const KURL&);
   void requestSynchronously(const ResourceRequest&);