Migrate TODOs referencing old crbug IDs to the new issue tracker IDs

The canonical bug format is TODO(crbug.com/<id>). TODOs of the
following forms will all be migrated to the new format:

- TODO(crbug.com/<old id>)
- TODO(https://crbug.com/<old id>)
- TODO(crbug/<old id>)
- TODO(crbug/monorail/<old id>)
- TODO(<old id>)
- TODO(issues.chromium.org/<old id>)
- TODO(https://issues.chromium.org/<old id>)
- TODO(https://issues.chromium.org/u/1/issues/<old id>)
- TODO(bugs.chromium.org/<old id>)

Bug id mapping is sourced from go/chrome-on-buganizer-prod-issues.
See go/crbug-todo-migration for details.

#crbug-todo-migration

Bug: b/321899722
Change-Id: Ibc66b8c440e4bcdef414e77fef4d9874d2ea9951
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5493800
Auto-Submit: Alison Gale <agale@chromium.org>
Commit-Queue: Alison Gale <agale@chromium.org>
Reviewed-by: Peter Boström <pbos@chromium.org>
Owners-Override: Alison Gale <agale@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1293330}

chromecast/app/BUILD.gn

@@ -31,7 +31,7 @@ cast_source_set("app") {
   ]
 
   if (!is_fuchsia) {
-    # TODO(crbug.com/1226159): Complete crash reporting integration on Fuchsia.
+    # TODO(crbug.com/40188745): Complete crash reporting integration on Fuchsia.
     deps += [ "//components/crash/core/app" ]
   }
 }

chromecast/app/cast_main_delegate.cc

@@ -179,7 +179,8 @@ void CastMainDelegate::PreSandboxStartup() {
   bool enable_crash_reporter =
       !command_line->HasSwitch(switches::kDisableCrashReporter);
   if (enable_crash_reporter) {
-    // TODO(crbug.com/1226159): Complete crash reporting integration on Fuchsia.
+    // TODO(crbug.com/40188745): Complete crash reporting integration on
+    // Fuchsia.
 #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
     crash_reporter::SetCrashReporterClient(GetCastCrashReporter());
 
@@ -252,7 +253,7 @@ std::optional<int> CastMainDelegate::PostEarlyInitialization(
   CHECK(base::CreateDirectory(home_dir));
 #endif  // !BUILDFLAG(IS_ANDROID)
 
-  // TODO(crbug/1249485): If we're able to create the MetricsStateManager
+  // TODO(crbug.com/40791269): If we're able to create the MetricsStateManager
   // earlier, clean up the below if and else blocks and call
   // MetricsStateManager::InstantiateFieldTrialList().
   //

chromecast/base/java/src/org/chromium/chromecast/base/CastSettingsManager.java

@@ -62,27 +62,30 @@ public final class CastSettingsManager {
         mContentResolver = contentResolver;
         mListener = listener;
 
-        mDeviceNameObserver = new ContentObserver(new Handler()) {
-            @Override
-            public void onChange(boolean selfChange) {
-                mListener.onDeviceNameChanged(getDeviceName());
-            }
-        };
-        // TODO(crbug.com/635567): Fix lint properly.
+        mDeviceNameObserver =
+                new ContentObserver(new Handler()) {
+                    @Override
+                    public void onChange(boolean selfChange) {
+                        mListener.onDeviceNameChanged(getDeviceName());
+                    }
+                };
+        // TODO(crbug.com/40479664): Fix lint properly.
         mContentResolver.registerContentObserver(
                 Settings.Global.getUriFor(DEVICE_NAME_SETTING_KEY), true, mDeviceNameObserver);
 
         if (!isCastEnabled()) {
-            mIsDeviceProvisionedObserver = new ContentObserver(new Handler()) {
-                @Override
-                public void onChange(boolean selfChange) {
-                    Log.d(TAG, "Device provisioned");
-                    mListener.onCastEnabledChanged(isCastEnabled());
-                }
-            };
-            // TODO(crbug.com/635567): Fix lint properly.
+            mIsDeviceProvisionedObserver =
+                    new ContentObserver(new Handler()) {
+                        @Override
+                        public void onChange(boolean selfChange) {
+                            Log.d(TAG, "Device provisioned");
+                            mListener.onCastEnabledChanged(isCastEnabled());
+                        }
+                    };
+            // TODO(crbug.com/40479664): Fix lint properly.
             mContentResolver.registerContentObserver(
-                    Settings.Global.getUriFor(DEVICE_PROVISIONED_SETTING_KEY), true,
+                    Settings.Global.getUriFor(DEVICE_PROVISIONED_SETTING_KEY),
+                    true,
                     mIsDeviceProvisionedObserver);
         }
     }
@@ -99,15 +102,13 @@ public final class CastSettingsManager {
 
     public boolean isCastEnabled() {
         // However, Cast is disabled until the device is provisioned (see b/18950240).
-        // TODO(crbug.com/635567): Fix lint properly.
-        return Settings.Global.getInt(
-                mContentResolver, DEVICE_PROVISIONED_SETTING_KEY, 0) == 1;
+        // TODO(crbug.com/40479664): Fix lint properly.
+        return Settings.Global.getInt(mContentResolver, DEVICE_PROVISIONED_SETTING_KEY, 0) == 1;
     }
 
     public String getDeviceName() {
-        // TODO(crbug.com/635567): Fix lint properly.
+        // TODO(crbug.com/40479664): Fix lint properly.
         String deviceName = Settings.Global.getString(mContentResolver, DEVICE_NAME_SETTING_KEY);
         return (deviceName != null) ? deviceName : DEFAULT_DEVICE_NAME;
     }
-
 }

chromecast/bindings/BUILD.gn

@@ -8,14 +8,14 @@ if (is_fuchsia) {
   import("//build/config/fuchsia/generate_runner_scripts.gni")
 }
 
-# TODO(crbug.com/1104369): Deprecated. Delete after off-tree clients
+# TODO(crbug.com/40139651): Deprecated. Delete after off-tree clients
 # are migrated to use NamedMessagePortConnector directly.
 source_set("named_message_port_connector_resources") {
   data_deps = [ ":bindings_resources" ]
   deps = [ ":bindings_resources" ]
 }
 
-# TODO(crbug.com/1104369): Deprecated. Delete after off-tree clients
+# TODO(crbug.com/40139651): Deprecated. Delete after off-tree clients
 # are migrated to use NamedMessagePortConnector directly.
 grit("bindings_resources") {
   source = "bindings_resources.grd"
@@ -27,7 +27,7 @@ grit("bindings_resources") {
 }
 
 # Transitional target for //components/cast_api_bindings/bindings_manager.
-# TODO(crbug.com/1104369): Remove this and replace platform-specific
+# TODO(crbug.com/40139651): Remove this and replace platform-specific
 # subclasses with cross-platform implementation.
 source_set("bindings_manager") {
   sources = [ "bindings_manager.h" ]

chromecast/bindings/bindings_manager.h

@@ -10,7 +10,7 @@
 namespace chromecast {
 namespace bindings {
 
-// TODO(crbug.com/1104369): Remove this alias when all callers are migrated to
+// TODO(crbug.com/40139651): Remove this alias when all callers are migrated to
 // use cast_api_bindings::Manager directly.
 class BindingsManager : public cast_api_bindings::Manager {};
 

chromecast/browser/BUILD.gn

@@ -372,7 +372,7 @@ cast_source_set("browser") {
   }
 
   if (!is_fuchsia) {
-    # TODO(crbug.com/1226159): Complete crash reporting integration on Fuchsia.
+    # TODO(crbug.com/40188745): Complete crash reporting integration on Fuchsia.
     deps += [
       "//components/crash/content/browser",
       "//components/crash/core/app",

chromecast/browser/cast_media_blocker.cc

@@ -107,7 +107,7 @@ void CastMediaBlocker::MediaSessionInfoChanged(
     }
   }
 
-  // TODO(crbug.com/1057860): Rename suspended to paused to be consistent with
+  // TODO(crbug.com/40120884): Rename suspended to paused to be consistent with
   // MediaSession types.
   // Process suspended state next.
   if (suspended_ != is_suspended) {

chromecast/browser/cast_media_blocker_browsertest.cc

@@ -22,7 +22,7 @@
 namespace chromecast {
 namespace shell {
 
-// TODO(crbug.com/1057860): Move relevant tests to components/browsertests so
+// TODO(crbug.com/40120884): Move relevant tests to components/browsertests so
 // there is common coverage of MediaBlocker across platforms.
 class CastMediaBlockerBrowserTest : public CastBrowserTest {
  public:

chromecast/metrics/cast_metrics_service_client.cc

@@ -361,8 +361,9 @@ void CastMetricsServiceClient::InitializeMetricsService() {
   // Perform additional setup that should be done after the FieldTrialList, the
   // MetricsStateManager, and its CleanExitBeacon exist. Since the list already
   // exists, the entropy provider type is unused.
-  // TODO(crbug/1249485): Make Chromecast consistent with other platforms. I.e.
-  // create the FieldTrialList and the MetricsStateManager around the same time.
+  // TODO(crbug.com/40791269): Make Chromecast consistent with other platforms.
+  // I.e. create the FieldTrialList and the MetricsStateManager around the same
+  // time.
   metrics_state_manager_->InstantiateFieldTrialList();
 
   synthetic_trial_registry_ =

content/browser/BUILD.gn

@@ -2341,11 +2341,11 @@ source_set("browser") {
     ]
   }
 
-  # TODO(crbug.com/1327384): Remove `permissions_common`.
+  # TODO(crbug.com/40226169): Remove `permissions_common`.
   # DO NOT add unrelated entries to this block.
   deps += [ "//components/permissions:permissions_common" ]
 
-  # TODO(crbug.com/1327384): Remove `permission_util.*`.
+  # TODO(crbug.com/40226169): Remove `permission_util.*`.
   # DO NOT add unrelated entries to this block.
   sources += [
     "permissions/permission_util.cc",

content/browser/DEPS

@@ -143,7 +143,7 @@ specific_include_rules = {
     "+components/ml/webnn/features.mojom-features.h",
   ],
   "browser_main_loop\.cc": [
-    # TODO(crbug.com/1049894): Remove.
+    # TODO(crbug.com/40672800): Remove.
     "+services/network/transitional_url_loader_factory_owner.h",
     "+device/fido/hid/fido_hid_discovery.h",
   ],
@@ -162,7 +162,7 @@ specific_include_rules = {
   "network_service_instance_impl\.cc": [
     # Used to instantiate a CertVerifierServiceFactory in the browser process.
     "+services/cert_verifier/cert_verifier_service_factory.h",
-    # TODO(crbug.com/1049894): Remove.
+    # TODO(crbug.com/40672800): Remove.
     "+services/network/network_service.h",
   ],
   "signed_exchange_handler_unittest\.cc": [

content/browser/accessibility/accessibility_action_browsertest.cc

@@ -88,7 +88,7 @@ class AccessibilityActionBrowserTest : public ContentBrowserTest {
     GURL html_data_url("data:text/html," +
                        base::EscapeQueryParamValue(html, false));
     EXPECT_TRUE(NavigateToURL(shell(), html_data_url));
-    // TODO(crbug.com/1337353): This should ASSERT_TRUE the result, but was
+    // TODO(crbug.com/40848306): This should ASSERT_TRUE the result, but was
     // causing flakes when doing so.
     std::ignore = waiter.WaitForNotification();
   }
@@ -498,7 +498,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityCanvasActionBrowserTest,
                                           ui::kAXModeComplete,
                                           ax::mojom::Event::kImageFrameUpdated);
   GetManager()->GetImageData(*target, gfx::Size());
-  // TODO(crbug.com/1337353): This should ASSERT_TRUE the result, but was
+  // TODO(crbug.com/40848306): This should ASSERT_TRUE the result, but was
   // causing flakes when doing so.
   std::ignore = waiter2.WaitForNotification();
 
@@ -545,7 +545,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityCanvasActionBrowserTest,
                                           ui::kAXModeComplete,
                                           ax::mojom::Event::kImageFrameUpdated);
   GetManager()->GetImageData(*target, gfx::Size(4, 4));
-  // TODO(crbug.com/1337353): This should ASSERT_TRUE the result, but was
+  // TODO(crbug.com/40848306): This should ASSERT_TRUE the result, but was
   // causing flakes when doing so.
   std::ignore = waiter2.WaitForNotification();
 

content/browser/accessibility/accessibility_auralinux_browsertest.cc

@@ -890,7 +890,7 @@ typedef bool (*ScrollToPointFunc)(AtkComponent* component,
                                   gint y);
 typedef bool (*ScrollToFunc)(AtkComponent* component, AtkScrollType type);
 
-// TODO(https://crbug.com/1366113): Enable this test.
+// TODO(crbug.com/40866728): Enable this test.
 IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest,
                        DISABLED_TestScrollToPoint) {
   // There's a chance we may be compiled with a newer version of ATK and then
@@ -953,7 +953,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest,
   g_object_unref(atk_text);
 }
 
-// TODO(https://crbug.com/1366113): Enable this test.
+// TODO(crbug.com/40866728): Enable this test.
 IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest,
                        DISABLED_TestScrollTo) {
   // There's a chance we may be compiled with a newer version of ATK and then
@@ -1094,7 +1094,7 @@ gboolean ScrollSubstringTo(AtkText* text,
   return g_scroll_substring_to(text, start_offset, end_offset, type);
 }
 
-// TODO(https://crbug.com/1366113): Enable this test.
+// TODO(crbug.com/40866728): Enable this test.
 IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest,
                        DISABLED_TestScrollSubstringTo) {
   // There's a chance we may be compiled with a newer version of ATK and then
@@ -1210,7 +1210,7 @@ gboolean ScrollSubstringToPoint(AtkText* text,
                                      x, y);
 }
 
-// TODO(https://crbug.com/1366113): Enable this test.
+// TODO(crbug.com/40866728): Enable this test.
 IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest,
                        DISABLED_TestScrollSubstringToPoint) {
   // There's a chance we may be compiled with a newer version of ATK and then

content/browser/accessibility/accessibility_win_browsertest.cc

@@ -937,7 +937,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
       ui::AXEventGenerator::Event::FOCUS_CHANGED);
   GURL html_data_url("data:text/html,<p>Hello world.</p>");
   ASSERT_TRUE(NavigateToURL(shell(), html_data_url));
-  // TODO(https://crbug.com/1332468): Investigate why this does not return
+  // TODO(crbug.com/40844856): Investigate why this does not return
   // true.
   ASSERT_TRUE(waiter.WaitForNotification());
 
@@ -1192,7 +1192,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest, FocusEventOnPageLoad) {
     EXPECT_TRUE(NavigateToURL(shell(), html_data_url));
     run_loop.Run();  // Wait for the focus change.
   }
-  // TODO(https://crbug.com/1332468): Investigate why this does not return
+  // TODO(crbug.com/40844856): Investigate why this does not return
   // true.
   ASSERT_TRUE(waiter.WaitForNotification());
 

content/browser/accessibility/browser_accessibility.cc

@@ -659,9 +659,9 @@ gfx::RectF BrowserAccessibility::GetTextContentRangeBoundsUTF16(
 
 BrowserAccessibility* BrowserAccessibility::ApproximateHitTest(
     const gfx::Point& blink_screen_point) {
-  // TODO(crbug.com/1049261): This is one of the few methods that won't be moved
-  // to `AXNode` in the foreseeable future because the functionality it provides
-  // is not immediately needed in Views.
+  // TODO(crbug.com/40672441): This is one of the few methods that won't be
+  // moved to `AXNode` in the foreseeable future because the functionality it
+  // provides is not immediately needed in Views.
 
   // The best result found that's a child of this object.
   BrowserAccessibility* child_result = nullptr;
@@ -750,9 +750,9 @@ gfx::Rect BrowserAccessibility::RelativeToAbsoluteBounds(
     const ui::AXCoordinateSystem coordinate_system,
     const ui::AXClippingBehavior clipping_behavior,
     ui::AXOffscreenResult* offscreen_result) const {
-  // TODO(crbug.com/1049261): This is one of the few methods that won't be moved
-  // to `AXNode` in the foreseeable future because the functionality it provides
-  // is not immediately needed in Views.
+  // TODO(crbug.com/40672441): This is one of the few methods that won't be
+  // moved to `AXNode` in the foreseeable future because the functionality it
+  // provides is not immediately needed in Views.
 
   const bool clip_bounds =
       clipping_behavior == ui::AXClippingBehavior::kClipped;
@@ -1164,7 +1164,7 @@ ui::AXPlatformNode* BrowserAccessibility::GetTableCaption() const {
 
 bool BrowserAccessibility::AccessibilityPerformAction(
     const ui::AXActionData& data) {
-  // TODO(crbug.com/1049261): Move the ability to perform actions to
+  // TODO(crbug.com/40672441): Move the ability to perform actions to
   // `AXTreeManager`.
   switch (data.action) {
     case ax::mojom::Action::kDoDefault:
@@ -1305,9 +1305,9 @@ bool BrowserAccessibility::AccessibilityPerformAction(
 
 std::u16string BrowserAccessibility::GetLocalizedStringForImageAnnotationStatus(
     ax::mojom::ImageAnnotationStatus status) const {
-  // TODO(crbug.com/1049261): This is one of the few methods that won't be moved
-  // to `AXNode` in the foreseeable future because the functionality it provides
-  // is not immediately needed in Views.
+  // TODO(crbug.com/40672441): This is one of the few methods that won't be
+  // moved to `AXNode` in the foreseeable future because the functionality it
+  // provides is not immediately needed in Views.
 
   ContentClient* content_client = GetContentClient();
 
@@ -1341,9 +1341,9 @@ std::u16string BrowserAccessibility::GetLocalizedStringForImageAnnotationStatus(
 
 std::u16string
 BrowserAccessibility::GetLocalizedRoleDescriptionForUnlabeledImage() const {
-  // TODO(crbug.com/1049261): This is one of the few methods that won't be moved
-  // to `AXNode` in the foreseeable future because the functionality it provides
-  // is not immediately needed in Views.
+  // TODO(crbug.com/40672441): This is one of the few methods that won't be
+  // moved to `AXNode` in the foreseeable future because the functionality it
+  // provides is not immediately needed in Views.
 
   ContentClient* content_client = GetContentClient();
   return content_client->GetLocalizedString(
@@ -1580,7 +1580,7 @@ std::u16string BrowserAccessibility::GetLocalizedStringForRoleDescription()
     case ax::mojom::Role::kColumnHeader:
       return content_client->GetLocalizedString(IDS_AX_ROLE_COLUMN_HEADER);
     case ax::mojom::Role::kComboBoxSelect:
-      // TODO(crbug.com/1362834): This is used for Mac AXRoleDescription. This
+      // TODO(crbug.com/40864556): This is used for Mac AXRoleDescription. This
       // should be changed at the same time we map this role to
       // NSAccessibilityComboBoxRole.
       return content_client->GetLocalizedString(IDS_AX_ROLE_POP_UP_BUTTON);
@@ -1860,9 +1860,9 @@ ui::TextAttributeList BrowserAccessibility::ComputeTextAttributes() const {
 
 ui::TextAttributeMap BrowserAccessibility::GetSpellingAndGrammarAttributes()
     const {
-  // TODO(crbug.com/1049261): This is one of the few methods that won't be moved
-  // to `AXNode` in the foreseeable future because the functionality it provides
-  // is not immediately needed in Views.
+  // TODO(crbug.com/40672441): This is one of the few methods that won't be
+  // moved to `AXNode` in the foreseeable future because the functionality it
+  // provides is not immediately needed in Views.
 
   ui::TextAttributeMap spelling_attributes;
   if (IsText()) {
@@ -1977,9 +1977,9 @@ void BrowserAccessibility::MergeSpellingAndGrammarIntoTextAttributes(
 
 ui::TextAttributeMap BrowserAccessibility::ComputeTextAttributeMap(
     const ui::TextAttributeList& default_attributes) const {
-  // TODO(crbug.com/1049261): This is one of the few methods that won't be moved
-  // to `AXNode` in the foreseeable future because the functionality it provides
-  // is not immediately needed in Views.
+  // TODO(crbug.com/40672441): This is one of the few methods that won't be
+  // moved to `AXNode` in the foreseeable future because the functionality it
+  // provides is not immediately needed in Views.
 
   ui::TextAttributeMap attributes_map;
   if (IsLeaf()) {

content/browser/accessibility/browser_accessibility_android.cc

@@ -850,7 +850,7 @@ std::u16string BrowserAccessibilityAndroid::GetStateDescription() const {
 
   // For multiselectable state, generate a state description. We do not set a
   // state description for pop up/<select> to prevent double utterances.
-  // TODO(crbug.com/1362834): Consider whether other combobox roles should be
+  // TODO(crbug.com/40864556): Consider whether other combobox roles should be
   // accounted for.
   if (IsMultiselectable() && GetRole() != ax::mojom::Role::kPopUpButton &&
       GetRole() != ax::mojom::Role::kComboBoxSelect) {

content/browser/accessibility/browser_accessibility_manager_win.cc

@@ -218,7 +218,7 @@ void BrowserAccessibilityManagerWin::FireBlinkEvent(ax::mojom::Event event_type,
       break;
     }
     case ax::mojom::Event::kTextChanged:
-      // TODO(crbug.com/1049261) Remove when Views are exposed in the AXTree
+      // TODO(crbug.com/40672441) Remove when Views are exposed in the AXTree
       // which will fire generated text-changed events.
       if (!node->IsWebContent())
         EnqueueTextChangedEvent(*node);

content/browser/accessibility/cross_platform_accessibility_browsertest.cc

@@ -122,7 +122,7 @@ class CrossPlatformAccessibilityBrowserTest : public ContentBrowserTest {
                                            ax::mojom::Event::kLoadComplete);
     ASSERT_TRUE(
         NavigateToURL(shell(), embedded_test_server()->GetURL(html_file_path)));
-    // TODO(https://crbug.com/1332468): Investigate why this does not return
+    // TODO(crbug.com/40844856): Investigate why this does not return
     // true.
     ASSERT_TRUE(waiter.WaitForNotification());
   }
@@ -2210,7 +2210,7 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest,
 #endif
 
 #if defined(IS_FAST_BUILD)  // Avoid flakiness on slower debug/sanitizer builds.
-// TODO(crbug.com/1179057): Fix disabled flaky test.
+// TODO(crbug.com/40749521): Fix disabled flaky test.
 // TODO(crbug.com/332652840): It is flaky with SkiaGraphite enabled on Windows.
 #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
 #define MAYBE_DocumentSelectionChangesAreNotBatched \
@@ -2267,7 +2267,7 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest,
 #endif  // IS_FAST_BUILD
 
 #if defined(IS_FAST_BUILD)  // Avoid flakiness on slower debug/sanitizer builds.
-// TODO(crbug.com/1179057): Fix disabled flaky test.
+// TODO(crbug.com/40749521): Fix disabled flaky test.
 // TODO(crbug.com/332652840): It is flaky with SkiaGraphite enabled on Windows.
 #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
 #define MAYBE_ActiveDescendantChangesAreNotBatched \

content/browser/accessibility/dump_accessibility_browsertest_base.cc

@@ -437,7 +437,7 @@ void DumpAccessibilityTestBase::RunTestForPlatform(
     AccessibilityNotificationWaiter accessibility_waiter(
         web_contents, mode, ax::mojom::Event::kLoadComplete);
     EXPECT_TRUE(NavigateToURL(shell(), url));
-    // TODO(https://crbug.com/1332468): Investigate why this does not return
+    // TODO(crbug.com/40844856): Investigate why this does not return
     // true.
     ASSERT_TRUE(accessibility_waiter.WaitForNotification());
   }
@@ -626,7 +626,7 @@ DumpAccessibilityTestBase::CaptureEvents(InvokeAction invoke_action,
   // Wait for at least one event. This may unblock either when |waiter|
   // observes either an ax::mojom::Event or ui::AXEventGenerator::Event, or
   // when |event_recorder| records a platform event.
-  // TODO(https://crbug.com/1332468): Investigate why this does not return
+  // TODO(crbug.com/40844856): Investigate why this does not return
   // true.
   EXPECT_TRUE(waiter.WaitForNotification());
 

content/browser/accessibility/dump_accessibility_events_browsertest.cc

@@ -478,7 +478,7 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityEventsTest,
   RunEventTest(FILE_PATH_LITERAL("add-child-of-body.html"));
 }
 
-// TODO(crbug.com/1299885): Flaky on Win7.
+// TODO(crbug.com/40823869): Flaky on Win7.
 #if BUILDFLAG(IS_WIN)
 #define MAYBE_AccessibilityEventsAddDialog DISABLED_AccessibilityEventsAddDialog
 #else
@@ -489,7 +489,7 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityEventsTest,
   RunEventTest(FILE_PATH_LITERAL("add-dialog.html"));
 }
 
-// TODO(crbug.com/1299885): Flaky on Win7.
+// TODO(crbug.com/40823869): Flaky on Win7.
 #if BUILDFLAG(IS_WIN)
 #define MAYBE_AccessibilityEventsAddDialogDescribedBy \
   DISABLED_AccessibilityEventsAddDialogDescribedBy
@@ -502,7 +502,7 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityEventsTest,
   RunEventTest(FILE_PATH_LITERAL("add-dialog-described-by.html"));
 }
 
-// TODO(crbug.com/1299885): Flaky on Win7.
+// TODO(crbug.com/40823869): Flaky on Win7.
 #if BUILDFLAG(IS_WIN)
 #define MAYBE_AccessibilityEventsAddDialogNoInfo \
   DISABLED_AccessibilityEventsAddDialogNoInfo
@@ -712,8 +712,8 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityEventsTest,
 }
 
 // TODO(crbug.com/40897549): disabled on UIA.
-// TODO(crbug.com/1423845): Failing on Mac.
-// TODO(crbug.com/1423845): Actually failing everywhere. Disabled.
+// TODO(crbug.com/40897744): Failing on Mac.
+// TODO(crbug.com/40897744): Actually failing everywhere. Disabled.
 IN_PROC_BROWSER_TEST_P(DumpAccessibilityEventsTestExceptUIA,
                        DISABLED_AccessibilityEventsPopoverExpandedChanged) {
   RunEventTest(FILE_PATH_LITERAL("popover-expanded-changed.html"));
@@ -884,7 +884,7 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityEventsTest,
 }
 
 // TODO(crbug.com/40780161): Flaky on Linux and Win.
-// TODO(crbug.com/1230894): locks up with popup open, only on Mac
+// TODO(crbug.com/40779330): locks up with popup open, only on Mac
 #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
 #define MAYBE_AccessibilityEventsMenuListExpand \
   DISABLED_AccessibilityEventsMenuListExpand
@@ -893,7 +893,7 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityEventsTest,
   AccessibilityEventsMenuListExpand
 #endif
 
-// TODO(crbug.com/1230894): locks up with popup open, only on Mac. Default
+// TODO(crbug.com/40779330): locks up with popup open, only on Mac. Default
 // action on selected HTML:option doesn't work, so no events are fired, and
 // the test times out.
 #if BUILDFLAG(IS_MAC)
@@ -914,7 +914,7 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityEventsTest,
   RunEventTest(FILE_PATH_LITERAL("menulist-focus.html"));
 }
 
-// TODO(crbug.com/1327652): disabled on UIA
+// TODO(crbug.com/40841326): disabled on UIA
 IN_PROC_BROWSER_TEST_P(DumpAccessibilityEventsTestExceptUIA,
                        // TODO(crbug.com/40913066): Re-enable this test
                        DISABLED_AccessibilityEventsMenuListNext) {
@@ -960,7 +960,7 @@ class NavigationApiDumpAccessibilityEventsTest
   }
 };
 
-// TODO(crbug.com/1327652): disabled on UIA.
+// TODO(crbug.com/40841326): disabled on UIA.
 INSTANTIATE_TEST_SUITE_P(
     All,
     NavigationApiDumpAccessibilityEventsTest,
@@ -1247,7 +1247,7 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityEventsTest,
 }
 
 #if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_WIN) && defined(ADDRESS_SANITIZER))
-// TODO(crbug.com/1367886): Test is flaky on Windows ASAN and Mac.
+// TODO(crbug.com/40868032): Test is flaky on Windows ASAN and Mac.
 #define MAYBE_AccessibilityEventsMenubarShowHideMenus \
   DISABLED_AccessibilityEventsMenubarShowHideMenus
 #else

content/browser/accessibility/dump_accessibility_scripts_browsertest.cc

@@ -311,7 +311,7 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityScriptTest, AXHighestEditableAncestor) {
   RunTypedTest<kMacAttributes>("ax-highest-editable-ancestor.html");
 }
 
-// TODO(crbug.com/1480429): Flaky
+// TODO(crbug.com/40930250): Flaky
 #if BUILDFLAG(IS_MAC)
 #define MAYBE_AXInsertionPointLineNumber DISABLED_AXInsertionPointLineNumber
 #else

content/browser/accessibility/dump_accessibility_tree_browsertest.cc

@@ -41,7 +41,7 @@
 #define MAYBE(x) x
 #endif
 
-// TODO(https://crbug.com/1367886): Flaky on asan builder on multiple platforms.
+// TODO(crbug.com/40868032): Flaky on asan builder on multiple platforms.
 #if defined(ADDRESS_SANITIZER)
 #define MAYBE_ASAN(x) DISABLED_##x
 #else
@@ -1236,7 +1236,7 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, AccessibilityAriaOwnsList) {
   RunAriaTest(FILE_PATH_LITERAL("aria-owns-list.html"));
 }
 
-// TODO(crbug.com/1338211): test timeout on Fuchsia
+// TODO(crbug.com/40848920): test timeout on Fuchsia
 #if BUILDFLAG(IS_FUCHSIA)
 #define MAYBE_AccessibilityAriaOwnsWithRoleChange \
   DISABLED_AccessibilityAriaOwnsWithRoleChange
@@ -1735,7 +1735,7 @@ IN_PROC_BROWSER_TEST_P(YieldingParserDumpAccessibilityTreeTest,
   RunHtmlTest(FILE_PATH_LITERAL("canvas-fallback.html"));
 }
 
-// TODO(crbug.com/1193963): fails on Windows.
+// TODO(crbug.com/40758178): fails on Windows.
 #if BUILDFLAG(IS_WIN)
 #define MAYBE_AccessibilityCaption DISABLED_AccessibilityCaption
 #else
@@ -2243,13 +2243,13 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest,
   RunHtmlTest(FILE_PATH_LITERAL("iframe-transform-scrolled.html"));
 }
 
-// TODO(crbug.com/1265293): test is flaky on all platforms
+// TODO(crbug.com/40801320): test is flaky on all platforms
 IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest,
                        DISABLED_AccessibilityIframeWithInvalidChildren) {
   RunHtmlTest(FILE_PATH_LITERAL("iframe-with-invalid-children.html"));
 }
 
-// TODO(crbug.com/1265293): test is flaky on all platforms
+// TODO(crbug.com/40801320): test is flaky on all platforms
 IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest,
                        DISABLED_AccessibilityIframeWithInvalidChildrenAdded) {
   RunHtmlTest(FILE_PATH_LITERAL("iframe-with-invalid-children-added.html"));
@@ -2309,7 +2309,7 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, MAYBE_InertAttribute) {
   RunHtmlTest(FILE_PATH_LITERAL("inert-attribute.html"));
 }
 
-// TODO(crbug.com/1193963): fails on Windows.
+// TODO(crbug.com/40758178): fails on Windows.
 IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, AccessibilityInputButton) {
   RunHtmlTest(FILE_PATH_LITERAL("input-button.html"));
 }
@@ -2376,7 +2376,7 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest,
   FILE_PATH_LITERAL("input-date-with-popup-open-multiple.html")
 #endif
 
-// TODO(crbug.com/1506091): Test times out on android.
+// TODO(crbug.com/40946735): Test times out on android.
 #if BUILDFLAG(IS_ANDROID)
 #define MAYBE_AccessibilityInputDateWithPopupOpenMultiple \
   DISABLED_AccessibilityInputDateWithPopupOpenMultiple
@@ -2954,7 +2954,7 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, AccessibilityOptgroup) {
   RunHtmlTest(FILE_PATH_LITERAL("optgroup.html"));
 }
 
-// TODO(crbug.com/1338211): test timeouts on Fuchsia
+// TODO(crbug.com/40848920): test timeouts on Fuchsia
 #if BUILDFLAG(IS_FUCHSIA)
 #define MAYBE_AccessibilityOpenModal DISABLED_AccessibilityOpenModal
 #else
@@ -3203,7 +3203,7 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, AccessibilitySub) {
   RunHtmlTest(FILE_PATH_LITERAL("sub.html"));
 }
 
-// TODO(crbug.com/1480429): Flaky
+// TODO(crbug.com/40930250): Flaky
 #if BUILDFLAG(IS_MAC)
 #define MAYBE_AccessibilitySub DISABLED_AccessibilitySub
 #else
@@ -3218,7 +3218,7 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, AccessibilitySup) {
   RunHtmlTest(FILE_PATH_LITERAL("sup.html"));
 }
 
-// TODO(crbug.com/1193963): fails on Windows.
+// TODO(crbug.com/40758178): fails on Windows.
 #if BUILDFLAG(IS_WIN)
 #define MAYBE_AccessibilitySummary DISABLED_AccessibilitySummary
 #else

content/browser/accessibility/hit_testing_browsertest.cc

@@ -263,7 +263,7 @@ void AccessibilityHitTestingBrowserTest::SimulatePinchZoom(
   }
 
   // Ensure we get an accessibility update reflecting the new scale factor.
-  // TODO(https://crbug.com/1332468): Investigate why this does not return true.
+  // TODO(crbug.com/40844856): Investigate why this does not return true.
   ASSERT_TRUE(accessibility_waiter.WaitForNotification());
 }
 
@@ -651,7 +651,7 @@ IN_PROC_BROWSER_TEST_P(AccessibilityHitTestingBrowserTest,
       "/accessibility/hit_testing/simple_rectangles.html"));
   EXPECT_TRUE(NavigateToURL(shell(), url));
   SynchronizeThreads();
-  // TODO(https://crbug.com/1332468): Investigate why this does not return
+  // TODO(crbug.com/40844856): Investigate why this does not return
   // true.
   ASSERT_TRUE(waiter.WaitForNotification());
 
@@ -681,7 +681,7 @@ IN_PROC_BROWSER_TEST_P(AccessibilityHitTestingBrowserTest,
 }
 
 // TODO(crbug.com/40775545): Times out flakily on TSAN builds.
-// TODO(https://crbug.com/1459570): Times out flakily on ASan builds.
+// TODO(crbug.com/40919503): Times out flakily on ASan builds.
 // TODO(crbug.com/40921699): Times out flakily on win-asan.
 IN_PROC_BROWSER_TEST_P(AccessibilityHitTestingBrowserTest,
                        DISABLED_HitTest_WithPinchZoom) {
@@ -697,7 +697,7 @@ IN_PROC_BROWSER_TEST_P(AccessibilityHitTestingBrowserTest,
       "/accessibility/hit_testing/simple_rectangles.html"));
   EXPECT_TRUE(NavigateToURL(shell(), url));
   SynchronizeThreads();
-  // TODO(https://crbug.com/1332468): Investigate why this does not return
+  // TODO(crbug.com/40844856): Investigate why this does not return
   // true.
   ASSERT_TRUE(waiter.WaitForNotification());
 

content/browser/accessibility/touch_accessibility_aura_browsertest.cc

@@ -47,7 +47,7 @@ class TouchAccessibilityBrowserTest : public ContentBrowserTest {
                                            ui::kAXModeComplete,
                                            ax::mojom::Event::kLoadComplete);
     EXPECT_TRUE(NavigateToURL(shell(), url));
-    // TODO(https://crbug.com/1332468): Investigate why this does not return
+    // TODO(crbug.com/40844856): Investigate why this does not return
     // true.
     ASSERT_TRUE(waiter.WaitForNotification());
   }

content/browser/aggregation_service/aggregatable_report.cc

@@ -177,7 +177,7 @@ ConstructUnencryptedExperimentalPoplarPayloads(
 }
 #endif  // BUILDFLAG(USE_DISTRIBUTED_POINT_FUNCTIONS)
 
-// TODO(crbug.com/1298196): Replace with `base::numerics` if available.
+// TODO(crbug.com/40215445): Replace with `base::numerics` if available.
 std::array<uint8_t, 16u> U128ToBigEndian(absl::uint128 integer) {
   std::array<uint8_t, 16u> byte_string;
 

content/browser/aggregation_service/aggregatable_report_unittest.cc

@@ -160,7 +160,7 @@ void VerifyReport(
               data_map.at(cbor::Value("bucket")).GetBytestring();
           EXPECT_EQ(bucket_byte_string.size(), 16u);  // 16 bytes = 128 bits
 
-          // TODO(crbug.com/1298196): Replace with
+          // TODO(crbug.com/40215445): Replace with
           // `base::numerics::U128FromBigEndian()` when available.
           absl::uint128 bucket;
           base::HexStringToUInt128(base::HexEncode(bucket_byte_string),

content/browser/aggregation_service/aggregation_service_storage.h

@@ -83,7 +83,7 @@ class AggregationServiceStorage {
   // returned requests are ordered by report time. `limit` limits the number of
   // requests to return and cannot have a non-positive value; use
   // `std::nullopt` for no limit.
-  // TODO(crbug.com/1340046): Limit the number of in-progress reports kept in
+  // TODO(crbug.com/40230192): Limit the number of in-progress reports kept in
   // memory at the same time.
   virtual std::vector<RequestAndId> GetRequestsReportingOnOrBefore(
       base::Time not_after_time,

content/browser/aggregation_service/aggregation_service_storage_sql.cc

@@ -631,7 +631,7 @@ AggregationServiceStorageSql::GetRequestsReportingOnOrBefore(
   // See https://www.sqlite.org/lang_select.html.
   get_requests_statement.BindInt(1, limit.value_or(-1));
 
-  // TODO(crbug.com/1340046): Limit the total number of results that can be
+  // TODO(crbug.com/40230192): Limit the total number of results that can be
   // returned in one query.
   std::vector<AggregationServiceStorage::RequestAndId> result;
   std::vector<AggregationServiceStorage::RequestId> failures;

content/browser/android/nfc_host.cc

@@ -68,7 +68,7 @@ void NFCHost::GetNFC(RenderFrameHost* render_frame_host,
   if (!subscription_id_) {
     // base::Unretained() is safe here because the subscription is canceled when
     // this object is destroyed.
-    // TODO(crbug.com/1271543) : Move `SubscribeToPermissionStatusChange` to
+    // TODO(crbug.com/40205763) : Move `SubscribeToPermissionStatusChange` to
     // `PermissionController`.
     subscription_id_ =
         permission_controller_->SubscribeToPermissionStatusChange(

content/browser/android/tracing_controller_android.cc

@@ -203,7 +203,8 @@ void TracingControllerAndroid::OnKnownCategoriesReceived(
                           &received_category_list);
 
   // This log is required by adb_profile_chrome.py.
-  // TODO(crbug.com/898816): Replace (users of) this with DevTools' Tracing API.
+  // TODO(crbug.com/40092856): Replace (users of) this with DevTools' Tracing
+  // API.
   LOG(WARNING) << "{\"traceCategoriesList\": " << received_category_list << "}";
 
   JNIEnv* env = base::android::AttachCurrentThread();

content/browser/attribution_reporting/attribution_data_host_manager_impl.cc

@@ -1012,7 +1012,7 @@ class AttributionDataHostManagerImpl::OsRegistrationsBuffer {
   }
 
  private:
-  // TODO(https://crbug.com/1444525): update to 80 when supported by the OS.
+  // TODO(crbug.com/40267739): update to 80 when supported by the OS.
   static constexpr size_t kMaxBufferSize = 20u;
 
   int64_t navigation_id_;

content/browser/attribution_reporting/attribution_manager_impl.cc

@@ -510,7 +510,7 @@ AttributionManagerImpl::AttributionManagerImpl(
     : AttributionManagerImpl(
           storage_partition,
           user_data_directory,
-          // TODO(https://crbug.com/1444525): consider reducing this number when
+          // TODO(crbug.com/40267739): consider reducing this number when
           // os registrations will include multiple items.
           /*max_pending_events=*/1000,
           std::move(special_storage_policy),
@@ -747,7 +747,7 @@ void AttributionManagerImpl::PrepareNextEvent() {
       RenderFrameHost::FromID(pending_events_.front().rfh_id), source_origin,
       destination_origin, &**reporting_origin);
 
-  // TODO(https://crbug.com/1501357): Clean up `can_bypass` after the cookie
+  // TODO(crbug.com/40941634): Clean up `can_bypass` after the cookie
   // deprecation experiment.
   bool can_bypass = false;
   if (registration_allowed && cookie_origin &&

content/browser/attribution_reporting/attribution_storage_sql.cc

@@ -518,7 +518,7 @@ StoreSourceResult AttributionStorageSql::StoreSource(StorableSource source) {
     return StoreSourceResult(std::move(source), is_noised, std::move(result));
   };
 
-  // TODO(crbug.com/1499890): Support multiple specs.
+  // TODO(crbug.com/40287976): Support multiple specs.
   if (source.registration().trigger_specs.specs().size() > 1u) {
     return make_result(StoreSourceResult::InternalError());
   }
@@ -840,7 +840,7 @@ AttributionStorageSql::MaybeReplaceLowerPriorityEventLevelReport(
   DCHECK(data);
 
   const StoredSource& source = data->source;
-  // TODO(crbug.com/1499890): The logic in this method doesn't properly handle
+  // TODO(crbug.com/40287976): The logic in this method doesn't properly handle
   // the case in which there are different report windows for different trigger
   // data. Prior to enabling `attribution_reporting::features::kTriggerConfig`,
   // this must be fixed.

content/browser/attribution_reporting/sql_utils.cc

@@ -199,7 +199,7 @@ std::string SerializeReadOnlySourceData(
       mutable_trigger_data->add_trigger_data(trigger_data);
     }
   } else {
-    // TODO(crbug.com/1499890): Support multiple specs.
+    // TODO(crbug.com/40287976): Support multiple specs.
     DCHECK(trigger_specs.empty());
 
     SetReadOnlySourceData(/*event_report_windows=*/nullptr,

content/browser/back_forward_cache_browsertest.cc

@@ -175,7 +175,7 @@ BackForwardCacheBrowserTest::~BackForwardCacheBrowserTest() {
     std::vector<base::Bucket> samples = histogram_tester().GetAllSamples(
         "BackForwardCache.UnexpectedRendererToBrowserMessage."
         "InterfaceName");
-    // TODO(https://crbug.com/1379490): Remove this.
+    // TODO(crbug.com/40244391): Remove this.
     // This bucket corresponds to the LocalFrameHost interface. It is known to
     // be flaky due calls to `LocalFrameHost::DidFocusFrame()` after entering
     // BFCache. So we ignore it for now by removing it if it's present until we
@@ -454,7 +454,7 @@ ReasonsMatcher BackForwardCacheBrowserTest::MatchesNotRestoredReasons(
     const std::optional<testing::Matcher<std::string>>& src,
     const std::vector<BlockingDetailsReasonsMatcher>& reasons,
     const std::optional<SameOriginMatcher>& same_origin_details) {
-  // TODO(crbug.com/1523191) Make this matcher display human-friendly messages.
+  // TODO(crbug.com/41496143) Make this matcher display human-friendly messages.
   return testing::Pointee(testing::AllOf(
       id.has_value()
           ? testing::Field(
@@ -496,7 +496,7 @@ ReasonsMatcher BackForwardCacheBrowserTest::MatchesNotRestoredReasons(
 SameOriginMatcher BackForwardCacheBrowserTest::MatchesSameOriginDetails(
     const testing::Matcher<GURL>& url,
     const std::vector<ReasonsMatcher>& children) {
-  // TODO(crbug.com/1523191) Make this matcher display human-friendly messages.
+  // TODO(crbug.com/41496143) Make this matcher display human-friendly messages.
   return testing::Pointee(testing::AllOf(
       testing::Field(
           "url", &blink::mojom::SameOriginBfcacheNotRestoredDetails::url, url),
@@ -510,7 +510,7 @@ BlockingDetailsReasonsMatcher
 BackForwardCacheBrowserTest::MatchesDetailedReason(
     const testing::Matcher<std::string>& name,
     const std::optional<SourceLocationMatcher>& source) {
-  // TODO(crbug.com/1523191) Make this matcher display human-friendly
+  // TODO(crbug.com/41496143) Make this matcher display human-friendly
   // messages.
   return testing::Pointee(testing::AllOf(
       testing::Field("name", &blink::mojom::BFCacheBlockingDetailedReason::name,
@@ -526,7 +526,7 @@ BackForwardCacheBrowserTest::MatchesDetailedReason(
 
 BlockingDetailsMatcher BackForwardCacheBrowserTest::MatchesBlockingDetails(
     const std::optional<SourceLocationMatcher>& source) {
-  // TODO(crbug.com/1523191) Make this matcher display human-friendly messages.
+  // TODO(crbug.com/41496143) Make this matcher display human-friendly messages.
   return testing::Pointee(testing::Field(
       "source", &blink::mojom::BlockingDetails::source,
       source.has_value()
@@ -541,7 +541,7 @@ SourceLocationMatcher BackForwardCacheBrowserTest::MatchesSourceLocation(
     const testing::Matcher<std::string>& function_name,
     const testing::Matcher<uint64_t>& line_number,
     const testing::Matcher<uint64_t>& column_number) {
-  // TODO(crbug.com/1523191) Make this matcher display human-friendly
+  // TODO(crbug.com/41496143) Make this matcher display human-friendly
   // messages.
   return testing::Pointee(testing::AllOf(
       testing::Field("url", &blink::mojom::ScriptSourceLocation::url, url),

content/browser/back_forward_cache_features_browsertest.cc

@@ -1068,7 +1068,7 @@ IN_PROC_BROWSER_TEST_P(BackForwardCacheWithDedicatedWorkerBrowserTest,
             CountWorkerClients(current_frame_host()));
 }
 
-// TODO(https://crbug.com/154571): Shared workers are not available on Android.
+// TODO(crbug.com/40290702): Shared workers are not available on Android.
 #if BUILDFLAG(IS_ANDROID)
 #define MAYBE_PageWithSharedWorkerNotCached \
   DISABLED_PageWithSharedWorkerNotCached
@@ -2212,7 +2212,7 @@ class BackForwardCacheBrowserTestWithJavaScriptDetails
 
 // Use a blocklisted feature in multiple locations from an external JavaScript
 // file and make sure all the JavaScript location details are captured.
-// TODO(crbug.com/1372291): WebSocket server is flaky Android.
+// TODO(crbug.com/40241677): WebSocket server is flaky Android.
 #if BUILDFLAG(IS_ANDROID)
 #define MAYBE_MultipleBlocksFromJavaScriptFile \
   DISABLED_MultipleBlocksFromJavaScriptFile
@@ -2280,7 +2280,7 @@ IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTestWithJavaScriptDetails,
 // Use a blocklisted feature in multiple locations from an external JavaScript
 // file but stop using one of them before navigating away. Make sure that only
 // the one still in use is reported.
-// TODO(crbug.com/1372291): WebSocket server is flaky Android.
+// TODO(crbug.com/40241677): WebSocket server is flaky Android.
 #if BUILDFLAG(IS_ANDROID)
 #define MAYBE_BlockAndUnblockFromJavaScriptFile \
   DISABLED_BlockAndUnblockFromJavaScriptFile
@@ -2348,7 +2348,7 @@ IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTestWithJavaScriptDetails,
 
 // Use a blocklisted feature in multiple places from HTML file and make sure all
 // the JavaScript locations detail are captured.
-// TODO(crbug.com/1372291): WebSocket server is flaky Android.
+// TODO(crbug.com/40241677): WebSocket server is flaky Android.
 #if BUILDFLAG(IS_ANDROID)
 #define MAYBE_MultipleBlocksFromHTMLFile DISABLED_MultipleBlocksFromHTMLFile
 #else
@@ -2411,7 +2411,7 @@ IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTestWithJavaScriptDetails,
 // Use a blocklisted feature in multiple locations from HTML file but stop using
 // one of them before navigating away. Make sure that only the one still in use
 // is reported.
-// TODO(crbug.com/1372291): WebSocket server is flaky Android.
+// TODO(crbug.com/40241677): WebSocket server is flaky Android.
 #if BUILDFLAG(IS_ANDROID)
 #define MAYBE_BlockAndUnblockFromHTMLFile DISABLED_BlockAndUnblockFromHTMLFile
 #else
@@ -2474,7 +2474,7 @@ IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTestWithJavaScriptDetails,
 }
 
 // Test that details for sticky feature are captured.
-// TODO(crbug.com/1372291): WebSocket server is flaky Android.
+// TODO(crbug.com/40241677): WebSocket server is flaky Android.
 #if BUILDFLAG(IS_ANDROID)
 #define MAYBE_StickyFeaturesWithDetails DISABLED_StickyFeaturesWithDetails
 #else
@@ -2533,7 +2533,7 @@ IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTestWithJavaScriptDetails,
           MatchesSourceLocation(GURL::EmptyGURL(), "", 3, 24))));
 }
 
-// TODO(crbug.com/1317431): WebSQL does not work on Fuchsia.
+// TODO(crbug.com/40834769): WebSQL does not work on Fuchsia.
 #if BUILDFLAG(IS_FUCHSIA)
 #define MAYBE_DoesNotCacheIfWebDatabase DISABLED_DoesNotCacheIfWebDatabase
 #else
@@ -3220,7 +3220,7 @@ IN_PROC_BROWSER_TEST_P(BackForwardCacheWithBroadcastChannelTest,
 
 // Disabled on Android, since we have problems starting up the websocket test
 // server in the host
-// TODO(crbug.com/1372291): Re-enable the test after solving the WS server.
+// TODO(crbug.com/40241677): Re-enable the test after solving the WS server.
 #if BUILDFLAG(IS_ANDROID)
 #define MAYBE_WebSocketCachedIfClosed DISABLED_WebSocketCachedIfClosed
 #else
@@ -3348,7 +3348,7 @@ IN_PROC_BROWSER_TEST_F(WebTransportBackForwardCacheBrowserTest,
 
 // Disabled on Android, since we have problems starting up the websocket test
 // server in the host
-// TODO(crbug.com/1372291): Re-enable the test after solving the WS server.
+// TODO(crbug.com/40241677): Re-enable the test after solving the WS server.
 #if BUILDFLAG(IS_ANDROID)
 #define MAYBE_WebSocketNotCached DISABLED_WebSocketNotCached
 #else
@@ -4570,7 +4570,7 @@ IN_PROC_BROWSER_TEST_F(SensorBackForwardCacheBrowserTest,
 // See the discussion at http://crrev.com/c/2564926.
 #if !BUILDFLAG(IS_ANDROID)
 
-// TODO(https://crbug.com/1213145): The test is consistently failing on some Mac
+// TODO(crbug.com/40183520): The test is consistently failing on some Mac
 // bots.
 #if BUILDFLAG(IS_MAC)
 #define MAYBE_TrivialRTCPeerConnectionCached \
@@ -4652,7 +4652,7 @@ IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTest,
 // See the discussion at http://crrev.com/c/2564926.
 #if !BUILDFLAG(IS_ANDROID)
 
-// TODO(https://crbug.com/1213145): The test is consistently failing on some Mac
+// TODO(crbug.com/40183520): The test is consistently failing on some Mac
 // bots.
 // This test uses Media Stream Track, so the test class is
 // `BackForwardCacheMediaTest`.
@@ -5026,7 +5026,7 @@ IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTest,
                     {}, {reason}, {}, FROM_HERE);
 }
 
-// TODO(crbug.com/1491942): This fails with the field trial testing config.
+// TODO(crbug.com/40285326): This fails with the field trial testing config.
 class BackForwardCacheBrowserTestNoTestingConfig
     : public BackForwardCacheBrowserTest {
  public:

content/browser/back_forward_cache_internal_browsertest.cc

@@ -3211,7 +3211,7 @@ IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTest,
 
   // 3) Go back to A, which should restore the page saved in the back-forward
   // cache and use the old user agent.
-  // TODO(https://crbug.com/1194880): This should use the new UA override.
+  // TODO(crbug.com/40758687): This should use the new UA override.
   {
     FrameNavigateParamsCapturer params_capturer(root);
     controller.GoBack();

content/browser/back_forward_cache_network_request_browsertest.cc

@@ -115,7 +115,7 @@ IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTest,
 
 // Eviction is triggered when a keepalive fetch request gets redirected while
 // the page is in back-forward cache.
-// TODO(https://crbug.com/1137682): We should not trigger eviction on redirects
+// TODO(crbug.com/40724916): We should not trigger eviction on redirects
 // of keepalive fetches.
 // TODO(crbug.com/40874525): Disabled for flakiness.
 IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTest,
@@ -153,7 +153,7 @@ IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTest,
 
   // Ensure that the request to /fetch2 was never sent (because the page is
   // immediately evicted) by checking after 3 seconds.
-  // TODO(https://crbug.com/1137682): We should not trigger eviction on
+  // TODO(crbug.com/40724916): We should not trigger eviction on
   // redirects of keepalive fetches and the redirect request should be sent.
   base::RunLoop loop;
   base::OneShotTimer timer;

content/browser/back_forward_cache_no_store_browsertest.cc

@@ -49,7 +49,7 @@ const char kResponseWithNoCache[] =
 
 }  // namespace
 
-// TODO(crbug.com/1491942): This fails with the field trial testing config.
+// TODO(crbug.com/40285326): This fails with the field trial testing config.
 class BackForwardCacheBrowserTestNoTestingConfig
     : public BackForwardCacheBrowserTest {
  public:
@@ -113,7 +113,7 @@ IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTestNoTestingConfig,
 
 // When CCNS is present and WebSocket is used, both features should be recorded
 // and the test should not hit CHECK.
-// TODO(crbug.com/1372291): WebSocket server is flaky Android.
+// TODO(crbug.com/40241677): WebSocket server is flaky Android.
 #if BUILDFLAG(IS_ANDROID)
 #define MAYBE_CCNSAndWebSocketBothRecorded DISABLED_CCNSAndWebSocketBothRecorded
 #else
@@ -785,7 +785,7 @@ class BackForwardCacheWithJsNetworkRequestReceivingCCNSResourceBrowserTest
     }
   }
 
-  // TODO(crbug.com/1491942): This fails with the field trial testing config.
+  // TODO(crbug.com/40285326): This fails with the field trial testing config.
   void SetUpCommandLine(base::CommandLine* command_line) override {
     BackForwardCacheBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch("disable-field-trial-config");

content/browser/background_fetch/background_fetch_cross_origin_filter.cc

@@ -92,9 +92,10 @@ BackgroundFetchCrossOriginFilter::BackgroundFetchCrossOriginFilter(
   include_credentials_ = request.fetch_request()->credentials_mode ==
                          ::network::mojom::CredentialsMode::kInclude;
 
-  // TODO(crbug.com/711354): Consider the Access-Control-Allow-Headers header.
-  // TODO(crbug.com/711354): Consider the Access-Control-Allow-Methods header.
-  // TODO(crbug.com/711354): Consider the Access-Control-Expose-Headers header.
+  // TODO(crbug.com/40515511): Consider the Access-Control-Allow-Headers header.
+  // TODO(crbug.com/40515511): Consider the Access-Control-Allow-Methods header.
+  // TODO(crbug.com/40515511): Consider the Access-Control-Expose-Headers
+  // header.
 }
 
 BackgroundFetchCrossOriginFilter::~BackgroundFetchCrossOriginFilter() = default;

content/browser/background_fetch/background_fetch_data_manager.h

@@ -269,7 +269,7 @@ class CONTENT_EXPORT BackgroundFetchDataManager
   // |unique_id|. These remotes are created opportunistically in
   // GetOrOpenCacheStorage(). They are cleared after the Cache has been
   // deleted.
-  // TODO(crbug.com/711354): Possibly update key when CORS support is added.
+  // TODO(crbug.com/40515511): Possibly update key when CORS support is added.
   std::map<std::string, mojo::Remote<blink::mojom::CacheStorage>>
       cache_storage_remote_map_;
   mojo::Remote<blink::mojom::CacheStorage> null_remote_;

content/browser/background_fetch/background_fetch_job_controller.cc

@@ -35,7 +35,7 @@ bool IsMixedContent(const BackgroundFetchRequestInfo& request) {
 // Whether the |request| needs CORS preflight.
 // Requests that require CORS preflights are temporarily blocked, because the
 // browser side of Background Fetch doesn't yet support performing CORS
-// checks. TODO(crbug.com/711354): Remove this temporary block.
+// checks. TODO(crbug.com/40515511): Remove this temporary block.
 bool RequiresCorsPreflight(const BackgroundFetchRequestInfo& request,
                            const url::Origin& origin) {
   const blink::mojom::FetchAPIRequestPtr& fetch_request =
@@ -43,7 +43,8 @@ bool RequiresCorsPreflight(const BackgroundFetchRequestInfo& request,
 
   // Same origin requests don't require a CORS preflight.
   // https://fetch.spec.whatwg.org/#main-fetch
-  // TODO(crbug.com/711354): Make sure that cross-origin redirects are disabled.
+  // TODO(crbug.com/40515511): Make sure that cross-origin redirects are
+  // disabled.
   if (url::IsSameOriginWith(origin.GetURL(), fetch_request->url))
     return false;
 
@@ -174,7 +175,7 @@ void BackgroundFetchJobController::DidStartRequest(
 
   request->PopulateWithResponse(std::move(response));
 
-  // TODO(crbug.com/884672): Stop the fetch if the cross origin filter fails.
+  // TODO(crbug.com/40593934): Stop the fetch if the cross origin filter fails.
   BackgroundFetchCrossOriginFilter filter(
       registration_id_.storage_key().origin(), *request);
   request->set_can_populate_body(filter.CanPopulateBody());

content/browser/background_fetch/storage/get_developer_ids_task.cc

@@ -42,7 +42,7 @@ void GetDeveloperIdsTask::DidGetServiceWorkerRegistration(
     return;
   }
 
-  // TODO(crbug.com/1199077): Move this check into the SW context.
+  // TODO(crbug.com/40177656): Move this check into the SW context.
   if (registration->key() != storage_key_) {
     SetStorageErrorAndFinish(
         BackgroundFetchStorageError::kServiceWorkerStorageError);

content/browser/background_fetch/storage/mark_request_complete_task.cc

@@ -98,7 +98,7 @@ void MarkRequestCompleteTask::StoreResponse(base::OnceClosure done_closure) {
     return;
   }
 
-  // TODO(crbug.com/884672): Move cross origin checks to when the response
+  // TODO(crbug.com/40593934): Move cross origin checks to when the response
   // headers are available.
   BackgroundFetchCrossOriginFilter filter(
       registration_id_.storage_key().origin(), *request_info_);

content/browser/background_sync/background_sync_manager.cc

@@ -48,7 +48,7 @@ using SyncAndNotificationPermissions =
 
 namespace content {
 
-// TODO(crbug.com/932591): Use blink::mojom::BackgroundSyncError
+// TODO(crbug.com/40614176): Use blink::mojom::BackgroundSyncError
 // directly and eliminate these checks.
 #define COMPILE_ASSERT_MATCHING_ENUM(mojo_name, manager_name) \
   static_assert(static_cast<int>(blink::mojo_name) ==         \
@@ -1945,7 +1945,7 @@ void BackgroundSyncManager::FireReadyEventsImpl(
   }
 
   if (to_fire.empty()) {
-    // TODO(crbug.com/996166): Reschedule wakeup after a non-zero delay if
+    // TODO(crbug.com/40641360): Reschedule wakeup after a non-zero delay if
     // called from a wakeup task.
     if (reschedule)
       ScheduleOrCancelDelayedProcessing(sync_type);

content/browser/background_sync/background_sync_manager_unittest.cc

@@ -1773,8 +1773,8 @@ TEST_F(BackgroundSyncManagerTest, NotifyBackgroundSyncRegistered) {
             GetController()->registration_origin());
 }
 
-// TODO(crbug.com/996166): Update and enable when browser wake up logic has been
-// updated to not schedule a wakeup with delay of 0.
+// TODO(crbug.com/40641360): Update and enable when browser wake up logic has
+// been updated to not schedule a wakeup with delay of 0.
 TEST_F(BackgroundSyncManagerTest, DISABLED_WakeBrowserCalledForOneShotSync) {
   SetupBackgroundSyncManager();
   InitDelayedSyncEventTest();

content/browser/background_sync/background_sync_proxy.h

@@ -25,7 +25,7 @@ class ServiceWorkerContextWrapper;
 // on BackgroundSyncController. It is owned by the BackgroundSyncManager and
 // lives on the UI thread.
 //
-// TODO(crbug.com/824858): This class was previously needed because
+// TODO(crbug.com/40568315): This class was previously needed because
 // BackgroundSyncManager and BackgroundSyncController were on different threads.
 // It should no longer be needed.
 class CONTENT_EXPORT BackgroundSyncProxy {

content/browser/background_sync/background_sync_registration_helper.cc

@@ -74,7 +74,7 @@ void BackgroundSyncRegistrationHelper::OnRegisterResult(
     std::unique_ptr<BackgroundSyncRegistration> result) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  // TODO(crbug.com/932591): Use blink::mojom::BackgroundSyncError
+  // TODO(crbug.com/40614176): Use blink::mojom::BackgroundSyncError
   // directly.
   if (status != BACKGROUND_SYNC_STATUS_OK) {
     std::move(callback).Run(

content/browser/background_sync/background_sync_scheduler.h

@@ -38,7 +38,7 @@ class CONTENT_EXPORT BackgroundSyncScheduler
 
   // Schedules delayed_processing for |sync_type| for |storage_partition|.
   // On non-Android platforms, runs |delayed_task| after |delay| has passed.
-  // TODO(crbug.com/996166): Add logic to schedule browser wakeup on Android.
+  // TODO(crbug.com/40641360): Add logic to schedule browser wakeup on Android.
   // Must be called on the UI thread.
   virtual void ScheduleDelayedProcessing(
       StoragePartitionImpl* storage_partition,

content/browser/bluetooth/README.md

@@ -55,7 +55,7 @@ ongoing effort to refactor the Web Bluetooth tests using the legacy
 Test API. For more details, see the [Web Bluetooth Web Tests README] and the
 [Web Bluetooth Web Platform Tests README].
 
-TODO(https://crbug.com/509038): Update this document when the remaining tests
+TODO(crbug.com/40426301): Update this document when the remaining tests
 have been submitted to W3C Web Platform Tests.
 
 The tests are run using `content_shell`, which fakes the Bluetooth related UI

content/browser/bluetooth/web_bluetooth_service_impl.cc

@@ -672,7 +672,7 @@ void WebBluetoothServiceImpl::DeviceAdvertisementReceived(
   auto& service_data = result->service_data;
   service_data.insert(service_data_map.begin(), service_data_map.end());
 
-  // TODO(https://crbug.com/1087007): These two classes can potentially be
+  // TODO(crbug.com/40132791): These two classes can potentially be
   // combined into the same container.
   for (const auto& scanning_client : scanning_clients_)
     scanning_client->SendEvent(*result);
@@ -1140,7 +1140,7 @@ void WebBluetoothServiceImpl::RemoteCharacteristicWriteValue(
     return;
   }
 
-  // TODO(crbug.com/730593): Remove SplitOnceCallback() by updating
+  // TODO(crbug.com/40524549): Remove SplitOnceCallback() by updating
   // the callee interface.
   auto split_callback = base::SplitOnceCallback(std::move(callback));
   base::OnceClosure write_callback = base::BindOnce(
@@ -1189,7 +1189,7 @@ void WebBluetoothServiceImpl::RemoteCharacteristicStartNotificationsInternal(
       std::make_unique<GATTNotifySessionAndCharacteristicClient>(
           std::move(client));
 
-  // TODO(crbug.com/730593): Remove SplitOnceCallback() by updating
+  // TODO(crbug.com/40524549): Remove SplitOnceCallback() by updating
   // the callee interface.
   auto split_callback = base::SplitOnceCallback(std::move(callback));
   query_result.characteristic->StartNotifySession(
@@ -1354,7 +1354,7 @@ void WebBluetoothServiceImpl::RemoteDescriptorWriteValue(
     return;
   }
 
-  // TODO(crbug.com/730593): Remove SplitOnceCallback() by updating
+  // TODO(crbug.com/40524549): Remove SplitOnceCallback() by updating
   // the callee interface.
   auto split_callback = base::SplitOnceCallback(std::move(callback));
   query_result.descriptor->WriteRemoteDescriptor(
@@ -1453,7 +1453,7 @@ void WebBluetoothServiceImpl::WatchAdvertisementsForDevice(
 void WebBluetoothServiceImpl::RemoveDisconnectedClients() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  // TODO(https://crbug.com/1087007): These two classes can potentially be
+  // TODO(crbug.com/40132791): These two classes can potentially be
   // combined into the same container.
   std::erase_if(scanning_clients_,
                 [](const std::unique_ptr<ScanningClient>& client) {
@@ -1519,7 +1519,7 @@ void WebBluetoothServiceImpl::RequestScanningStartImpl(
 
   request_scanning_start_callback_ = std::move(callback);
 
-  // TODO(https://crbug.com/969109): Since scanning without a filter wastes
+  // TODO(crbug.com/40630111): Since scanning without a filter wastes
   // resources, we need use StartDiscoverySessionWithFilter() instead of
   // StartDiscoverySession() here.
   adapter->StartDiscoverySession(
@@ -1667,7 +1667,7 @@ void WebBluetoothServiceImpl::WatchAdvertisementsForDeviceImpl(
   }
 
   // Not all platforms support filtering by address.
-  // TODO(https://crbug.com/969109): Use StartDiscoverySessionWithFilter() to
+  // TODO(crbug.com/40630111): Use StartDiscoverySessionWithFilter() to
   // filter out by MAC address when platforms provide this capability.
   adapter->StartDiscoverySession(
       kScanClientNameWatchAdvertisements,

content/browser/browser_child_process_observer_browsertest.cc

@@ -306,7 +306,7 @@ class BrowserChildProcessObserverBrowserTest : public ContentBrowserTest {};
 // Tests that launching and then using ForceShutdown() results in a normal
 // termination.
 #if defined(ADDRESS_SANITIZER)
-// TODO(https://crbug.com/1363257): Fix ASAN failures on trybot.
+// TODO(crbug.com/40238612): Fix ASAN failures on trybot.
 #define MAYBE_LaunchAndForceShutdown DISABLED_LaunchAndForceShutdown
 #else
 #define MAYBE_LaunchAndForceShutdown LaunchAndForceShutdown
@@ -385,7 +385,7 @@ IN_PROC_BROWSER_TEST_F(BrowserChildProcessObserverBrowserTest,
 // Note: This only works for services bound using BindServiceInterface(), not
 // BindReceiver().
 #if defined(ADDRESS_SANITIZER)
-// TODO(https://crbug.com/1363257): Fix ASAN failures on trybot.
+// TODO(crbug.com/40238612): Fix ASAN failures on trybot.
 #define MAYBE_LaunchAndDisconnect DISABLED_LaunchAndDisconnect
 #else
 #define MAYBE_LaunchAndDisconnect LaunchAndDisconnect

content/browser/browser_context.cc

@@ -326,7 +326,7 @@ base::WeakPtr<BrowserContext> BrowserContext::GetWeakPtr() {
 // how the //content layer interacts with a BrowserContext.  The code below
 // provides default implementations where appropriate.
 //
-// TODO(https://crbug.com/1179776): Migrate method definitions from this
+// TODO(crbug.com/40169693): Migrate method definitions from this
 // section into a separate BrowserContextDelegate class and a separate
 // browser_context_delegate.cc source file.
 

content/browser/browser_context_impl.h

@@ -46,7 +46,7 @@ class StoragePartitionImplMap;
 
 // content-internal parts of BrowserContext.
 //
-// TODO(https://crbug.com/1179776): Make BrowserContextImpl to implement
+// TODO(crbug.com/40169693): Make BrowserContextImpl to implement
 // BrowserContext, instead of being a member.
 class CONTENT_EXPORT BrowserContextImpl {
  public:
@@ -119,7 +119,7 @@ class CONTENT_EXPORT BrowserContextImpl {
   std::unique_ptr<media::WebrtcVideoPerfHistory> CreateWebrtcVideoPerfHistory();
 
   // BrowserContextImpl is owned and build from BrowserContext constructor.
-  // TODO(https://crbug.com/1179776): Invert the dependency. Make BrowserContext
+  // TODO(crbug.com/40169693): Invert the dependency. Make BrowserContext
   // a pure interface and BrowserContextImpl implements it. Remove the `self_`
   // field and 'friend' declaration.
   friend BrowserContext;
@@ -144,7 +144,7 @@ class CONTENT_EXPORT BrowserContextImpl {
   std::unique_ptr<media::VideoDecodePerfHistory> video_decode_perf_history_;
   std::unique_ptr<media::WebrtcVideoPerfHistory> webrtc_video_perf_history_;
 
-  // TODO(https://crbug.com/908955): Get rid of ResourceContext.
+  // TODO(crbug.com/40604019): Get rid of ResourceContext.
   // Created on the UI thread, otherwise lives on and is destroyed on the IO
   // thread.
   std::unique_ptr<ResourceContext> resource_context_ =

content/browser/browsing_data/browsing_data_remover_impl.cc

@@ -450,7 +450,7 @@ void BrowsingDataRemoverImpl::RemoveImpl(
         StoragePartition::REMOVE_DATA_MASK_SHADER_CACHE;
   }
   if (remove_mask & DATA_TYPE_MEDIA_LICENSES ||
-      // TODO(crbug.com/1434517): For now, media licenses are part of the quota
+      // TODO(crbug.com/40264778): For now, media licenses are part of the quota
       // management system. If all DOM storage types are being removed, remove
       // media licenses as well. When bug is resolved, this condition can be
       // removed.

content/browser/browsing_data/browsing_data_remover_impl_unittest.cc

@@ -1760,7 +1760,7 @@ TEST_F(BrowsingDataRemoverImplTest, DeferCookieDeletion) {
       StoragePartition::REMOVE_DATA_MASK_CACHE_STORAGE |
       StoragePartition::REMOVE_DATA_MASK_BACKGROUND_FETCH |
       StoragePartition::REMOVE_DATA_MASK_INDEXEDDB |
-      // TODO(crbug.com/1434517): remove.
+      // TODO(crbug.com/40264778): remove.
       StoragePartition::REMOVE_DATA_MASK_MEDIA_LICENSES;
   uint32_t dom_storage_and_cookie_mask =
       dom_storage_mask | StoragePartition::REMOVE_DATA_MASK_INTEREST_GROUPS |

content/browser/browsing_data/clear_site_data_handler.cc

@@ -343,7 +343,7 @@ bool ClearSiteDataHandler::ParseHeader(
   }
 
   // Pretty-print which types are to be cleared.
-  // TODO(crbug.com/798760): Remove the disclaimer about cookies.
+  // TODO(crbug.com/41363015): Remove the disclaimer about cookies.
   std::string console_output =
       base::StringPrintf(kConsoleMessageCleared, output_types.c_str());
   if (clear_site_data_types->Has(ClearSiteDataType::kCookies)) {

content/browser/browsing_data/conditional_cache_deletion_helper_browsertest.cc

@@ -61,7 +61,7 @@ class ConditionalCacheDeletionHelperBrowserTest : public ContentBrowserTest {
     base::Time start = base::Time::Now();
     bool all_entries_written = false;
 
-    // TODO(crbug.com/1519130): `base::test::RunUntil` times out on mac.
+    // TODO(crbug.com/41492111): `base::test::RunUntil` times out on mac.
     while (base::Time::Now() - start < TestTimeouts::action_timeout()) {
       all_entries_written = true;
       for (auto& url : urls) {

content/browser/browsing_instance.h

@@ -352,7 +352,7 @@ class CONTENT_EXPORT BrowsingInstance final
   // given, of only being able to DOM script same-origin same-COOP documents,
   // and to have limited cross-origin communication with all other pages.
   //
-  // TODO(https://crbug.com/1385827): This assumes that popups opened from
+  // TODO(crbug.com/40879437): This assumes that popups opened from
   // cross-origin iframes are opened with no-opener. Once COOP inheritance for
   // those cases is figured out, change the mentions of origin to "COOP origin".
   std::optional<url::Origin> common_coop_origin_;
@@ -361,8 +361,8 @@ class CONTENT_EXPORT BrowsingInstance final
   // navigations in the frames belonging to this BrowsingInstance. For <webview>
   // tags, this is always true.
   //
-  // TODO(crbug.com/1503007): We actually always want this behavior. Remove this
-  // bit when we are ready.
+  // TODO(crbug.com/40943418): We actually always want this behavior. Remove
+  // this bit when we are ready.
   const bool is_fixed_storage_partition_;
 
   // A token uniquely identifying this BrowsingInstance. This is used in case we

content/browser/browsing_topics/browsing_topics_document_host.cc

@@ -70,7 +70,7 @@ void BrowsingTopicsDocumentHost::GetBrowsingTopics(
       // prerendered pages are also covered in this condition but they should
       // have already been checked in `CreateMojoService()`.
       !render_frame_host().GetPage().IsPrimary() ||
-      // TODO(crbug.com/1244137): IsPrimary() doesn't actually detect portals
+      // TODO(crbug.com/40787700): IsPrimary() doesn't actually detect portals
       // yet. Remove this when it does.
       render_frame_host().GetOutermostMainFrame() !=
           render_frame_host().GetMainFrame()) {

content/browser/browsing_topics/browsing_topics_url_loader_interceptor.cc

@@ -132,7 +132,7 @@ void BrowsingTopicsURLLoaderInterceptor::PopulateRequestOrRedirectHeaders(
     return;
   }
 
-  // TODO(crbug.com/1244137): IsPrimary() doesn't actually detect portals yet.
+  // TODO(crbug.com/40787700): IsPrimary() doesn't actually detect portals yet.
   // Remove this when it does.
   if (!static_cast<RenderFrameHostImpl*>(
            request_initiator_frame->GetMainFrame())

content/browser/browsing_topics/header_util.cc

@@ -160,7 +160,7 @@ void HandleTopicsEligibleResponse(
     return;
   }
 
-  // TODO(crbug.com/1244137): IsPrimary() doesn't actually detect portals yet.
+  // TODO(crbug.com/40787700): IsPrimary() doesn't actually detect portals yet.
   // Remove this when it does.
   if (!static_cast<const RenderFrameHostImpl*>(
            request_initiator_frame.GetMainFrame())

content/browser/cache_storage/cache_storage.cc

@@ -348,7 +348,7 @@ class CacheStorage::SimpleCacheLoader : public CacheStorage::CacheLoader {
     // backwards compatibility with older data. The serializations are
     // subtly different, e.g. Origin does not include a trailing "/".
     // TODO(crbug.com/41368964): Add a test for validating fields in the proto
-    // TODO(https://crbug.com/1199077): Stop setting the origin field once
+    // TODO(crbug.com/40177656): Stop setting the origin field once
     // `CacheStorageManager` no longer uses the origin as a fallback for
     // getting the storage key associated with each cache (for more info, see
     // `GetStorageKeysAndLastModifiedOnTaskRunner`).

content/browser/cache_storage/cache_storage_dispatcher_host.cc

@@ -55,7 +55,7 @@ using network::mojom::RequestMode;
 
 // TODO(lucmult): Check this before binding.
 bool OriginCanAccessCacheStorage(const url::Origin& origin) {
-  // TODO(https://crbug.com/1158302): Use IsOriginPotentiallyTrustworthy?
+  // TODO(crbug.com/40161236): Use IsOriginPotentiallyTrustworthy?
   return !origin.opaque() &&
          network::IsUrlPotentiallyTrustworthy(origin.GetURL());
 }

content/browser/cache_storage/cache_storage_manager.cc

@@ -102,7 +102,7 @@ IndexResult ValidateIndex(proto::CacheStorageIndex index) {
     return IndexResult::kEmptyOriginUrl;
   }
 
-  // TODO(https://crbug.com/1199077): Consider adding a
+  // TODO(crbug.com/40177656): Consider adding a
   // 'index.has_storage_key()' check here once we've ensured that a
   // sufficient number of CacheStorage instances have been migrated (or
   // verified that `ValidateIndex` won't be passed an unmigrated `index`).
@@ -165,7 +165,7 @@ void ValidateAndAddBucketFromPath(
     }
     storage_key = result.value();
   } else {
-    // TODO(https://crbug.com/1199077): Since index file migrations happen
+    // TODO(crbug.com/40177656): Since index file migrations happen
     // lazily, it's plausible that the index file we are reading doesn't have
     // a storage key yet. For now, fall back to creating the storage key
     // from the origin. Once enough time has passed it should be safe to treat

content/browser/child_process_launcher.h

@@ -176,7 +176,7 @@ struct ChildProcessLauncherFileData {
   // with the corresponding key.
   //
   // Currently only supported on Linux, ChromeOS and Android platforms.
-  // TODO(crbug.com/1407089): this currently silently fails on Android.
+  // TODO(crbug.com/40253015): this currently silently fails on Android.
   std::map<std::string, absl::variant<base::FilePath, base::ScopedFD>>
       files_to_preload;
 #endif

content/browser/child_process_launcher_helper_ios.mm

@@ -363,7 +363,7 @@ NSObject* ChildProcessLauncherHelper::GetProcess() {
 // static
 bool ChildProcessLauncherHelper::TerminateProcess(const base::Process& process,
                                                   int exit_code) {
-  // TODO(https://crbug.com/818244): Determine whether we should also call
+  // TODO(crbug.com/40565504): Determine whether we should also call
   // EnsureProcessTerminated() to make sure of process-exit, and reap it.
   return process.Terminate(exit_code, false);
 }

content/browser/child_process_launcher_helper_linux.cc

@@ -150,7 +150,7 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper::GetTerminationInfo(
 // static
 bool ChildProcessLauncherHelper::TerminateProcess(const base::Process& process,
                                                   int exit_code) {
-  // TODO(https://crbug.com/818244): Determine whether we should also call
+  // TODO(crbug.com/40565504): Determine whether we should also call
   // EnsureProcessTerminated() to make sure of process-exit, and reap it.
   return process.Terminate(exit_code, false);
 }

content/browser/child_process_launcher_helper_mac.cc

@@ -228,7 +228,7 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper::GetTerminationInfo(
 // static
 bool ChildProcessLauncherHelper::TerminateProcess(const base::Process& process,
                                                   int exit_code) {
-  // TODO(https://crbug.com/818244): Determine whether we should also call
+  // TODO(crbug.com/40565504): Determine whether we should also call
   // EnsureProcessTerminated() to make sure of process-exit, and reap it.
   return process.Terminate(exit_code, false);
 }

content/browser/child_process_security_policy_impl.cc

@@ -223,7 +223,7 @@ void LogCanAccessDataForOriginCrashKeys(
 // Checks whether a lock mismatch should be ignored to allow most visited tiles
 // to commit in third-party NTP processes.
 //
-// TODO(crbug.com/566091): This exception should be removed once these tiles
+// TODO(crbug.com/40447789): This exception should be removed once these tiles
 // can be loaded in OOPIFs on the NTP.
 bool AllowProcessLockMismatchForNTP(const ProcessLock& expected_lock,
                                     const ProcessLock& actual_lock) {
@@ -1998,7 +1998,7 @@ bool ChildProcessSecurityPolicyImpl::CanAccessMaybeOpaqueOrigin(
 
           // Make an exception to allow most visited tiles to commit in
           // third-party NTP processes.
-          // TODO(crbug.com/566091): This exception should be removed once
+          // TODO(crbug.com/40447789): This exception should be removed once
           // these tiles can be loaded in OOPIFs on the NTP.
           if (AllowProcessLockMismatchForNTP(expected_process_lock,
                                              actual_process_lock)) {

content/browser/child_process_security_policy_unittest.cc

@@ -1216,7 +1216,7 @@ TEST_P(ChildProcessSecurityPolicyTest, RemoveRace) {
 // removal process. It is intended to simulate pending tasks that could be
 // run on each thread during removal.
 //
-// TODO(crbug.com/1286533): Refactor the test to avoid calls to
+// TODO(crbug.com/40210893): Refactor the test to avoid calls to
 // CanAccessDataForOrigin on the IO thread, by checking for the presence of
 // security state instead.
 TEST_P(ChildProcessSecurityPolicyTest, RemoveRace_CanAccessDataForOrigin) {
@@ -1348,7 +1348,7 @@ TEST_P(ChildProcessSecurityPolicyTest, RemoveRace_CanAccessDataForOrigin) {
 // removal process. It is intended to simulate pending tasks that could be
 // run on each thread during removal.
 //
-// TODO(crbug.com/1286533): Refactor the test to avoid calls to
+// TODO(crbug.com/40210893): Refactor the test to avoid calls to
 // CanAccessDataForOrigin on the IO thread, by checking for the presence of
 // security state instead.
 TEST_P(ChildProcessSecurityPolicyTest, HandleExtendsSecurityStateLifetime) {

content/browser/code_cache/generated_code_cache_browsertest.cc

@@ -364,7 +364,7 @@ IN_PROC_BROWSER_TEST_P(CodeCacheBrowserTest,
 
     FetchHistogramsFromChildProcesses();
 
-    // TODO(https://crbug.com/964467): The kMiss and kCreate counts are zero
+    // TODO(crbug.com/40628019): The kMiss and kCreate counts are zero
     // here because for Dedicated Workers and Shared Workers the Generated Code
     // Cache isn't used yet. Once it is, update these counts (there are two
     // scripts that could be cached, depending on the implementation -
@@ -398,7 +398,7 @@ IN_PROC_BROWSER_TEST_P(CodeCacheBrowserTest,
     histogram_tester.ExpectBucketCount(
         "SiteIsolatedCodeCache.JS.Behaviour",
         GeneratedCodeCache::CacheEntryStatus::kMiss, 0);
-    // TODO(https://crbug.com/964467): Once the Generated Code Cache is used for
+    // TODO(crbug.com/40628019): Once the Generated Code Cache is used for
     // Shared Workers, check that the scripts loaded from the worker context
     // were re-used from the test section above.
     histogram_tester.ExpectBucketCount(
@@ -419,7 +419,7 @@ IN_PROC_BROWSER_TEST_P(CodeCacheBrowserTest,
 
     FetchHistogramsFromChildProcesses();
 
-    // TODO(https://crbug.com/964467): Once the Generated Code Cache is used
+    // TODO(crbug.com/40628019): Once the Generated Code Cache is used
     // for Shared Workers, check that the worker scripts re-used in the test
     // section above do not get re-used for this part of the test when
     // `IsCachePartitioningEnabled()` returns true (but are re-used otherwise).

content/browser/content_index/content_index_database.cc

@@ -21,7 +21,7 @@
 #include "url/gurl.h"
 #include "url/origin.h"
 
-// TODO(crbug.com/973844): Move image utility functions to common library.
+// TODO(crbug.com/40631965): Move image utility functions to common library.
 using content::background_fetch::DeserializeIcon;
 using content::background_fetch::SerializeIcon;
 
@@ -148,7 +148,7 @@ void ContentIndexDatabase::AddEntry(
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   if (blocked_origins_.count(origin)) {
-    // TODO(crbug.com/973844): Does this need a more specific error?
+    // TODO(crbug.com/40631965): Does this need a more specific error?
     std::move(callback).Run(blink::mojom::ContentIndexError::STORAGE_ERROR);
     return;
   }

content/browser/cookie_store/cookie_store_manager.cc

@@ -639,10 +639,10 @@ void CookieStoreManager::OnCookieChange(const net::CookieChangeInfo& change) {
                 return;
               }
 
-              // TODO(crbug.com/1427879): Third-party partitioned workers should
-              // not have access to unpartitioned state when third-party cookie
-              // blocking is on.
-              // TODO(crbug.com/1427879): Should RSA grant unpartitioned cookie
+              // TODO(crbug.com/40063772): Third-party partitioned workers
+              // should not have access to unpartitioned state when third-party
+              // cookie blocking is on.
+              // TODO(crbug.com/40063772): Should RSA grant unpartitioned cookie
               // access?
 
               manager->DispatchChangeEvent(std::move(registration), change);

content/browser/cookie_store/cookie_store_manager_unittest.cc

@@ -1839,7 +1839,7 @@ TEST_F(CookieStoreManagerTest, UnTrustworthyOrigin) {
             bad_mesage_observer.WaitForBadMessage());
 }
 
-// TODO(crbug.com/1427879): Test that the worker still can access unpartitioned
+// TODO(crbug.com/40063772): Test that the worker still can access unpartitioned
 // cookies with third-party cookie blocking on.
 TEST_F(CookieStoreManagerTest, PartitionedWorker_FirstPartyPartition) {
   base::test::ScopedFeatureList feature_list;
@@ -1907,7 +1907,7 @@ TEST_F(CookieStoreManagerTest, PartitionedWorker_FirstPartyPartition) {
   EXPECT_EQ(0u, worker_test_helper_->changes().size());
 }
 
-// TODO(crbug.com/1427879): Test that the worker cannot access unpartitioned
+// TODO(crbug.com/40063772): Test that the worker cannot access unpartitioned
 // cookies with third-party cookie blocking on.
 TEST_P(CookieStoreManagerTest, PartitionedWorker_ThirdPartyPartition) {
   base::test::ScopedFeatureList feature_list;

content/browser/devtools/devtools_agent_host_impl.h

@@ -147,7 +147,7 @@ class CONTENT_EXPORT DevToolsAgentHostImpl : public DevToolsAgentHost {
 
   // Called when the corresponding renderer process notifies that the main
   // thread debugger is paused or resumed.
-  // TODO(https://crbug.com/1449114): Remove this method when we collect enough
+  // TODO(crbug.com/40269649): Remove this method when we collect enough
   // data to understand how likely that situation could happen.
   virtual void MainThreadDebuggerPaused();
   virtual void MainThreadDebuggerResumed();

content/browser/devtools/devtools_instrumentation.cc

@@ -1053,7 +1053,7 @@ void ThrottleServiceWorkerMainScriptFetch(
           ->GetDevToolsAgentHostForNewInstallingWorker(wrapper, version_id);
   DCHECK(agent_host);
 
-  // TODO(https://crbug.com/1467851): We should probably also add the
+  // TODO(crbug.com/40276949): We should probably also add the
   // possibility for Browser wide agents to throttle the request.
 
   // If we have a requesting_frame_id, we should have a frame and a frame tree

content/browser/devtools/devtools_session.cc

@@ -184,7 +184,7 @@ void DevToolsSession::AttachToAgent(blink::mojom::DevToolsAgent* agent,
     return;
   }
 
-  // TODO(https://crbug.com/978694): Consider a reset flow since new mojo types
+  // TODO(crbug.com/41467868): Consider a reset flow since new mojo types
   // checks is_bound strictly.
   if (receiver_.is_bound()) {
     receiver_.reset();

content/browser/devtools/devtools_url_loader_interceptor.cc

@@ -797,7 +797,7 @@ bool DevToolsURLLoaderInterceptor::CreateProxyForInterception(
       target_remote.InitWithNewPipeAndPassReceiver();
   mojo::PendingRemote<network::mojom::CookieManager> cookie_manager;
 
-  // TODO(https://crbug.com/1467851): Using 0 as the process id for navigations
+  // TODO(crbug.com/40276949): Using 0 as the process id for navigations
   // can lead to collisions between multiple navigations/service workers main
   // script fetch. It should be replaced by the more robust
   // GlobalRequestID::MakeBrowserInitiated().

content/browser/devtools/protocol/devtools_protocol_browsertest.cc

@@ -785,7 +785,7 @@ class CaptureScreenshotTest : public DevToolsProtocolTest {
 
 IN_PROC_BROWSER_TEST_F(CaptureScreenshotTest,
                        CaptureScreenshotBeyondViewport_OutOfView) {
-  // TODO(crbug.com/653637) This test fails consistently on low-end Android
+  // TODO(crbug.com/40488022) This test fails consistently on low-end Android
   // devices.
   if (base::SysInfo::IsLowEndDevice())
     return;
@@ -828,7 +828,7 @@ IN_PROC_BROWSER_TEST_F(CaptureScreenshotTest,
 
 IN_PROC_BROWSER_TEST_F(CaptureScreenshotTest,
                        CaptureScreenshotBeyondViewport_IFrame) {
-  // TODO(crbug.com/653637) This test fails consistently on low-end Android
+  // TODO(crbug.com/40488022) This test fails consistently on low-end Android
   // devices.
   if (base::SysInfo::IsLowEndDevice())
     return;
@@ -893,7 +893,7 @@ IN_PROC_BROWSER_TEST_F(CaptureScreenshotTest,
 IN_PROC_BROWSER_TEST_F(
     CaptureScreenshotTest,
     MAYBE_CaptureScreenshotBeyondViewport_InnerScrollbarsAreShown) {
-  // TODO(crbug.com/653637) This test fails consistently on low-end Android
+  // TODO(crbug.com/40488022) This test fails consistently on low-end Android
   // devices.
   if (base::SysInfo::IsLowEndDevice())
     return;
@@ -1344,7 +1344,7 @@ IN_PROC_BROWSER_TEST_F(CaptureScreenshotTest, TransparentScreenshotsFull) {
 // use of setDeviceMetricsOverride and setDefaultBackgroundColorOverride
 IN_PROC_BROWSER_TEST_F(CaptureScreenshotTest,
                        CaptureScreenshotBeyondViewport_Emulation) {
-  // TODO(crbug.com/653637) This test fails consistently on low-end Android
+  // TODO(crbug.com/40488022) This test fails consistently on low-end Android
   // devices.
   if (base::SysInfo::IsLowEndDevice())
     return;

content/browser/devtools/protocol/network_handler.cc

@@ -3646,11 +3646,11 @@ String NetworkHandler::BuildPrivateNetworkRequestPolicy(
     case network::mojom::PrivateNetworkRequestPolicy::kAllow:
       return protocol::Network::PrivateNetworkRequestPolicyEnum::Allow;
     case network::mojom::PrivateNetworkRequestPolicy::kBlock:
-      // TODO(https://crbug.com/1141824): Fix this.
+      // TODO(crbug.com/40154414): Fix this.
       return protocol::Network::PrivateNetworkRequestPolicyEnum::
           BlockFromInsecureToMorePrivate;
     case network::mojom::PrivateNetworkRequestPolicy::kWarn:
-      // TODO(https://crbug.com/1141824): Fix this.
+      // TODO(crbug.com/40154414): Fix this.
       return protocol::Network::PrivateNetworkRequestPolicyEnum::
           WarnFromInsecureToMorePrivate;
     case network::mojom::PrivateNetworkRequestPolicy::kPreflightBlock:

content/browser/devtools/protocol/preload_handler.cc

@@ -277,8 +277,8 @@ Preload::PrefetchStatus PrefetchStatusToProtocol(PrefetchStatus status) {
 
 bool PreloadingTriggeringOutcomeSupportedByPrefetch(
     PreloadingTriggeringOutcome feature) {
-  // TODO(crbug/1384419): revisit the unsupported cases call sites to make sure
-  // that either they are covered by other CDPs or they are included by the
+  // TODO(crbug.com/40246462): revisit the unsupported cases call sites to make
+  // sure that either they are covered by other CDPs or they are included by the
   // current CDPs in the future.
   switch (feature) {
     case PreloadingTriggeringOutcome::kRunning:
@@ -298,8 +298,8 @@ bool PreloadingTriggeringOutcomeSupportedByPrefetch(
 
 bool PreloadingTriggeringOutcomeSupportedByPrerender(
     PreloadingTriggeringOutcome feature) {
-  // TODO(crbug/1384419): revisit the unsupported cases call sites to make sure
-  // that either they are covered by other CDPs or they are included by the
+  // TODO(crbug.com/40246462): revisit the unsupported cases call sites to make
+  // sure that either they are covered by other CDPs or they are included by the
   // current CDPs in the future.
   switch (feature) {
     case PreloadingTriggeringOutcome::kRunning:
@@ -475,7 +475,7 @@ void PreloadHandler::SendInitialPreloadEnabledState() {
   auto* delegate = prefetch_service->GetPrefetchServiceDelegate();
   auto& config = PreloadingConfig::GetInstance();
 
-  // TODO(https://crbug.com/1384419): Add more grainularity to
+  // TODO(crbug.com/40246462): Add more grainularity to
   // PreloadingEligibility to distinguish PreloadHoldback and
   // DisabledByPreference for PreloadingEligibility::kPreloadingDisabled.
   // Use more general method to check status of Preloading instead of

content/browser/devtools/protocol/storage_handler.cc

@@ -284,7 +284,7 @@ class StorageHandler::IndexedDBObserver
     if (!owner_) {
       return;
     }
-    // TODO(crbug.com/1315371): Allow custom bucket names.
+    // TODO(crbug.com/40221733): Allow custom bucket names.
     auto found = storage_keys_.find(bucket_locator.storage_key);
     if (found == storage_keys_.end()) {
       return;
@@ -301,7 +301,7 @@ class StorageHandler::IndexedDBObserver
     if (!owner_) {
       return;
     }
-    // TODO(crbug.com/1315371): Allow custom bucket names.
+    // TODO(crbug.com/40221733): Allow custom bucket names.
     auto found = storage_keys_.find(bucket_locator.storage_key);
     if (found == storage_keys_.end()) {
       return;

content/browser/devtools/protocol/target_handler.h

@@ -134,7 +134,7 @@ class TargetHandler : public DevToolsDomainHandler,
 
   // Adds a ServiceWorker or DedicatedWorker throttle for an auto attaching
   // session. If none is known for this `agent_host`, is a no-op.
-  // TODO(crbug.com/1143100): support SharedWorker.
+  // TODO(crbug.com/40154954): support SharedWorker.
   void AddWorkerThrottle(DevToolsAgentHost* agent_host,
                          scoped_refptr<DevToolsThrottleHandle> throttle_handle);
 

content/browser/devtools/render_frame_devtools_agent_host.h

@@ -41,7 +41,7 @@ class CONTENT_EXPORT RenderFrameDevToolsAgentHost
       private RenderProcessHostObserver {
  public:
   // Returns true when DevTools was ever attached to any RenderFrameHost.
-  // TODO(https://crbug.com/1434900): Remove this method after the experiment
+  // TODO(crbug.com/40264958): Remove this method after the experiment
   // associated with the bug entry.
   static bool WasEverAttachedToAnyFrame();
 
@@ -185,7 +185,7 @@ class CONTENT_EXPORT RenderFrameDevToolsAgentHost
   bool render_frame_alive_ = false;
   bool render_frame_crashed_ = false;
 
-  // TODO(https://crbug.com/1449114): Remove these fields once we collect enough
+  // TODO(crbug.com/40269649): Remove these fields once we collect enough
   // data.
   bool is_debugger_paused_ = false;
   bool is_debugger_pause_situation_recorded_ = false;

content/browser/devtools/service_worker_devtools_agent_host.cc

@@ -384,7 +384,7 @@ ServiceWorkerDevToolsAgentHost::CreateNetworkFactoryParamsForDevTools() {
   RenderProcessHost* rph = RenderProcessHost::FromID(worker_process_id_);
   const url::Origin origin = url::Origin::Create(url_);
   const auto* version = context_wrapper_->GetLiveVersion(version_id_);
-  // TODO(crbug.com/1231019): make sure client_security_state is no longer
+  // TODO(crbug.com/40190528): make sure client_security_state is no longer
   // nullptr anywhere.
   auto factory = URLLoaderFactoryParamsHelper::CreateForWorker(
       rph, origin, version->key().ToPartialNetIsolationInfo(),

content/browser/devtools/shared_worker_devtools_agent_host.cc

@@ -92,7 +92,7 @@ bool SharedWorkerDevToolsAgentHost::AttachSession(DevToolsSession* session,
   session->CreateAndAddHandler<protocol::NetworkHandler>(
       GetId(), devtools_worker_token_, GetIOContext(),
       base::BindRepeating([] {}), session->GetClient());
-  // TODO(crbug.com/1143100): support pushing updated loader factories down to
+  // TODO(crbug.com/40154954): support pushing updated loader factories down to
   // renderer.
   session->CreateAndAddHandler<protocol::FetchHandler>(
       GetIOContext(),

content/browser/devtools/worker_or_worklet_devtools_agent_host.cc

@@ -29,7 +29,7 @@ WorkerOrWorkletDevToolsAgentHost::WorkerOrWorkletDevToolsAgentHost(
       name_(name),
       destroyed_callback_(std::move(destroyed_callback)) {
   DCHECK(!devtools_worker_token.is_empty());
-  // TODO(crbug.com/906991): Remove AddRef() and Release() once
+  // TODO(crbug.com/40093136): Remove AddRef() and Release() once
   // PlzDedicatedWorker is enabled and the code for non-PlzDedicatedWorker is
   // deleted. Worker agent hosts will be retained by the Worker DevTools manager
   // instead.

content/browser/dom_storage/dom_storage_context_wrapper.cc

@@ -254,7 +254,7 @@ void DOMStorageContextWrapper::OpenLocalStorage(
   DCHECK(local_storage_control_);
   local_storage_control_->BindStorageArea(storage_key, std::move(receiver));
   if (storage_policy_observer_) {
-    // TODO(https://crbug.com/1199077): Pass the real StorageKey when
+    // TODO(crbug.com/40177656): Pass the real StorageKey when
     // StoragePolicyObserver is converted.
     storage_policy_observer_->StartTrackingOrigin(storage_key.origin());
   }
@@ -433,7 +433,7 @@ void DOMStorageContextWrapper::OnStartupUsageRetrieved(
   for (const auto& info : usage) {
     origins.emplace_back(std::move(info->storage_key.origin()));
   }
-  // TODO(https://crbug.com/1199077): Pass the real StorageKey when
+  // TODO(crbug.com/40177656): Pass the real StorageKey when
   // StoragePolicyObserver is converted.
   storage_policy_observer_->StartTrackingOrigins(std::move(origins));
 }

content/browser/download/mhtml_generation_browsertest.cc

@@ -681,7 +681,7 @@ IN_PROC_BROWSER_TEST_P(MHTMLGenerationTest, GenerateMHTMLIgnoreNoStore) {
   EXPECT_THAT(mhtml, ContainsRegex("Content-Location:.*/nostore.html"));
 }
 
-// TODO(crbug.com/615291): These fail on Android under some circumstances.
+// TODO(crbug.com/40470937): These fail on Android under some circumstances.
 #if BUILDFLAG(IS_ANDROID)
 #define MAYBE_ViewedMHTMLContainsNoStoreContent \
   DISABLED_ViewedMHTMLContainsNoStoreContent

content/browser/download/mhtml_generation_manager.cc

@@ -221,7 +221,7 @@ class MHTMLGenerationManager::Job {
   // with on the fly hash computation.
   // Bound to the data pipe watcher and called upon notification of write
   // completion to producer pipe sent to the Renderer.
-  // TODO(https://crbug.com/915966): Eventually simplify this implementation
+  // TODO(crbug.com/40606905): Eventually simplify this implementation
   // with a DataPipeDrainer once error signalling is implemented there.
   void WriteMHTMLToDisk(MHTMLWriteCompleteCallback callback,
                         MojoResult result,
@@ -729,7 +729,7 @@ CloseFileResult MHTMLGenerationManager::Job::FinalizeOnFileThread(
                  "MHTMLGenerationManager::Job MHTML footer writing");
 
 #if BUILDFLAG(IS_FUCHSIA)
-    // TODO(crbug.com/1288816): Remove the Seek call.
+    // TODO(crbug.com/42050414): Remove the Seek call.
     // On fuchsia, fds do not share state. As the fd has been duped and sent to
     // the renderer process, it must be seeked to the end to ensure the data is
     // appended.

content/browser/fenced_frame/fenced_frame.cc

@@ -200,7 +200,7 @@ RenderFrameHostImpl* FencedFrame::GetProspectiveOuterDocument() {
 }
 
 FrameTree* FencedFrame::LoadingTree() {
-  // TODO(crbug.com/1232528): Consider and fix the case when fenced frames are
+  // TODO(crbug.com/40191159): Consider and fix the case when fenced frames are
   // being prerendered.
   return web_contents_->LoadingTree();
 }
@@ -244,7 +244,7 @@ FencedFrame::InitInnerFrameTreeAndReturnProxyToOuterFrameTree(
   // See `RenderFrameHostImpl::CreateRenderFrame`.
   frame_tree_->root()->SetPendingFramePolicy(frame_policy);
 
-  // TODO(crbug.com/1199679): This should be moved to FrameTree::Init.
+  // TODO(crbug.com/40177940): This should be moved to FrameTree::Init.
   web_contents_->NotifySwappedFromRenderManager(
       /*old_frame=*/nullptr,
       frame_tree_->root()->render_manager()->current_frame_host());
@@ -343,7 +343,7 @@ void FencedFrame::DidChangeFramePolicy(const blink::FramePolicy& frame_policy) {
   // Observe that the sandbox flags sent from the renderer are currently
   // ignored. The `sandbox` attribute on `HTMLFencedFrameElement` may only
   // cause embedder-initiated navigations to fail for now---in the renderer.
-  // TODO(crbug.com/1347953): Handle sandbox flags for fenced frames properly
+  // TODO(crbug.com/40233168): Handle sandbox flags for fenced frames properly
   // in the browser, allowing us to use non-fixed sets of sandbox flags.
   inner_root->SetPendingFramePolicy(blink::FramePolicy(
       current_frame_policy.sandbox_flags, frame_policy.container_policy,

content/browser/fenced_frame/fenced_frame_browsertest.cc

@@ -161,7 +161,7 @@ class FencedFrameMPArchBrowserTest : public FencedFrameBrowserTestBase {
  protected:
   FencedFrameMPArchBrowserTest() = default;
 
-  // TODO(crbug.com/1491942): This fails with the field trial testing config.
+  // TODO(crbug.com/40285326): This fails with the field trial testing config.
   void SetUpCommandLine(base::CommandLine* command_line) override {
     FencedFrameBrowserTestBase::SetUpCommandLine(command_line);
     command_line->AppendSwitch("disable-field-trial-config");
@@ -3083,7 +3083,7 @@ IN_PROC_BROWSER_TEST_F(FencedFrameParameterizedBrowserTest,
 // Both the nested urn iframe in the middle and the iframe in the bottom should
 // be able to access the same cookies as the top-level fenced frame because they
 // operate on the same partition nonce.
-// TODO(crbug.com/1355857): Once navigation support for urn::uuid in iframes is
+// TODO(crbug.com/40060657): Once navigation support for urn::uuid in iframes is
 // deprecated, this test should be removed.
 IN_PROC_BROWSER_TEST_F(
     FencedFrameParameterizedBrowserTest,
@@ -4975,7 +4975,7 @@ IN_PROC_BROWSER_TEST_F(FencedFrameParameterizedBrowserTest,
 // Note: Outside tests, one common scenairo that results in the same setup is
 // creating a shared storage urn iframe nested inside a default fenced frame.
 //
-// TODO(crbug.com/1355857): Once navigation support for urn::uuid in iframes is
+// TODO(crbug.com/40060657): Once navigation support for urn::uuid in iframes is
 // deprecated, this test should be removed.
 IN_PROC_BROWSER_TEST_F(FencedFrameParameterizedBrowserTest,
                        NestedUrnIframeUnderFencedFrameUnfencedTopNavigation) {
@@ -5414,7 +5414,7 @@ IN_PROC_BROWSER_TEST_F(FencedFrameParameterizedBrowserTest,
 class FencedFrameReportEventBrowserTest
     : public FencedFrameParameterizedBrowserTest {
  public:
-  // TODO(crbug.com/1123606): Disable window.fence.reportEvent in iframes.
+  // TODO(crbug.com/40053214): Disable window.fence.reportEvent in iframes.
   // Remove this constructor and `scoped_feature_list_` once FLEDGE stops
   // supporting iframes.
   // Mode A/B is disabled to be able to test cross-origin reporting beacons.
@@ -5624,7 +5624,7 @@ class FencedFrameReportEventBrowserTest
 
     // Set up the document.cookie. We will later verify that this is not sent
     // with the reportEvent() beacon.
-    // TODO(crbug.com/1496395): Remove this block after 3PCD.
+    // TODO(crbug.com/40286778): Remove this block after 3PCD.
     GURL reporting_cookie_url =
         https_server()->GetURL(reporting_origin, "/hello.html");
     EXPECT_TRUE(NavigateToURL(shell(), reporting_cookie_url));
@@ -5869,7 +5869,7 @@ class FencedFrameReportEventBrowserTest
                                       "Attribution-Reporting-Support"));
         }
 
-        // TODO(crbug.com/1496395): Remove this check after 3PCD.
+        // TODO(crbug.com/40286778): Remove this check after 3PCD.
         EXPECT_EQ(0U, response.http_request()->headers.count("Cookie"));
         response.Done();
         ++response_index;
@@ -6461,7 +6461,7 @@ IN_PROC_BROWSER_TEST_F(
 // Tests that an iframe with a urn:uuid commits the navigation with the
 // associated reporting metadata and `fence.reportEvent` sends the beacon to
 // the registered reporting url.
-// TODO(crbug.com/1123606): Disable window.fence.reportEvent in iframes.
+// TODO(crbug.com/40053214): Disable window.fence.reportEvent in iframes.
 // Remove this test once the FLEDGE origin trial stops supporting iframes.
 IN_PROC_BROWSER_TEST_F(FencedFrameReportEventBrowserTest,
                        IframeReportingMetadata) {
@@ -6938,7 +6938,7 @@ IN_PROC_BROWSER_TEST_F(FencedFrameReportEventBrowserTest,
 // See test `ReportEventNotAllowedInNestedIframeUnderAdComponent` in
 // `InterestGroupAdComponentAutomaticBeaconBrowserTest`.
 //
-// TODO(crbug.com/1355857): Once navigation support for urn::uuid in iframes is
+// TODO(crbug.com/40060657): Once navigation support for urn::uuid in iframes is
 // deprecated, this test should be removed.
 IN_PROC_BROWSER_TEST_F(FencedFrameReportEventBrowserTest,
                        GetFencedFramePropertiesShouldTraverseFrameTree) {
@@ -7495,7 +7495,7 @@ IN_PROC_BROWSER_TEST_P(UUIDFrameTreeBrowserTest,
     // `kDisplayWarningDeprecateURNIframesUseFencedFrames` is enabled. This will
     // be removed once navigation support for urn::uuid in iframes is
     // deprecated.
-    // TODO(crbug.com/1355857)
+    // TODO(crbug.com/40060657)
 
     if (DisplayWarningDeprecateURNIframesUseFencedFrames()) {
       ASSERT_TRUE(console_observer.Wait());
@@ -7630,7 +7630,7 @@ class FencedFrameAutomaticBeaconBrowserTest
     bool expected_data = true;
 
     // Whether we expect cookie data to be attached to the beacon.
-    // TODO(crbug.com/1496395): Remove this after 3PCD.
+    // TODO(crbug.com/40286778): Remove this after 3PCD.
     bool expected_cookie = true;
 
     // Whether a fenced frame should call window.fence.disableUntrustedNetwork()
@@ -7884,7 +7884,7 @@ class FencedFrameAutomaticBeaconBrowserTest
     }
 
     // Set up the document.cookie for credentialed automatic beacons.
-    // TODO(crbug.com/1496395): Remove this block after 3PCD.
+    // TODO(crbug.com/40286778): Remove this block after 3PCD.
     GURL reporting_cookie_url =
         https_server()->GetURL(reporting_origin, "/hello.html");
     if (config.expected_success) {
@@ -7963,7 +7963,7 @@ class FencedFrameAutomaticBeaconBrowserTest
         /*os_expected=*/false);
 
     // Verify the request has credentials attached.
-    // TODO(crbug.com/1496395): Remove this block after 3PCD.
+    // TODO(crbug.com/40286778): Remove this block after 3PCD.
     if (config.expected_cookie) {
       EXPECT_EQ("name=foobarbaz",
                 response.http_request()->headers.at("Cookie"));

content/browser/fenced_frame/fenced_frame_config.h

@@ -228,7 +228,7 @@ enum class DisableUntrustedNetworkStatus {
 //
 // Config-generating APIs like Protected Audience's runAdAuction and
 // sharedStorage's selectURL return urns as handles to `FencedFrameConfig`s.
-// TODO(crbug.com/1417871): Use a single constructor that requires values to be
+// TODO(crbug.com/40257432): Use a single constructor that requires values to be
 // specified for all fields, to ensure none are accidentally omitted.
 class CONTENT_EXPORT FencedFrameConfig {
  public:
@@ -269,7 +269,7 @@ class CONTENT_EXPORT FencedFrameConfig {
   }
 
   // Add a permission to the FencedFrameConfig.
-  // TODO(crbug.com/1347953): Refactor and expand use of test utils so there is
+  // TODO(crbug.com/40233168): Refactor and expand use of test utils so there is
   // a consistent way to do this properly everywhere.
   void AddEffectiveEnabledPermissionForTesting(
       blink::mojom::PermissionsPolicyFeature feature) {
@@ -334,9 +334,9 @@ class CONTENT_EXPORT FencedFrameConfig {
   scoped_refptr<FencedFrameReporter> fenced_frame_reporter_;
 
   // The mode for the resulting fenced frame: `kDefault` or `kOpaqueAds`.
-  // TODO(crbug.com/1347953): This field is currently unused. Replace the
+  // TODO(crbug.com/40233168): This field is currently unused. Replace the
   // `mode` attribute of HTMLFencedFrameElement with this field in the config.
-  // TODO(crbug.com/1347953): Decompose this field into flags that directly
+  // TODO(crbug.com/40233168): Decompose this field into flags that directly
   // control the behavior of the frame, e.g. sandbox flags. We do not want
   // mode to exist as a concept going forward.
   DeprecatedFencedFrameMode mode_ = DeprecatedFencedFrameMode::kDefault;
@@ -470,7 +470,7 @@ class CONTENT_EXPORT FencedFrameProperties {
 
   // Used to store the shared storage context passed from the embedder
   // (navigation initiator)'s renderer into the new FencedFrameProperties.
-  // TODO(crbug.com/1417871): Refactor this to be part of the
+  // TODO(crbug.com/40257432): Refactor this to be part of the
   // FencedFrameProperties constructor rather than
   // OnFencedFrameURLMappingComplete.
   void SetEmbedderSharedStorageContext(
@@ -500,7 +500,7 @@ class CONTENT_EXPORT FencedFrameProperties {
 
   // Used for urn iframes, which should not have a separate storage/network
   // partition or access to window.fence.disableUntrustedNetwork().
-  // TODO(crbug.com/1417871): Refactor this to be part of the
+  // TODO(crbug.com/40257432): Refactor this to be part of the
   // FencedFrameProperties constructor rather than
   // OnFencedFrameURLMappingComplete.
   void AdjustPropertiesForUrnIframe() {
@@ -522,7 +522,7 @@ class CONTENT_EXPORT FencedFrameProperties {
   }
 
   // Set the current FencedFrameProperties to have "opaque ads mode".
-  // TODO(crbug.com/1347953): Refactor and expand use of test utils so there is
+  // TODO(crbug.com/40233168): Refactor and expand use of test utils so there is
   // a consistent way to do this properly everywhere. Consider removing
   // arbitrary restrictions in "default mode" so that using opaque ads mode is
   // less necessary.
@@ -580,7 +580,7 @@ class CONTENT_EXPORT FencedFrameProperties {
 
   std::optional<FencedFrameProperty<gfx::Size>> container_size_;
 
-  // TODO(crbug.com/1420638): The representation of size in fenced frame config
+  // TODO(crbug.com/40258855): The representation of size in fenced frame config
   // will need to work with the size carried with the winning bid.
   std::optional<FencedFrameProperty<gfx::Size>> content_size_;
 
@@ -668,7 +668,7 @@ class CONTENT_EXPORT FencedFrameProperties {
   // (and then access to unpartitioned storage).
   // Currently true in all fenced frame configs, but set to false if loaded in a
   // urn iframe.
-  // TODO(crbug.com/1415475): Remove this when urn iframes are removed.
+  // TODO(crbug.com/40256574): Remove this when urn iframes are removed.
   bool can_disable_untrusted_network_ = true;
 
   // Tracks the status of disabling untrusted network in this fenced frame. This

content/browser/fenced_frame/fenced_frame_reporter.cc

@@ -662,7 +662,7 @@ bool FencedFrameReporter::SendReportInternal(
   // Allow cookies on automatic beacons while third party cookies are enabled
   // to help with adoption/debugging.
   // (https://github.com/WICG/turtledove/issues/866)
-  // TODO(crbug.com/1496395): After 3PCD, this will be dead code and should be
+  // TODO(crbug.com/40286778): After 3PCD, this will be dead code and should be
   // removed.
   if (base::FeatureList::IsEnabled(
           blink::features::kFencedFramesAutomaticBeaconCredentials) &&

content/browser/fenced_frame/fenced_frame_url_mapping.cc

@@ -58,7 +58,7 @@ gfx::Size AdSizeToGfxSize(const blink::AdSize& ad_size) {
   return gfx::Size(width_in_pixels, height_in_pixels);
 }
 
-// TODO(crbug.com/1420638): Once the representation of size in fenced frame
+// TODO(crbug.com/40258855): Once the representation of size in fenced frame
 // config is finalized, change the type of substituted width and height to the
 // same.
 // Substitute the size macros in ad url with the size from the winning bid.
@@ -117,7 +117,7 @@ void FencedFrameURLMapping::ImportPendingAdComponents(
     // navigated. In urn iframes, the Page is rooted at the top-level frame, so
     // the same FencedFrameURLMapping exists after "urn iframe root"
     // navigations.
-    // TODO(crbug.com/1415475): Change this to a CHECK when we remove urn
+    // TODO(crbug.com/40256574): Change this to a CHECK when we remove urn
     // iframes.
     if (IsMapped(component_ad.first)) {
       return;
@@ -209,7 +209,7 @@ FencedFrameURLMapping::AssignFencedFrameURLAndInterestGroupInfo(
   auto& config = urn_uuid_to_url_map_[urn_uuid];
 
   // Assign mapped URL and interest group info.
-  // TODO(crbug.com/1420638): Once the representation of size in fenced frame
+  // TODO(crbug.com/40258855): Once the representation of size in fenced frame
   // config is finalized, pass the ad size from the winning bid to its fenced
   // frame config.
   config.urn_uuid_.emplace(urn_uuid);
@@ -254,7 +254,7 @@ FencedFrameURLMapping::AssignFencedFrameURLAndInterestGroupInfo(
     // frame is reused. The pointer to its parent's fenced frame reporter is
     // copied to each ad component. This has the advantage that we do not need
     // to traverse to its parent every time we need its parent's reporter.
-    // TODO(crbug.com/1420638): Once the representation of size in fenced frame
+    // TODO(crbug.com/40258855): Once the representation of size in fenced frame
     // config is finalized, pass the ad component size from the winning bid to
     // its fenced frame config.
     if (ad_component_descriptor.size) {
@@ -359,7 +359,7 @@ FencedFrameURLMapping::OnSharedStorageURNMappingResultDetermined(
   // Only if the resolved URL is fenced-frame-compatible do we:
   //   1.) Add it to `urn_uuid_to_url_map_`
   //   2.) Report it back to any already-queued observers
-  // TODO(crbug.com/1318970): Simplify this by making Shared Storage only
+  // TODO(crbug.com/40223071): Simplify this by making Shared Storage only
   // capable of producing URLs that fenced frames can navigate to.
   if (blink::IsValidFencedFrameURL(mapping_result.mapped_url)) {
     config = FencedFrameConfig(urn_uuid, mapping_result.mapped_url,

content/browser/fenced_frame/fenced_frame_url_mapping_unittest.cc

@@ -38,7 +38,7 @@ namespace {
 // `expected_mapped_ad_descriptors` contains the URLs the first URNs are
 // expected to map to, and will be padded with "about:blank" URLs until it's
 // blink::MaxAdAuctionAdComponents() in length.
-// TODO(crbug.com/1262022): the ShadowDOM implementation is deprecated, and
+// TODO(crbug.com/40202462): the ShadowDOM implementation is deprecated, and
 // these tests should be cleaned up to only reflect MPArch behavior.
 void ValidatePendingAdComponentsMap(
     FencedFrameURLMapping* fenced_frame_url_mapping,

content/browser/field_trial_synchronizer.cc

@@ -40,7 +40,7 @@ void NotifyAllRenderersOfFieldTrial(const std::string& field_trial_name,
   // Low anonymity or overridden field trials must not be written to persistent
   // data, otherwise they might end up being logged in metrics.
   //
-  // TODO(crbug.com/1431156): split this out into a separate class that
+  // TODO(crbug.com/40263398): split this out into a separate class that
   // registers using |FieldTrialList::AddObserver()| (and so doesn't get told
   // about low anonymity trials at all).
   if (!is_low_anonymity) {
@@ -77,7 +77,7 @@ void FieldTrialSynchronizer::CreateInstance() {
 }
 
 FieldTrialSynchronizer::FieldTrialSynchronizer() {
-  // TODO(crbug.com/1431156): consider whether there is a need to exclude low
+  // TODO(crbug.com/40263398): consider whether there is a need to exclude low
   // anonymity field trials from non-browser processes (or to plumb through the
   // anonymity property for more fine-grained access).
   bool success = base::FieldTrialListIncludingLowAnonymity::AddObserver(this);

content/browser/file_system/file_system_url_loader_factory.h

@@ -36,7 +36,7 @@ class RenderFrameHost;
 //   the frame: that renderer process's ID.
 // - For a factory created for a browser-initiated worker main script request:
 //   the ID of the process the worker will run in.
-//   TODO(https://crbug.com/986188): We should specify kInvalidUniqueID for this
+//   TODO(crbug.com/41471904): We should specify kInvalidUniqueID for this
 //   worker main script case like the browser-initiated navigation case.
 // - For a factory created to pass to the renderer for subresource requests from
 //   the worker: that renderer process's ID.

content/browser/file_system_access/features.cc

@@ -17,7 +17,7 @@ BASE_FEATURE(kFileSystemAccessBFCache,
              "FileSystemAccessBFCache",
              base::FEATURE_ENABLED_BY_DEFAULT);
 
-// TODO(crbug.com/1370433): Remove this flag eventually.
+// TODO(crbug.com/40061211): Remove this flag eventually.
 // When enabled, drag-and-dropped files and directories will be checked against
 // the File System Access blocklist. This feature was disabled since it broke
 // some applications.