From cf0d8730a16218b74a20bf95ca3f778559537725 Mon Sep 17 00:00:00 2001
From: Andrey Kosyakov <[email protected]>
Date: Wed, 06 May 2026 09:46:28 -0700
Subject: [PATCH] Maintain scripts to evaluate on new document on the browser side

... so that renderer-controlled session state cookie is not used for that.

- move {Add,Remove}ScriptToEvaluateOn{Load,NewDocument} to the browser side;
- store those in DevToolsBrowserAgentState, as opposed to render-managed session state where they used to be before;
- explicitly propagate these to the renderer via mojo calls of newly-introduced DevtoolsSession methods, rather than falling through with CDP means, as the script ids need to be allocated on the browser side now;
- Move InspectorInjectedScriptManager creation to DevToolsSession and manage scripts by DevToolsSession on the renderer side;
- Move IsPausedForNewWindow() method from InspectorPageAgent::Client to DevtoolsAgent::Client;


Bug: 497643690
Change-Id: Ic65790cd5f2e831309da26fe5787d6f029b35276
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7809308
Reviewed-by: Alex Rudenko <[email protected]>
Commit-Queue: Andrey Kosyakov <[email protected]>
Reviewed-by: Dmitry Gozman <[email protected]>
Reviewed-by: Fred Shih <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1626253}
---

diff --git a/content/browser/devtools/devtools_session.cc b/content/browser/devtools/devtools_session.cc
index a9d7c7f..fdc9b0f 100644
--- a/content/browser/devtools/devtools_session.cc
+++ b/content/browser/devtools/devtools_session.cc
@@ -680,6 +680,26 @@
   child_observers_.RemoveObserver(obs);
 }
 
+void DevToolsSession::AddScriptToEvaluateOnNewDocument(
+    const std::string& identifier,
+    blink::mojom::ScriptToEvaluateOnNewDocumentPtr script,
+    bool run_immediately,
+    base::OnceClosure callback) {
+  if (session_.is_bound()) {
+    session_->AddScriptToEvaluateOnNewDocument(
+        identifier, std::move(script), run_immediately, std::move(callback));
+  } else {
+    std::move(callback).Run();
+  }
+}
+
+void DevToolsSession::RemoveScriptToEvaluateOnNewDocument(
+    const std::string& identifier) {
+  if (session_.is_bound()) {
+    session_->RemoveScriptToEvaluateOnNewDocument(identifier);
+  }
+}
+
 void DevToolsSession::PrepareForReload(std::string script_to_evaluate_on_load) {
   script_to_evaluate_on_load_ = std::move(script_to_evaluate_on_load);
   io_session_->UnpauseAndTerminate();
diff --git a/content/browser/devtools/devtools_session.h b/content/browser/devtools/devtools_session.h
index 1a43bf7..31eb8a5 100644
--- a/content/browser/devtools/devtools_session.h
+++ b/content/browser/devtools/devtools_session.h
@@ -140,6 +140,17 @@
 
   friend class FlattenedDevToolsProtocolTest;
 
+  blink::mojom::BrowserOriginatingSessionState* browser_agent_state() {
+    return session_state_cookie_->browser_originating_session_state.get();
+  }
+
+  void AddScriptToEvaluateOnNewDocument(
+      const std::string& identifier,
+      blink::mojom::ScriptToEvaluateOnNewDocumentPtr script,
+      bool run_immediately,
+      base::OnceClosure callback);
+  void RemoveScriptToEvaluateOnNewDocument(const std::string& identifier);
+
   base::RepeatingCallback<void(std::string)> MakePrepareForReloadCallback() {
     return base::BindRepeating(&DevToolsSession::PrepareForReload,
                                base::Unretained(this));
diff --git a/content/browser/devtools/protocol/page_handler.cc b/content/browser/devtools/protocol/page_handler.cc
index 5b5b5bd..40022fa 100644
--- a/content/browser/devtools/protocol/page_handler.cc
+++ b/content/browser/devtools/protocol/page_handler.cc
@@ -34,6 +34,7 @@
 #include "content/browser/back_forward_cache/back_forward_cache_metrics.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/devtools/devtools_agent_host_impl.h"
+#include "content/browser/devtools/devtools_session.h"
 #include "content/browser/devtools/protocol/browser_handler.h"
 #include "content/browser/devtools/protocol/devtools_mhtml_helper.h"
 #include "content/browser/devtools/protocol/emulation_handler.h"
@@ -753,6 +754,95 @@
   return Response::Success();
 }
 
+Response PageHandler::AddScriptToEvaluateOnNewDocumentInternal(
+    const std::string& source,
+    std::optional<std::string> world_name,
+    std::optional<bool> include_command_line_api,
+    std::optional<bool> run_immediately,
+    std::string* identifier,
+    base::OnceClosure callback) {
+  blink::mojom::BrowserOriginatingSessionState* state =
+      session()->browser_agent_state();
+
+  // Generate identifier. This currently uses an id that is 1 higher than the
+  // largest existent id, but is subject to change in the future. The clients
+  // should assume the id is an opaque string and should not presume anything
+  // about string content being a number or assume any other allocation logic.
+  int id = 1;
+  for (const auto& entry : state->scripts_to_evaluate_on_new_document) {
+    int entry_id = 0;
+    if (base::StringToInt(entry.first, &entry_id)) {
+      id = std::max(id, entry_id + 1);
+    }
+  }
+  *identifier = base::NumberToString(id);
+
+  auto script = blink::mojom::ScriptToEvaluateOnNewDocument::New();
+  script->source = source;
+  script->world_name = world_name.value_or("");
+  script->include_command_line_api = include_command_line_api.value_or(false);
+  state->scripts_to_evaluate_on_new_document[*identifier] = script.Clone();
+
+  session()->AddScriptToEvaluateOnNewDocument(*identifier, std::move(script),
+                                              run_immediately.value_or(false),
+                                              std::move(callback));
+
+  return Response::Success();
+}
+
+Response PageHandler::RemoveScriptToEvaluateOnNewDocument(
+    const std::string& identifier) {
+  blink::mojom::BrowserOriginatingSessionState* state =
+      session()->browser_agent_state();
+
+  auto it = state->scripts_to_evaluate_on_new_document.find(identifier);
+  if (it == state->scripts_to_evaluate_on_new_document.end()) {
+    return Response::ServerError("Script not found");
+  }
+  state->scripts_to_evaluate_on_new_document.erase(it);
+
+  session()->RemoveScriptToEvaluateOnNewDocument(identifier);
+
+  return Response::Success();
+}
+
+void PageHandler::AddScriptToEvaluateOnNewDocument(
+    const std::string& source,
+    std::optional<std::string> world_name,
+    std::optional<bool> include_command_line_api,
+    std::optional<bool> run_immediately,
+    std::unique_ptr<AddScriptToEvaluateOnNewDocumentCallback> callback) {
+  auto identifier = std::make_unique<std::string>();
+  auto* identifier_ptr = identifier.get();
+
+  AddScriptToEvaluateOnNewDocumentInternal(
+      source, world_name, include_command_line_api, run_immediately,
+      identifier_ptr,
+      base::BindOnce(
+          [](std::unique_ptr<AddScriptToEvaluateOnNewDocumentCallback> cb,
+             std::unique_ptr<std::string> id) { cb->sendSuccess(*id); },
+          std::move(callback), std::move(identifier)));
+}
+
+void PageHandler::AddScriptToEvaluateOnLoad(
+    const std::string& source,
+    std::unique_ptr<AddScriptToEvaluateOnLoadCallback> callback) {
+  auto identifier = std::make_unique<std::string>();
+  auto* identifier_ptr = identifier.get();
+
+  AddScriptToEvaluateOnNewDocumentInternal(
+      source, std::nullopt, std::nullopt, std::nullopt, identifier_ptr,
+      base::BindOnce(
+          [](std::unique_ptr<AddScriptToEvaluateOnLoadCallback> cb,
+             std::unique_ptr<std::string> id) { cb->sendSuccess(*id); },
+          std::move(callback), std::move(identifier)));
+}
+
+Response PageHandler::RemoveScriptToEvaluateOnLoad(
+    const std::string& identifier) {
+  return RemoveScriptToEvaluateOnNewDocument(identifier);
+}
+
 void PageHandler::Reload(std::optional<bool> bypassCache,
                          std::optional<std::string> script_to_evaluate_on_load,
                          std::optional<std::string> loader_id,
diff --git a/content/browser/devtools/protocol/page_handler.h b/content/browser/devtools/protocol/page_handler.h
index bdc6790..d31bf75 100644
--- a/content/browser/devtools/protocol/page_handler.h
+++ b/content/browser/devtools/protocol/page_handler.h
@@ -197,6 +197,20 @@
       std::optional<bool> include_actionable_information,
       std::unique_ptr<GetAnnotatedPageContentCallback> callback) override;
 
+  void AddScriptToEvaluateOnNewDocument(
+      const std::string& source,
+      std::optional<std::string> world_name,
+      std::optional<bool> include_command_line_api,
+      std::optional<bool> run_immediately,
+      std::unique_ptr<AddScriptToEvaluateOnNewDocumentCallback> callback)
+      override;