[cr138] CreateThrottlesForNavigation takes a NavigationThrottleRegistry param now

Chromium change:
https://source.chromium.org/chromium/chromium/src/+/be55153df12fd44a855f9db49f4656e624db3010

commit be55153df12fd44a855f9db49f4656e624db3010
Author: Takashi Toyoshima <[email protected]>
Date:   Fri May 2 11:13:52 2025 -0700

    Reland "NavigationThrottleRunner2: content::NavigationThrottleRegistry"

    This is a reland of commit 06e076907244efc5fae5abe219b326238889071d

    The original change below didn't handle a chromecast specific subclass,
    and it caused a build failure on chromecast bot.

    Original change's description:
    > NavigationThrottleRunner2: content::NavigationThrottleRegistry
    >
    > This CL introduces a NavigationThrottleRegistry.
    > CreateThrottlesForNavigation() is changed to use this interface to
    > register a NavigationThrottle for a new navigation.
    >
    > We still handle the returned throttles vector to keep the legacy
    > interface available. But, once all the existing NavigationThrottle are
    > migrated to use the NavigationThrottleRegistry, we will remove the
    > legacy way, and the signature will be changed to return void.
    >
    > With this interface, we can implement several optimization step by step
    > without changing the existing API signature further more. For instance,
    > we can provide following features via the new registry interface;
    > - fast access paths to check navigation attributes
    > - per-event registration to optimize event loops
    >
    > Eventually, I will introduce a new NavigationThrottleRunner class. As we
    > want to share some common implementation among the original runner and
    > the new runner during the experiment, I will move the common logic to
    > this registry class and both runners will own it to share the
    > implementation.
    >
    > Essential changes are in the NavigationThrottleRunner, and
    > //content/public. Others are call side mechanical changes.
    >
    > Bug: 412524375
    > Change-Id: Ifda11e0f5cf446135c9ab34df025573346c7639c
    > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6478853
    > Reviewed-by: Nate Fischer <[email protected]>
    > Auto-Submit: Takashi Toyoshima <[email protected]>
    > Commit-Queue: Takashi Toyoshima <[email protected]>
    > Reviewed-by: Alex Moshchuk <[email protected]>
    > Cr-Commit-Position: refs/heads/main@{#1454542}

    Bug: 412524375

Author: emerick

browser/brave_content_browser_client.cc

@@ -1168,64 +1168,68 @@ bool BraveContentBrowserClient::HandleURLOverrideRewrite(
 
 std::vector<std::unique_ptr<content::NavigationThrottle>>
 BraveContentBrowserClient::CreateThrottlesForNavigation(
-    content::NavigationHandle* handle) {
+    NavigationThrottleRegistry& registry) {
   std::vector<std::unique_ptr<content::NavigationThrottle>> throttles =
-      ChromeContentBrowserClient::CreateThrottlesForNavigation(handle);
+      ChromeContentBrowserClient::CreateThrottlesForNavigation(registry);
 
   // inserting the navigation throttle at the fist position before any java
   // navigation happens
+  content::NavigationHandle& navigation_handle = registry.GetNavigationHandle();
   content::BrowserContext* context =
-      handle->GetWebContents()->GetBrowserContext();
+      navigation_handle.GetWebContents()->GetBrowserContext();
 
   if (auto rewards_throttle = brave_rewards::RewardsProtocolNavigationThrottle::
-          MaybeCreateThrottleFor(handle)) {
+          MaybeCreateThrottleFor(navigation_handle)) {
     throttles.insert(throttles.begin(), std::move(rewards_throttle));
   }
 
 #if !BUILDFLAG(IS_ANDROID)
   std::unique_ptr<content::NavigationThrottle> ntp_shows_navigation_throttle =
-      NewTabShowsNavigationThrottle::MaybeCreateThrottleFor(handle);
+      NewTabShowsNavigationThrottle::MaybeCreateThrottleFor(navigation_handle);
   if (ntp_shows_navigation_throttle) {
     throttles.push_back(std::move(ntp_shows_navigation_throttle));
   }
 #endif
 
 #if BUILDFLAG(ENABLE_BRAVE_WEBTORRENT)
   throttles.push_back(
-      std::make_unique<extensions::BraveWebTorrentNavigationThrottle>(handle));
+      std::make_unique<extensions::BraveWebTorrentNavigationThrottle>(
+          navigation_handle));
 #endif
 
 #if BUILDFLAG(ENABLE_TOR)
   std::unique_ptr<content::NavigationThrottle> tor_navigation_throttle =
-      tor::TorNavigationThrottle::MaybeCreateThrottleFor(handle,
+      tor::TorNavigationThrottle::MaybeCreateThrottleFor(navigation_handle,
                                                          context->IsTor());
   if (tor_navigation_throttle) {
     throttles.push_back(std::move(tor_navigation_throttle));
   }
   std::unique_ptr<content::NavigationThrottle>
       onion_location_navigation_throttle =
           tor::OnionLocationNavigationThrottle::MaybeCreateThrottleFor(
-              handle, TorProfileServiceFactory::IsTorDisabled(context),
+              navigation_handle,
+              TorProfileServiceFactory::IsTorDisabled(context),
               context->IsTor());
   if (onion_location_navigation_throttle) {
     throttles.push_back(std::move(onion_location_navigation_throttle));
   }
 #endif
 
   std::unique_ptr<content::NavigationThrottle>
-      decentralized_dns_navigation_throttle =
-          decentralized_dns::DecentralizedDnsNavigationThrottle::
-              MaybeCreateThrottleFor(handle, g_browser_process->local_state(),
-                                     g_browser_process->GetApplicationLocale());
+      decentralized_dns_navigation_throttle = decentralized_dns::
+          DecentralizedDnsNavigationThrottle::MaybeCreateThrottleFor(
+              navigation_handle, g_browser_process->local_state(),
+              g_browser_process->GetApplicationLocale());
   if (decentralized_dns_navigation_throttle) {
     throttles.push_back(std::move(decentralized_dns_navigation_throttle));
   }
 
   // Debounce
   if (auto debounce_throttle =
           debounce::DebounceNavigationThrottle::MaybeCreateThrottleFor(
-              handle, debounce::DebounceServiceFactory::GetForBrowserContext(
-                          context))) {
+              navigation_handle,
+              debounce::DebounceServiceFactory::GetForBrowserContext(
+                  context))) {
     throttles.push_back(std::move(debounce_throttle));
   }
 
@@ -1237,7 +1241,8 @@ BraveContentBrowserClient::CreateThrottlesForNavigation(
     if (std::unique_ptr<content::NavigationThrottle>
             domain_block_navigation_throttle = brave_shields::
                 DomainBlockNavigationThrottle::MaybeCreateThrottleFor(
-                    handle, g_brave_browser_process->ad_block_service(),
+                    navigation_handle,
+                    g_brave_browser_process->ad_block_service(),
                     g_brave_browser_process->ad_block_service()
                         ->custom_filters_provider(),
                     EphemeralStorageServiceFactory::GetForContext(context),
@@ -1251,7 +1256,7 @@ BraveContentBrowserClient::CreateThrottlesForNavigation(
   // Request Off-The-Record
   if (auto request_otr_throttle =
           request_otr::RequestOTRNavigationThrottle::MaybeCreateThrottleFor(
-              handle,
+              navigation_handle,
               request_otr::RequestOTRServiceFactory::GetForBrowserContext(
                   context),
               EphemeralStorageServiceFactory::GetForContext(context),
@@ -1262,16 +1267,16 @@ BraveContentBrowserClient::CreateThrottlesForNavigation(
 #endif
 
   if (Profile::FromBrowserContext(context)->IsRegularProfile()) {
-    if (auto ai_chat_throttle =
-            ai_chat::AIChatThrottle::MaybeCreateThrottleFor(handle)) {
+    if (auto ai_chat_throttle = ai_chat::AIChatThrottle::MaybeCreateThrottleFor(
+            navigation_handle)) {
       throttles.push_back(std::move(ai_chat_throttle));
     }
   }
 
 #if !BUILDFLAG(IS_ANDROID)
   if (auto ai_chat_brave_search_throttle =
           ai_chat::AIChatBraveSearchThrottle::MaybeCreateThrottleFor(
-              base::BindOnce(&ai_chat::OpenAIChatForTab), handle,
+              base::BindOnce(&ai_chat::OpenAIChatForTab), navigation_handle,
               ai_chat::AIChatServiceFactory::GetForBrowserContext(context),
               user_prefs::UserPrefs::Get(context))) {
     throttles.push_back(std::move(ai_chat_brave_search_throttle));
@@ -1280,7 +1285,7 @@ BraveContentBrowserClient::CreateThrottlesForNavigation(
 
   if (auto backup_results_throttle =
           brave_search::BackupResultsNavigationThrottle::MaybeCreateThrottleFor(
-              handle)) {
+              naviagation_handle)) {
     throttles.push_back(std::move(backup_results_throttle));
   }
 

browser/brave_content_browser_client.h

@@ -146,7 +146,7 @@ class BraveContentBrowserClient : public ChromeContentBrowserClient {
       GURL* url,
       content::BrowserContext* browser_context);
   std::vector<std::unique_ptr<content::NavigationThrottle>>
-  CreateThrottlesForNavigation(content::NavigationHandle* handle) override;
+  CreateThrottlesForNavigation(NavigationThrottleRegistry& registry) override;
   std::vector<url::Origin> GetOriginsRequiringDedicatedProcess() override;
   // We use this for the Google Sign-In feature
   bool CanCreateWindow(content::RenderFrameHost* opener,