BB/TB 43416: Rebased onto 135.0a1

Merge Info

Issues

Resolves

• #43416 (closed)
• mullvad-browser#xxxxx
• tor-browser-build#xxxxx

Related

• tor-browser#xxxxx
• mullvad-browser#xxxxx
• tor-browser-build#xxxxx

Merging

Target Branches

• tor-browser - !fixups to tor-browser-specific commits, new features, security backports
• base-browser and mullvad-browser - !fixups to base-browser-specific commits, new features to be shared with mullvad-browser, and security backports
  • ⚠️ IMPORTANT: Please list the base-browser-specific commits which need to be cherry-picked to the base-browser and mullvad-browser branches here

Target Channels

• Alpha: esr128-14.5
• Stable: esr128-14.0
• Legacy: esr115-13.5

Backporting

Timeline

• No Backport (preferred): patchset for the next major stable
• Immediate: patchset needed as soon as possible (fixes CVEs, 0-days, etc)
• Next Minor Stable Release: patchset that needs to be verified in nightly before backport
• Eventually: patchset that needs to be verified in alpha before backport

(Optional) Justification

• Security update: patchset contains a security fix (be sure to select the correct item in Timeline)
• Censorship event: patchset enables censorship circumvention
• Critical bug-fix: patchset fixes a bug in core-functionality
• Consistency: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc
• Sponsor required: patchset required for sponsor
• Localization: typos and other localization changes that should be also in the release branch
• Other: please explain

Upstream

• Patchset is a candidate for uplift to Firefox
• Patchset is a backport from Firefox
  • Bugzilla link:
  • Upstream commit:

Issue Tracking

• Link resolved issues with appropriate Release Prep issue for changelog generation

Review

Request Reviewer

• Request review from an applications developer depending on modified system:
  • NOTE: if the MR modifies multiple areas, please /cc all the relevant reviewers (since Gitlab only allows 1 reviewer)
  • accessibility : henry
  • android : clairehurst, dan
  • build system : boklm
  • ci/cd: brizental, henry
  • extensions : ma1
  • firefox internals (XUL/JS/XPCOM) : jwilde, ma1
  • fonts : pierov
  • frontend (implementation) : henry
  • frontend (review) : donuts, morgan
  • localization : henry, pierov
  • macOS : clairehurst, dan
  • nightly builds : boklm
  • rebases/release-prep : brizental, clairehurst, dan, ma1, pierov, morgan
  • security : jwilde, ma1
  • signing : boklm, morgan
  • updater : pierov
  • windows : jwilde, morgan
  • misc/other : pierov, morgan

Change Description

• 761d358a... BB 42831: Remove the shopping components.
  • browser/base/content/browser-init.js: ShoppingSidebarManager.ensureInitialized is now called behind a pref, so I didn't remove it, and we can probably just define the pref instead (even though it's false by default) Eventually I removed it because it created problems with the UI. Since we remove the files, I think it's okay to remove also this hunk, but we can check later.
  • Removed also the ReviewChecker actor, as it seems related to this shopping stuff we don't want
  • TODO: probably, set the browser.shopping.experience2023.integratedSidebar pref to false.
  • TODO: check the new ReviewChecker actor in BrowserGlue.sys.mjs.
• 1dced932... BB 42037: Disable about:firefoxview page
  • browser/themes/shared/tabbrowser/tabs.css: #wrapper-firefox-view-button has gone from the second block in Bug 1850758 (eb59529d)
  • TODO: Check the comment about merge conflicts, since the mentioned bugs have been closed (open an audit issue)
• 9b20817c... BB 9173: Change the default Firefox profile directory to be relative.
  • toolkit/xre/nsXREDirProvider.cpp: upstream removed the definition of nsresult rv;. So, I preferred moving our code that used it in its own block.
• 996631bb... BB 4234: Use the Firefox Update Process for Base Browser.
  • toolkit/mozapps/update/updater/updater.cpp: bool isElevated in NS_main now has some additional stuff for Windows
  • toolkit/xre/nsUpdateDriver.cpp: why were we removing the code that checks for mozilla::widget::WinUtils::HasPackageIdentity(), rather than using #else? I restored it, and added back the WinUtils.h header.
• aff60a0f... Customize moz-toggle for tor-browser.
  • toolkit/content/widgets/moz-toggle/moz-toggle.mjs: MozToggle now extends MozBaseInputElement. Some properties are gone.
  • FIXME: I had to drop the changes in render(), as they were not trivial. I prefer to get these restored with a proper MR.
  • TODO: check Bug 1917305.
• ebdf8130... TB 13252: Customize profile management on macOS
  • toolkit/xre/nsXREDirProvider.cpp: deferred the definition of nsresult rv;, so I moved one of our hunks in its own block
• 453ebf67... TB 42891: Set the bundled search engine for Tor Browser.
  • toolkit/components/search/AppProvidedSearchEngine.sys.mjs: this.#iconList has been renamed to this.#iconMap. I renamed the variable without checking too carefully
  • TODO: Check that icons are still fetched correctly
• 257257b8... [android] Disable features and functionality
  • mobile/android/fenix/app/src/main/AndroidManifest.xml: com.google.android.gms.permission.AD_ID was removed in Bug 1910764 (29974353)
  • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt: the telemetryEnabled variable was removed upstream, I replaced it with a call
  • mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/metrics/MetricsUtilsTest.kt: we remove some tests, that have changed upstream. I just kept removing them.
  • TODO: Create an audit issue to check AD_ID hasn't actually moved elsewhere (doesn't seem like, from the commit)
• b2baa95b... [android] Rename as Tor Browser
  • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt: the splash screen was refactored in Bug 1929187 (72a56eae).
  • TODO: Audit, and update the patch if necessary. I think the main problem was FxNimubs?
• 6507104e... TB 40185: [android] Use NimbusDisabled
  • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt: Glean.applyServerKnobsConfig was removed as a part of a delayed initialization refactor in Bug 1933232 (9a550f3b)
  • TODO: Audit, and find if we have to disable it another way.
• 6fd69112... TB 41878: [android] Add standalone Tor Bootstrap
  • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt: now the if has only the if (!shouldShowOnboarding) part. I assume shouldShowOnboarding has the correct value, so I dropped our change there.
  • TODO: also part of the splash screen logic refactor mentioned above (Bug 1929187, 72a56eae)

How Tested

Range-diff and diff of diffs.