From b6371f6acfdb3ce7dbac92ff054f41123637020f Mon Sep 17 00:00:00 2001
From: Lei Zhang <thestig@chromium.org>
Date: Thu, 29 Jan 2026 14:44:40 -0800
Subject: [PATCH] Refactor common code into OpenTabHelper::MaybeSetPdfNavigateParams()

Combine duplicate PDF navigation code in OpenTabHelper::OpenTab() and
WindowsCreateFunction::OnBrowserWindowCreated() into a common function.

Bug: 40058077
Change-Id: If0de22a2514a4ae79be478e565d34ad36147b8df
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7517501
Reviewed-by: Charlie Reis <creis@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1576873}
---

diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc
index c8789f35..1eef7ed 100644
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -1027,15 +1027,11 @@
     // to be compatible with the navigation capturing behavior.
     navigate_params.pwa_navigation_capturing_force_off = true;
 
-    if (extension() && extension()->id() == extension_misc::kPdfExtensionId) {
-      // Treat PDF open-in-new-window navigations consistently with other PDF
-      // navigations, as done in TabsUpdateFunction::UpdateURL().
-      navigate_params.is_renderer_initiated = true;
-      navigate_params.initiator_origin = extension()->origin();
-      navigate_params.source_site_instance =
-          content::SiteInstance::CreateForURL(
-              browser_context(), navigate_params.initiator_origin->GetURL());
-    } else if (set_self_as_opener_) {
+    if (OpenTabHelper::MaybeSetPdfNavigateParams(*this, navigate_params)) {
+      return navigate_params;
+    }
+
+    if (set_self_as_opener_) {
       // Depending on the `setSelfAsOpener` option, we need to put the new
       // contents in the same BrowsingInstance as their opener.  See also
       // https://crbug.com/713888.
diff --git a/chrome/browser/extensions/open_tab_helper.cc b/chrome/browser/extensions/open_tab_helper.cc
index 1f1aaadc..4591ee08 100644
--- a/chrome/browser/extensions/open_tab_helper.cc
+++ b/chrome/browser/extensions/open_tab_helper.cc
@@ -204,14 +204,7 @@
   // the navigation capturing behavior.
   navigate_params.pwa_navigation_capturing_force_off = true;
 
-  if (extension && extension->id() == extension_misc::kPdfExtensionId) {
-    // Treat PDF open-in-new-tab navigations consistently with other PDF
-    // navigations, as done in TabsUpdateFunction::UpdateURL().
-    navigate_params.is_renderer_initiated = true;
-    navigate_params.initiator_origin = extension->origin();
-    navigate_params.source_site_instance = content::SiteInstance::CreateForURL(
-        function.browser_context(), navigate_params.initiator_origin->GetURL());
-  }
+  MaybeSetPdfNavigateParams(function, navigate_params);
 
   base::WeakPtr<content::NavigationHandle> handle = Navigate(&navigate_params);
   if (handle && params.bookmark_id) {
@@ -235,4 +228,19 @@
   return new_contents;
 }
 
+// static
+bool OpenTabHelper::MaybeSetPdfNavigateParams(const ExtensionFunction& function,
+                                              NavigateParams& navigate_params) {
+  auto* const extension = function.extension();
+  if (!extension || extension->id() != extension_misc::kPdfExtensionId) {
+    return false;
+  }
+
+  navigate_params.is_renderer_initiated = true;
+  navigate_params.initiator_origin = extension->origin();
+  navigate_params.source_site_instance = content::SiteInstance::CreateForURL(
+      function.browser_context(), navigate_params.initiator_origin->GetURL());
+  return true;
+}
+
 }  // namespace extensions
diff --git a/chrome/browser/extensions/open_tab_helper.h b/chrome/browser/extensions/open_tab_helper.h
index 3a23f797..05130f8 100644
--- a/chrome/browser/extensions/open_tab_helper.h
+++ b/chrome/browser/extensions/open_tab_helper.h
@@ -14,6 +14,7 @@
 class BrowserWindowInterface;
 class ExtensionFunction;
 class GURL;
+struct NavigateParams;
 
 namespace content {
 class WebContents;
@@ -53,6 +54,12 @@
       BrowserWindowInterface& browser,
       const ExtensionFunction& function,
       const Params& params);
+
+  // If `function` is for the PDF Viewer, then mark the PDF-initiated navigation
+  // as renderer-initiated in `navigate_params` and return true. Otherwise
+  // return false and `navigate_params` remains the same.
+  static bool MaybeSetPdfNavigateParams(const ExtensionFunction& function,
+                                        NavigateParams& navigate_params);
 };
 
 }  // namespace extensions