[Google import] Add resilience to download data

injected/src/features/autofill-import.js

@@ -590,11 +590,20 @@ export default class AutofillImport extends ActionExecutorBase {
 
     /** Bookmark import code */
     async downloadData() {
-        // sleep for a second, sometimes download link is not yet available
-        await new Promise((resolve) => setTimeout(resolve, 1000));
+        const userIdElement = await this.runWithRetry(() => document.querySelector(this.bookmarkImportSelectorSettings.userIdLink));
+        const userId = userIdElement?.getAttribute('href')?.split('&user=')[1];
+
+        // Poll forever until the download link is available,
+        // Android is the one that timesout anyway and closes the whole tab if this doesn't complete
+        const downloadRetryLimit = this.getFeatureSetting('downloadRetryLimit') ?? Infinity;
+        const downloadRetryInterval = this.getFeatureSetting('downloadRetryInterval') ?? 1000;
+        await this.runWithRetry(
+            () => document.querySelector(`a[href="./manage/archive/${this.#exportId}"]`),
+            downloadRetryLimit,
+            downloadRetryInterval,
+            'linear',
+        );
 
-        const userId = document.querySelector(this.bookmarkImportSelectorSettings.userIdLink)?.getAttribute('href')?.split('&user=')[1];
-        await this.runWithRetry(() => document.querySelector(`a[href="./manage/archive/${this.#exportId}"]`), 15, 2000, 'linear');
         if (userId != null && this.#exportId != null) {
             const downloadURL = `${TAKEOUT_DOWNLOAD_URL_BASE}?j=${this.#exportId}&i=0&user=${userId}`;
             window.location.href = downloadURL;