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 3df40818ae2b7eac215e8e182c729af6b1d2e7ec..c40eb1a8ba1a4875e8bd4c072ddef0721ba0ec35 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"
@@ -41,6 +42,7 @@
 
 namespace blink {
 
+class ClientHintsPreferences;
 class Document;
 class DocumentLoader;
 class LocalFrame;
@@ -142,10 +144,19 @@ 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.

[yhirano, 2016/12/26 08:56:45]

Can you add ForTesting suffix for each function?

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

They're exposed only for testing, but also used in the production code (used
internally in this class). So, we need to add ForTesting-suffixed methods to do
that (otherwise, we'll have call to ForTesting suffixed functions in the
production code).

Do you think we should do that or use "friend" to hide them?

+  void modifyRequestForCSP(ResourceRequest&);
+  void addClientHintsIfNecessary(const ClientHintsPreferences&,
+                                 const FetchRequest::ResourceWidth&,
+                                 ResourceRequest&);
+  void addCSPHeaderIfNecessary(Resource::Type, ResourceRequest&);
 
   MHTMLArchive* archive() const override;