Remove SetFirstPartyCookieAndRequestorOrigin from FetchContext

It doesn't need to be a part of the interface. Each implementation of
the interface can just have their implementation as their private
method.

Change-Id: I7acac5e71c70534998345147dba487394fc2737b
Reviewed-on: https://chromium-review.googlesource.com/897317Reviewed-by: Yutaka Hirano <yhirano@chromium.org>
Commit-Queue: Takeshi Yoshino <tyoshino@chromium.org>
Cr-Commit-Position: refs/heads/master@{#533978}

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

@@ -142,7 +142,6 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext {
                                const ClientHintsPreferences&,
                                const FetchParameters::ResourceWidth&,
                                ResourceRequest&) override;
-  void SetFirstPartyCookieAndRequestorOrigin(ResourceRequest&) override;
 
   // Exposed for testing.
   void ModifyRequestForCSP(ResourceRequest&);
@@ -173,6 +172,8 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext {
       ResourceLoadPriority) const override;
 
  private:
+  friend class FrameFetchContextTest;
+
   struct FrozenState;
 
   static ResourceFetcher* CreateFetcher(DocumentLoader*, Document*);
@@ -235,6 +236,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext {
   // the |ContentSettingsClient| with the list of client hints and the
   // persistence duration.
   void ParseAndPersistClientHints(const ResourceResponse&);
+  void SetFirstPartyCookieAndRequestorOrigin(ResourceRequest&);
 
   Member<DocumentLoader> document_loader_;
   Member<Document> document_;

third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp

@@ -156,6 +156,12 @@ class FrameFetchContextTest : public ::testing::Test {
     return child_fetch_context;
   }
 
+  // Call the method for the actual test cases as only this fixture is specified
+  // as a friend class.
+  void SetFirstPartyCookieAndRequestorOrigin(ResourceRequest& request) {
+    fetch_context->SetFirstPartyCookieAndRequestorOrigin(request);
+  }
+
   std::unique_ptr<DummyPageHolder> dummy_page_holder;
   // We don't use the DocumentLoader directly in any tests, but need to keep it
   // around as long as the ResourceFetcher and Document live due to indirect
@@ -907,7 +913,7 @@ TEST_F(FrameFetchContextTest, SetFirstPartyCookieAndRequestorOrigin) {
     }
 
     // Compare the populated |requestorOrigin| against |test.serializedOrigin|
-    fetch_context->SetFirstPartyCookieAndRequestorOrigin(request);
+    SetFirstPartyCookieAndRequestorOrigin(request);
     if (strlen(test.serialized_origin) == 0) {
       EXPECT_TRUE(!request.RequestorOrigin());
     } else {
@@ -1455,7 +1461,7 @@ TEST_F(FrameFetchContextTest,
 
   dummy_page_holder = nullptr;
 
-  fetch_context->SetFirstPartyCookieAndRequestorOrigin(request);
+  SetFirstPartyCookieAndRequestorOrigin(request);
 
   EXPECT_EQ(document_url, request.SiteForCookies());
   EXPECT_EQ(origin, request.RequestorOrigin());

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

@@ -103,7 +103,6 @@ class WorkerFetchContext final : public BaseFetchContext {
                                const ClientHintsPreferences&,
                                const FetchParameters::ResourceWidth&,
                                ResourceRequest&) override;
-  void SetFirstPartyCookieAndRequestorOrigin(ResourceRequest&) override;
   scoped_refptr<base::SingleThreadTaskRunner> GetLoadingTaskRunner() override;
 
   void Trace(blink::Visitor*) override;
@@ -112,6 +111,8 @@ class WorkerFetchContext final : public BaseFetchContext {
   WorkerFetchContext(WorkerOrWorkletGlobalScope&,
                      std::unique_ptr<WebWorkerFetchContext>);
 
+  void SetFirstPartyCookieAndRequestorOrigin(ResourceRequest&);
+
   Member<WorkerOrWorkletGlobalScope> global_scope_;
   std::unique_ptr<WebWorkerFetchContext> web_context_;
   std::unique_ptr<WebURLLoaderFactory> url_loader_factory_;

third_party/WebKit/Source/platform/loader/fetch/FetchContext.cpp

@@ -119,6 +119,4 @@ void FetchContext::PopulateResourceRequest(
     const FetchParameters::ResourceWidth&,
     ResourceRequest&) {}
 
-void FetchContext::SetFirstPartyCookieAndRequestorOrigin(ResourceRequest&) {}
-
 }  // namespace blink

third_party/WebKit/Source/platform/loader/fetch/FetchContext.h

@@ -219,9 +219,6 @@ class PLATFORM_EXPORT FetchContext
                                        const ClientHintsPreferences&,
                                        const FetchParameters::ResourceWidth&,
                                        ResourceRequest&);
-  // Sets the first party for cookies and requestor origin using information
-  // stored in the FetchContext implementation.
-  virtual void SetFirstPartyCookieAndRequestorOrigin(ResourceRequest&);
 
   virtual MHTMLArchive* Archive() const { return nullptr; }