Drop ResourceLoader

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

Index: third_party/WebKit/Source/core/fetch/Resource.h
diff --git a/third_party/WebKit/Source/core/fetch/Resource.h b/third_party/WebKit/Source/core/fetch/Resource.h
index 70428fc06439fa2947416d13f9a3cb08b2b4ef80..285c1aa539341d2f6e9ab90a1a4936795888bb0a 100644
--- a/third_party/WebKit/Source/core/fetch/Resource.h
+++ b/third_party/WebKit/Source/core/fetch/Resource.h
@@ -48,8 +48,8 @@ struct FetchInitiatorInfo;
 class CachedMetadata;
 class FetchRequest;
 class ResourceClient;
+class ResourceFetcher;
 class ResourceTimingInfo;
-class ResourceLoader;
 class SecurityOrigin;
 
 // A resource that is held in the cache. Classes who want to use this object should derive
@@ -128,8 +128,6 @@ public:
 
     virtual void setRevalidatingRequest(const ResourceRequest&);
 
-    void setFetcherSecurityOrigin(SecurityOrigin* origin) { m_fetcherSecurityOrigin = origin; }
-
     // This url can have a fragment, but it can match resources that differ by the fragment only.
     const KURL& url() const { return m_resourceRequest.url();}
     Type getType() const { return static_cast<Type>(m_type); }
@@ -166,8 +164,8 @@ public:
     bool isLoading() const { return m_status == Pending; }
     bool stillNeedsLoad() const { return m_status < Pending; }
 
-    void setLoader(ResourceLoader*);
-    ResourceLoader* loader() const { return m_loader.get(); }
+    void setFetcher(ResourceFetcher*);
+    ResourceFetcher* fetcher() { return m_fetcher; }
 
     virtual bool isImage() const { return false; }
     bool shouldBlockLoadEvent() const;
@@ -194,7 +192,7 @@ public:
     virtual void willNotFollowRedirect() {}
 
     virtual void responseReceived(const ResourceResponse&, std::unique_ptr<WebDataConsumerHandle>);
-    void setResponse(const ResourceResponse&);
+    void setResponse(const ResourceResponse& response) { m_response = response; }
     const ResourceResponse& response() const { return m_response; }
 
     virtual void reportResourceTimingToClients(const ResourceTimingInfo&) { }
@@ -204,6 +202,7 @@ public:
 
     // This may return nullptr when the resource isn't cacheable.
     CachedMetadataHandler* cacheHandler();
+    void initializeServiceWorkerCachedMetadataHandler(SecurityOrigin*);
 
     AtomicString httpContentType() const;
 
@@ -329,7 +328,6 @@ private:
     void prepareToSuspend() override;
 
     Member<CachedMetadataHandlerImpl> m_cacheHandler;
-    RefPtr<SecurityOrigin> m_fetcherSecurityOrigin;
 
     ResourceError m_error;
 
@@ -375,7 +373,7 @@ private:
     Timer<Resource> m_cancelTimer;
 
     ResourceRequest m_resourceRequest;
-    Member<ResourceLoader> m_loader;
+    Member<ResourceFetcher> m_fetcher;
     ResourceResponse m_response;
 
     RefPtr<SharedBuffer> m_data;