From 8ab54afc0c1cfb1f217a52119e3af2e2231289f0 Mon Sep 17 00:00:00 2001
From: Antonio Sartori <[email protected]>
Date: Thu, 08 Oct 2026 07:38:12 -0700
Subject: [PATCH] [permissions] Simplify PermissionClient::GetEmbeddingOriginOverride

It looks like there is redundant code in this function.

PermissionClient::GetEmbeddingOriginOverride() returns a std::optional
and its callers default to the main frame's origin if it returns
std::nullopt.

The cases in which GetEmbeddingOriginOverride() returns the outer
origin for an embedded <webview> seem redunant, since permission
requests coming from <webview> anyway trigger a permission request in
the embedder (assuming the embedder allows it).

Bug: 502475175
Change-Id: I57111b1ba337404e7cec27f7d97d584348960a0f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7789705
Reviewed-by: Andy Paicu <[email protected]>
Commit-Queue: Antonio Sartori <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1714491}
---
diff --git a/chrome/browser/permissions/chrome_permissions_client.cc b/chrome/browser/permissions/chrome_permissions_client.cc
index 6e3cc5c..dc0b4bd 100644
--- a/chrome/browser/permissions/chrome_permissions_client.cc
+++ b/chrome/browser/permissions/chrome_permissions_client.cc
@@ -831,36 +831,13 @@
   return std::nullopt;
 }
 
+#if BUILDFLAG(ENABLE_EXTENSIONS) && !BUILDFLAG(IS_ANDROID)
 std::optional<GURL> ChromePermissionsClient::GetEmbeddingOriginOverride(
     const GURL& requesting_origin,
     content::RenderFrameHost* render_frame_host) {
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(render_frame_host);
-  content::WebContents* embedder_web_contents =
-      web_contents->GetOutermostWebContents();
-  url::Origin embedder =
-      embedder_web_contents->GetPrimaryMainFrame()->GetLastCommittedOrigin();
 
-  // New Tab Page:
-  // Use the WebContents origin as the embedding origin when the requesting
-  // origin is the NTP (chrome://new-tab-page).
-  // Note that the embedding origin is later transformed to the DSE origin via
-  // `GetCanonicalOriginOverride()`.
-  if (embedder == GetNewTabOrigin() || embedder == GetNtpOrigin()) {
-    return embedder.GetURL();
-  }
-
-  if (embedder == GetContextualTasksOrigin() ||
-      embedder == GetOmniboxPopupOrigin() ||
-      embedder == GetOmniboxEverywhereOrigin()) {
-    // Omnibox Popup, Omnibox Everywhere, and Contextual Tasks:
-    // Use the WebContents origin as the embedding origin.
-    // Note that the embedding origin is later transformed to the DSE origin via
-    // `GetCanonicalOriginOverride()`.
-    return embedder.GetURL();
-  }
-
-#if BUILDFLAG(ENABLE_EXTENSIONS) && !BUILDFLAG(IS_ANDROID)
   // When a MIME handler extension is rendered as an OOPIF, key the
   // embedding origin to the extension so prompts and content settings
   // are attributed to the extension that produced the streamed content,
@@ -886,10 +863,10 @@
       }
     }
   }
-#endif  // BUILDFLAG(ENABLE_EXTENSIONS) && !BUILDFLAG(IS_ANDROID)
 
   return std::nullopt;
 }
+#endif  // BUILDFLAG(ENABLE_EXTENSIONS) && !BUILDFLAG(IS_ANDROID)
 
 std::optional<content::PermissionResult>
 ChromePermissionsClient::GetPermissionResultOverride(
diff --git a/chrome/browser/permissions/chrome_permissions_client.h b/chrome/browser/permissions/chrome_permissions_client.h
index 8f97e8d..0280e1e 100644
--- a/chrome/browser/permissions/chrome_permissions_client.h
+++ b/chrome/browser/permissions/chrome_permissions_client.h
@@ -18,6 +18,7 @@
 #include "components/permissions/permission_uma_constants.h"
 #include "components/permissions/permissions_client.h"
 #include "components/permissions/resolvers/permission_prompt_options.h"
+#include "extensions/buildflags/buildflags.h"
 
 namespace content {
 class RenderFrameHost;
@@ -116,9 +117,11 @@
   std::optional<GURL> GetCanonicalOriginOverride(
       const GURL& requesting_origin,
       const GURL& embedding_origin) override;
+#if BUILDFLAG(ENABLE_EXTENSIONS) && !BUILDFLAG(IS_ANDROID)
   std::optional<GURL> GetEmbeddingOriginOverride(
       const GURL& requesting_origin,
       content::RenderFrameHost* render_frame_host) override;
+#endif
   std::optional<content::PermissionResult> GetPermissionResultOverride(
       content::RenderFrameHost* render_frame_host,
       const GURL& requesting_origin,
diff --git a/chrome/browser/permissions/permission_delegation_browsertest.cc b/chrome/browser/permissions/permission_delegation_browsertest.cc
index eb70d7a..c5ffbcda 100644
--- a/chrome/browser/permissions/permission_delegation_browsertest.cc
+++ b/chrome/browser/permissions/permission_delegation_browsertest.cc
@@ -176,33 +176,6 @@
 };
 
 IN_PROC_BROWSER_TEST_F(ContextualTasksPermissionDelegationBrowserTest,
-                       GetEmbeddingOriginOverride) {
-  GURL contextual_tasks_url(chrome::kChromeUIContextualTasksURL);
-  ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), contextual_tasks_url));
-  content::WebContents* outer_web_contents = GetWebContents();
-
-  // Wait for the WebUI to initialize and spawn the inner <webview> guest
-  // WebContents.
-  ASSERT_TRUE(base::test::RunUntil(
-      [&] { return !outer_web_contents->GetInnerWebContents().empty(); }));
-
-  content::WebContents* inner_web_contents =
-      outer_web_contents->GetInnerWebContents()[0];
-  ASSERT_TRUE(inner_web_contents);
-  EXPECT_EQ(outer_web_contents, inner_web_contents->GetOuterWebContents());
-
-  // Verify that GetEmbeddingOriginOverride correctly traverses from the inner
-  // <webview> guest WebContents up to the outer WebUI WebContents.
-  GURL requesting_origin("https://example.com");
-  std::optional<GURL> override_origin =
-      ChromePermissionsClient::GetInstance()->GetEmbeddingOriginOverride(
-          requesting_origin, inner_web_contents->GetPrimaryMainFrame());
-
-  ASSERT_TRUE(override_origin.has_value());
-  EXPECT_EQ(contextual_tasks_url, *override_origin);
-}
-
-IN_PROC_BROWSER_TEST_F(ContextualTasksPermissionDelegationBrowserTest,
                        RequestPermissionInWebView) {
   GURL default_ai_url =
       contextual_tasks::ContextualTasksUiServiceFactory::GetForBrowserContext(

diff --git a/chrome/browser/permissions/permission_delegation_browsertest.cc b/chrome/browser/permissions/permission_delegation_browsertest.cc
index eb70d7a..c5ffbcda 100644
--- a/chrome/browser/permissions/permission_delegation_browsertest.cc
+++ b/chrome/browser/permissions/permission_delegation_browsertest.cc
@@ -176,33 +176,6 @@
 };
 
 IN_PROC_BROWSER_TEST_F(ContextualTasksPermissionDelegationBrowserTest,
-                       GetEmbeddingOriginOverride) {
-  GURL contextual_tasks_url(chrome::kChromeUIContextualTasksURL);
-  ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), contextual_tasks_url));
-  content::WebContents* outer_web_contents = GetWebContents();
-
-  // Wait for the WebUI to initialize and spawn the inner <webview> guest
-  // WebContents.
-  ASSERT_TRUE(base::test::RunUntil(
-      [&] { return !outer_web_contents->GetInnerWebContents().empty(); }));
-
-  content::WebContents* inner_web_contents =
-      outer_web_contents->GetInnerWebContents()[0];
-  ASSERT_TRUE(inner_web_contents);
-  EXPECT_EQ(outer_web_contents, inner_web_contents->GetOuterWebContents());
-
-  // Verify that GetEmbeddingOriginOverride correctly traverses from the inner
-  // <webview> guest WebContents up to the outer WebUI WebContents.
-  GURL requesting_origin("https://example.com");
-  std::optional<GURL> override_origin =
-      ChromePermissionsClient::GetInstance()->GetEmbeddingOriginOverride(
-          requesting_origin, inner_web_contents->GetPrimaryMainFrame());
-
-  ASSERT_TRUE(override_origin.has_value());
-  EXPECT_EQ(contextual_tasks_url, *override_origin);
-}
-
-IN_PROC_BROWSER_TEST_F(ContextualTasksPermissionDelegationBrowserTest,
                        RequestPermissionInWebView) {
   GURL default_ai_url =
       contextual_tasks::ContextualTasksUiServiceFactory::GetForBrowserContext(