Don't use FetchRequest in FrameFetchContext

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef FrameFetchContext_h
 #define FrameFetchContext_h
 
 #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"
 #include "platform/heap/Handle.h"
 #include "platform/network/ResourceRequest.h"
 #include "wtf/Forward.h"
 
 namespace blink {
 
+class ClientHintsPreferences;
 class Document;
 class DocumentLoader;
 class LocalFrame;
 class ResourceError;
 class ResourceResponse;
 
 class CORE_EXPORT FrameFetchContext final : public FetchContext {
  public:
   static ResourceFetcher* createFetcherFromDocumentLoader(
       DocumentLoader* loader) {
@@ skipping 83 matching lines @@
 
   bool isMainFrame() const override;
   bool defersLoading() const override;
   bool isLoadComplete() const override;
   bool pageDismissalEventBeingDispatched() const override;
   bool updateTimingInfoForIFrameNavigation(ResourceTimingInfo*) override;
   void sendImagePing(const KURL&) override;
   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;
 
   ResourceLoadPriority modifyPriorityForExperiments(
       ResourceLoadPriority) override;
 
   WebTaskRunner* loadingTaskRunner() const override;
 
   DECLARE_VIRTUAL_TRACE();
 
@@ skipping 15 matching lines @@
 
   void prepareRequest(ResourceRequest&);
 
   void dispatchDidReceiveResponseInternal(unsigned long identifier,
                                           const ResourceResponse&,
                                           WebURLRequest::FrameType,
                                           WebURLRequest::RequestContext,
                                           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.
   WeakMember<Document> m_document;
   Member<DocumentLoader> m_documentLoader;
 };
 
 }  // namespace blink
 
 #endif