Bug 1860725 - Revert "Bug 1812797 - Add referrerUrl to Request"

This reverts commit 9947b70.
mozilla-mobile · Oct 24, 2023 · e0b3b74 · e0b3b74
1 parent 676b500
commit e0b3b74
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 47 deletions.
diff --git a/...gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt b/...gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt
@@ -86,7 +86,6 @@ private fun Request.toWebRequest(): WebRequest = WebRequest.Builder(url)
     .method(method.name)
     .addHeadersFrom(this)
     .addBodyFrom(this)
-    .referrer(referrerUrl)
     .cacheMode(if (useCaches) CACHE_MODE_DEFAULT else CACHE_MODE_RELOAD)
     // Turn off bleeding-edge network features to avoid breaking core browser functionality.
     .beConservative(true)

diff --git a/...rc/test/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchUnitTestCases.kt b/...rc/test/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchUnitTestCases.kt
@@ -284,22 +284,6 @@ class GeckoViewFetchUnitTestCases : FetchTestCases() {
         assertEquals(Response.SUCCESS, builder.toResponse().status)
     }
 
-    @Test
-    fun get200WithReferrerUrl() {
-        mockResponse(200)
-
-        val request = mock<Request>()
-        whenever(request.url).thenReturn("https://mozilla.org")
-        whenever(request.method).thenReturn(Request.Method.GET)
-        whenever(request.referrerUrl).thenReturn("https://mozilla.org")
-        createNewClient().fetch(request)
-
-        val captor = ArgumentCaptor.forClass(WebRequest::class.java)
-
-        verify(geckoWebExecutor)!!.fetch(captor.capture(), eq(GeckoWebExecutor.FETCH_FLAGS_NONE))
-        assertEquals("https://mozilla.org", captor.value.referrer)
-    }
-
     @Test
     fun toResponseMustReturn200ForDataUrls() {
         val builder = WebResponse.Builder("data:,Hello%2C%20World!").statusCode(0).build()

diff --git a/...rc/main/java/mozilla/components/browser/state/state/content/ShareInternetResourceState.kt b/...rc/main/java/mozilla/components/browser/state/state/content/ShareInternetResourceState.kt
@@ -20,5 +20,4 @@ data class ShareInternetResourceState(
     val contentType: String? = null,
     val private: Boolean = false,
     val response: Response? = null,
-    val referrerUrl: String? = null,
 )
diff --git a/...onents/components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt b/...onents/components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt
@@ -49,7 +49,6 @@ data class Request(
     val cookiePolicy: CookiePolicy = CookiePolicy.INCLUDE,
     val useCaches: Boolean = true,
     val private: Boolean = false,
-    val referrerUrl: String? = null,
 ) {
     /**
      * A [Body] to be send with the [Request].

diff --git a/...ts/components/concept/fetch/src/test/java/mozilla/components/concept/fetch/RequestTest.kt b/...ts/components/concept/fetch/src/test/java/mozilla/components/concept/fetch/RequestTest.kt
@@ -48,7 +48,6 @@ class RequestTest {
             redirect = Request.Redirect.MANUAL,
             cookiePolicy = Request.CookiePolicy.INCLUDE,
             useCaches = true,
-            referrerUrl = "https://mozilla.org",
         )
 
         assertEquals("https://www.mozilla.org", request.url)
@@ -64,7 +63,6 @@ class RequestTest {
         assertEquals(Request.Redirect.MANUAL, request.redirect)
         assertEquals(Request.CookiePolicy.INCLUDE, request.cookiePolicy)
         assertEquals(true, request.useCaches)
-        assertEquals("https://mozilla.org", request.referrerUrl)
 
         val headers = request.headers!!
         assertEquals(3, headers.size)

diff --git a/.../contextmenu/src/main/java/mozilla/components/feature/contextmenu/ContextMenuCandidate.kt b/.../contextmenu/src/main/java/mozilla/components/feature/contextmenu/ContextMenuCandidate.kt
@@ -359,12 +359,7 @@ data class ContextMenuCandidate(
             action = { tab, hitResult ->
                 contextMenuUseCases.injectDownload(
                     tab.id,
-                    DownloadState(
-                        hitResult.src,
-                        skipConfirmation = true,
-                        private = tab.content.private,
-                        referrerUrl = tab.content.url,
-                    ),
+                    DownloadState(hitResult.src, skipConfirmation = true, private = tab.content.private),
                 )
             },
         )
@@ -395,7 +390,6 @@ data class ContextMenuCandidate(
                     ShareInternetResourceState(
                         url = hitResult.src,
                         private = tab.content.private,
-                        referrerUrl = tab.content.url,
                     ),
                 )
             },
@@ -424,12 +418,7 @@ data class ContextMenuCandidate(
             action = { tab, hitResult ->
                 contextMenuUseCases.injectDownload(
                     tab.id,
-                    DownloadState(
-                        hitResult.src,
-                        skipConfirmation = true,
-                        private = tab.content.private,
-                        referrerUrl = tab.content.url,
-                    ),
+                    DownloadState(hitResult.src, skipConfirmation = true, private = tab.content.private),
                 )
             },
         )
@@ -457,12 +446,7 @@ data class ContextMenuCandidate(
             action = { tab, hitResult ->
                 contextMenuUseCases.injectDownload(
                     tab.id,
-                    DownloadState(
-                        hitResult.src,
-                        skipConfirmation = true,
-                        private = tab.content.private,
-                        referrerUrl = tab.content.url,
-                    ),
+                    DownloadState(hitResult.src, skipConfirmation = true, private = tab.content.private),
                 )
             },
         )
@@ -526,7 +510,6 @@ data class ContextMenuCandidate(
                     ShareInternetResourceState(
                         url = hitResult.src,
                         private = tab.content.private,
-                        referrerUrl = tab.content.url,
                     ),
                 )
             },

diff --git a/...nloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt b/...nloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt
@@ -703,7 +703,6 @@ abstract class AbstractFetchDownloadService : Service() {
             download.url.sanitizeURL(),
             headers = headers,
             private = download.private,
-            referrerUrl = download.referrerUrl,
         )
         // When resuming a download we need to use the httpClient as
         // download.response doesn't support adding headers.

diff --git a/.../src/main/java/mozilla/components/feature/downloads/temporary/TemporaryDownloadFeature.kt b/.../src/main/java/mozilla/components/feature/downloads/temporary/TemporaryDownloadFeature.kt
@@ -78,11 +78,7 @@ abstract class TemporaryDownloadFeature(
     @WorkerThread
     @VisibleForTesting
     internal fun download(internetResource: ShareInternetResourceState): File {
-        val request = Request(
-            internetResource.url.sanitizeURL(),
-            private = internetResource.private,
-            referrerUrl = internetResource.referrerUrl,
-        )
+        val request = Request(internetResource.url.sanitizeURL(), private = internetResource.private)
         val response = if (internetResource.response == null) {
             httpClient.fetch(request)
         } else {