Address bot comment, fix failing tests

Author: laghee

injected/integration-test/page-objects/results-collector.js

@@ -234,10 +234,6 @@ export class ResultsCollector {
             windows: () => wrapWindowsScripts,
         });
 
-        // Extract trackerData from config settings for tracker-protection tests
-        // trackerData must be an object (not a JSON string)
-        const trackerDataFromConfig = config?.features?.trackerProtection?.settings?.trackerData;
-
         // read the built file from disk and do replacements
         const injectedJS = wrapFn(this.build.artifact, {
             $CONTENT_SCOPE$: config,
@@ -250,8 +246,6 @@ export class ResultsCollector {
                 javascriptInterface: this.messagingContextName,
                 messagingContextName: this.messagingContextName,
                 locale,
-                // trackerData from config as default; explicit #userPreferences.trackerData wins
-                ...(trackerDataFromConfig && { trackerData: trackerDataFromConfig }),
                 ...this.#userPreferences,
             },
         });

injected/src/config-feature.js

@@ -70,6 +70,7 @@ export default class ConfigFeature {
      *   messagingConfig?: import('@duckduckgo/messaging').MessagingConfig,
      *   messagingContextName: string,
      *   currentCohorts?: Array<{feature: string, cohort: string, subfeature: string}>,
+     *   trackerData?: import('./features/tracker-protection/tracker-resolver.js').TrackerData,
      * } | null}
      */
     #args;

injected/src/content-scope-features.js

@@ -38,7 +38,7 @@ const isHTMLDocument =
  * @property {Record<string, unknown>} [featureSettings]
  * @property {import('./content-feature.js').AssetConfig} [assets]
  * @property {Record<string, string[]>} [stringExemptionLists]
- * @property {{trackers: Record<string, unknown>, entities: Record<string, unknown>, domains: Record<string, string>, cnames?: Record<string, string>}} [trackerData]
+ * @property {import('./features/tracker-protection/tracker-resolver.js').TrackerData} [trackerData]
  */
 
 /**

injected/src/features/tracker-protection.js

@@ -29,11 +29,12 @@ function getTabURL() {
         framingOrigin = globalThis.top?.location.href;
     } catch {
         framingOrigin = globalThis.document.referrer;
-    }
 
-    // ancestorOrigins gives us the actual top frame URL in cross-origin iframes
-    if ('ancestorOrigins' in globalThis.location && globalThis.location.ancestorOrigins.length) {
-        framingOrigin = globalThis.location.ancestorOrigins.item(globalThis.location.ancestorOrigins.length - 1);
+        // ancestorOrigins only needed as fallback when top.location.href is inaccessible (e.g., cross-origin iframe).
+        // Avoid overriding full top-level URL when we already have it.
+        if ('ancestorOrigins' in globalThis.location && globalThis.location.ancestorOrigins.length) {
+            framingOrigin = globalThis.location.ancestorOrigins.item(globalThis.location.ancestorOrigins.length - 1);
+        }
     }
 
     try {