Don't use FetchRequest in FrameFetchContext

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

Index: third_party/WebKit/Source/core/loader/FrameFetchContext.h
diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContext.h b/third_party/WebKit/Source/core/loader/FrameFetchContext.h
index 19aab5923072d027fe27461edaf22506afedfc35..53a00d042683fa9fe42f78e7f85165d09050e08f 100644
--- a/third_party/WebKit/Source/core/loader/FrameFetchContext.h
+++ b/third_party/WebKit/Source/core/loader/FrameFetchContext.h
@@ -33,6 +33,7 @@
 
 #include "core/CoreExport.h"
 #include "core/fetch/FetchContext.h"
+#include "core/fetch/FetchRequest.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "core/loader/LinkLoader.h"
@@ -42,6 +43,7 @@
 
 namespace blink {
 
+class ClientHintsPreferences;
 class Document;
 class DocumentLoader;
 class LocalFrame;
@@ -145,10 +147,18 @@ class CORE_EXPORT FrameFetchContext final : public FetchContext {
   void addConsoleMessage(const String&,
                          LogMessageType = LogErrorMessage) const override;
   SecurityOrigin* getSecurityOrigin() const override;
-  void modifyRequestForCSP(ResourceRequest&) override;
-  void addClientHintsIfNecessary(FetchRequest&) override;
-  void addCSPHeaderIfNecessary(Resource::Type, FetchRequest&) override;
-  void populateRequestData(ResourceRequest&) override;
+
+  void setFirstPartyCookieAndRequestorOrigin(ResourceRequest&) override;
+  void populateResourceRequest(Resource::Type,
+                               const ClientHintsPreferences&,
+                               const FetchRequest::ResourceWidth&,
+                               ResourceRequest&) override;
+
+  // Exposed for testing.
+  void modifyRequestForCSP(ResourceRequest&);
+  void addClientHintsIfNecessary(const ClientHintsPreferences&,
+                                 const FetchRequest::ResourceWidth&,
+                                 ResourceRequest&);
 
   MHTMLArchive* archive() const override;
 
@@ -184,6 +194,8 @@ class CORE_EXPORT FrameFetchContext final : public FetchContext {
                                           Resource*,
                                           LinkLoader::CanLoadResources);
 
+  void addCSPHeaderIfNecessary(Resource::Type, ResourceRequest&);

[tyoshino (SeeGerritForStatus), 2017/01/10 09:55:55]

I've moved this to private as it seems we can.

+
   // 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.