feat: close tab when back button is pressed and history is empty and bring up the home page

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

.cron.yml

@@ -11,30 +11,29 @@ jobs:
           target-tasks-method: nightly
       when:
           - {hour: 5, minute: 0}
-    # This is a temporary hook in order to not overload Google Play.
-    # See bug 1628413 for more context.
-    - name: nightly-on-google-play
+          - {hour: 17, minute: 0}
+    - name: nightly-test
       job:
           type: decision-task
-          treeherder-symbol: Nd-gp
-          target-tasks-method: nightly-on-google-play
+          treeherder-symbol: Nt
+          target-tasks-method: nightly-test
       when:
-          - {hour: 17, minute: 0}
+        - {hour: 5, minute: 0}
     - name: fennec-production
       job:
           type: decision-task
           treeherder-symbol: fennec-production
           target-tasks-method: fennec-production
       when: []  # Force hook only
-    - name: bump-android-components
-      job:
-          type: decision-task
-          treeherder-symbol: bump-ac
-          target-tasks-method: bump_android_components
-      when: [{hour: 15, minute: 30}]
     - name: screenshots
       job:
           type: decision-task
           treeherder-symbol: screenshots-D
           target-tasks-method: screenshots
       when: [{weekday: 'Monday', hour: 10, minute: 0}]
+    - name: legacy-api-ui-tests
+      job:
+          type: decision-task
+          treeherder-symbol: legacy-api-ui
+          target-tasks-method: legacy_api_ui_tests
+      when: [] # temporarily unscheduled

.editorconfig

@@ -1,4 +1,6 @@
 [*.{kt,kts}]
-# Disabling rules that were added in the latest versions of ktlint
-# tracking here: https://github.com/mozilla-mobile/fenix/issues/4861
-disabled_rules=import-ordering
+ij_kotlin_allow_trailing_comma_on_call_site=true
+ij_kotlin_allow_trailing_comma=true
+
+[*]
+insert_final_newline = true

.experimenter.yaml

@@ -0,0 +1,108 @@
+---
+cookie-banners:
+  description: Features for cookie banner handling.
+  hasExposure: true
+  exposureDescription: ""
+  variables:
+    sections-enabled:
+      type: json
+      description: This property provides a lookup table of whether or not the given section should be enabled.
+growth-data:
+  description: A feature measuring campaign growth data
+  hasExposure: true
+  exposureDescription: ""
+  variables:
+    enabled:
+      type: boolean
+      description: "If true, the feature is active"
+homescreen:
+  description: The homescreen that the user goes to when they press home or new tab.
+  hasExposure: true
+  exposureDescription: ""
+  variables:
+    sections-enabled:
+      type: json
+      description: "This property provides a lookup table of whether or not the given section should be enabled. If the section is enabled, it should be toggleable in the settings screen, and on by default."
+messaging:
+  description: "Configuration for the messaging system.\n\nIn practice this is a set of growable lookup tables for the\nmessage controller to piece together.\n"
+  hasExposure: true
+  exposureDescription: ""
+  variables:
+    actions:
+      type: json
+      description: A growable map of action URLs.
+    message-under-experiment:
+      type: string
+      description: Id or prefix of the message under experiment.
+    messages:
+      type: json
+      description: A growable collection of messages
+    notification-config:
+      type: json
+      description: Configuration of the notification worker for all notification messages.
+    on-control:
+      type: string
+      description: What should be displayed when a control message is selected.
+      enum:
+        - show-next-message
+        - show-none
+    styles:
+      type: json
+      description: "A map of styles to configure message appearance.\n"
+    triggers:
+      type: json
+      description: "A collection of out the box trigger expressions. Each entry maps to a valid JEXL expression.\n"
+mr2022:
+  description: Features for MR 2022.
+  hasExposure: true
+  exposureDescription: ""
+  variables:
+    sections-enabled:
+      type: json
+      description: This property provides a lookup table of whether or not the given section should be enabled.
+nimbus-validation:
+  description: A feature that does not correspond to an application feature suitable for showing that Nimbus is working. This should never be used in production.
+  hasExposure: true
+  exposureDescription: ""
+  variables:
+    settings-icon:
+      type: string
+      description: The drawable displayed in the app menu for Settings
+    settings-punctuation:
+      type: string
+      description: The emoji displayed in the Settings screen title.
+    settings-title:
+      type: string
+      description: The title of displayed in the Settings screen and app menu.
+pre-permission-notification-prompt:
+  description: A feature that shows the pre-permission notification prompt.
+  hasExposure: true
+  exposureDescription: ""
+  variables:
+    enabled:
+      type: boolean
+      description: "if true, the pre-permission notification prompt is shown to the user."
+re-engagement-notification:
+  description: A feature that shows the re-enagement notification if the user is inactive.
+  hasExposure: true
+  exposureDescription: ""
+  variables:
+    enabled:
+      type: boolean
+      description: "If true, the re-engagement notification is shown to the inactive user."
+search-term-groups:
+  description: A feature allowing the grouping of URLs around the search term that it came from.
+  hasExposure: true
+  exposureDescription: ""
+  variables:
+    enabled:
+      type: boolean
+      description: "If true, the feature shows up on the homescreen and on the new tab screen."
+unified-search:
+  description: A feature allowing user to easily search for specified results directly in the search bar.
+  hasExposure: true
+  exposureDescription: ""
+  variables:
+    enabled:
+      type: boolean
+      description: "If true, the feature shows up in the search bar."

.git-blame-ignore-revs

@@ -0,0 +1,5 @@
+# .git-blame-ignore-revs
+# For #27667 - Remove import-ordering from the list of disabled ktlint rules (#27680)
+9654b4dfb122b54b04369fe80a2f9c95811478e8
+# For #26844: Fix ktlint issues and remove them from baseline. (#26901)
+ffcef5ff2e3f78b6972dd16551f3f653b7035ccc

.github/CODEOWNERS

@@ -26,35 +26,6 @@
 * @mozilla-mobile/ACT @mozilla-mobile/fenix
 /.cron.yml @mozilla-mobile/releng @mozilla-mobile/fenix
 /.taskcluster.yml @mozilla-mobile/releng @mozilla-mobile/fenix
-/automation/ @mozilla-mobile/releng @mozilla-mobile/fenix
+/automation/ @mozilla-mobile/fenix
 /taskcluster/ @mozilla-mobile/releng @mozilla-mobile/fenix
-/.github/ @mozilla-mobile/releng @mozilla-mobile/fenix
-
-# --- PERFORMANCE START --- #
-# The performance team would like to monitor some files to understand
-# when performance-impacting changes occur. Our intent is not to block
-# these changes (for now) but to be aware of them. Please let us know
-# if the CODEOWNERS system makes this impractical. We're available at
-# #perf-android-frontend on Matrix.
-
-# The perf team is relying on CODEOWNERS to catch regressions. If
-# there is a single syntax error in the file, no rules will work.
-# Therefore, we make the Perfomance team code owners of this file.
-/.github/CODEOWNERS @mozilla-mobile/Performance
-
-# Own /perf/ src directories which typically includes perf code architecture
-# or code that monitors for perf regressions. This is our main way to own code
-# because it's simpler and less fragile than listing many specific files to own.
-/**/src/**/perf/** @mozilla-mobile/Performance
-
-# Possible regressions throughout the app
-*.pro @mozilla-mobile/Performance
-*proguard* @mozilla-mobile/Performance
-
-# Possible startup regressions
-*Application.kt @mozilla-mobile/Performance
-
-# We want to be aware of new features behind flags as well as features
-# about to be enabled.
-FeatureFlags.kt @mozilla-mobile/Performance
-# --- PERFORMANCE END --- #
+/.github/ @mozilla-mobile/fenix

.github/ISSUE_TEMPLATE/---bug-report.md

@@ -1,23 +0,0 @@
----
-name: "\U0001F41E Bug report"
-about: Create a report to help us improve
-title: "[Bug]"
-labels: "\U0001F41E bug"
-assignees: ''
-
----
-[comment]: # (Please do your best to search for duplicate issues before filing a new issue so we can keep our issue board clean)
-[comment]: # (Every issue should have the exact bug and steps to reproduce described in it. Please do not file feedback list tickets as it is difficult to parse them and address their individual points)
-[comment]: # (Read https://github.com/mozilla-mobile/fenix#i-want-to-file-an-issue for more information)
-
-## Steps to reproduce
-
-### Expected behavior
-
-### Actual behavior
-
-### Device information
-
-* Device vendor / model and Android version: ?
-* Firefox for Android version: ? (go to Settings -> About Firefox)
- 

.github/ISSUE_TEMPLATE/---bug-report.yml

@@ -0,0 +1,91 @@
+name: "\U0001F41E Bug report"
+description: Create a report to help us improve.
+title: "[Bug]: "
+labels: ["\U0001F41E bug", "needs:triage"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        - Please do your best to search for duplicate issues before filing a new issue so we can keep our issue board clean.
+        - Have a look at ["I want to file an issue!"][info] for more information.
+        - Read the [Community Participation Guidelines][guidelines] and the [Bugzilla Etiquette guidelines][bugzilla] before filing an issue.
+
+        [info]: https://github.com/mozilla-mobile/fenix#i-want-to-file-an-issue
+        [guidelines]: https://www.mozilla.org/en-US/about/governance/policies/participation/
+        [bugzilla]: https://bugzilla.mozilla.org/page.cgi?id=etiquette.html
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: Steps to reproduce the behaviour.
+      placeholder: |
+        1. Have a tab open..
+        2. Go to..
+        3. Click on..
+        4. Observe..
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected behaviour
+      placeholder: A menu should open..
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Actual behaviour
+      placeholder: The app closes unexpectedly..
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        # Device information
+  - type: input
+    attributes:
+      label: Device name
+      description: The name of the device model and manufacturer.
+      placeholder: Google Pixel 2
+    validations:
+      required: false
+  - type: input
+    attributes:
+      label: Android version
+      description: You can find the Android version information in the About section of your device's system settings.
+      placeholder: Android 10
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Firefox release type
+      description: You can find this information in Settings -> About Firefox.
+      options:
+        - Firefox Nightly
+        - Firefox Beta
+        - Firefox
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Firefox version
+      description: You can find this information in Settings -> About Firefox.
+      placeholder: 89.0.10
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Device logs
+      description: |
+        Device logs or crash information can greatly aid in debugging. You can find some details here on how to [retrieve device logs or crash IDs][log].
+
+        [log]: https://github.com/mozilla-mobile/fenix/wiki/Logging-Crash-Information
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Additional information
+      description: |
+        If you have any additional information for us, use the field below.
+        Please note, you can attach screenshots or screen recordings here, by
+        dragging and dropping files in the field below.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/---performance-issue.md

@@ -2,7 +2,7 @@
 name: "⌛ Performance issue"
 about: Create a performance issue if the app is slow or it uses too much memory, disk space, battery, or network data
 title: ""
-labels: "eng:performance"
+labels: "performance"
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/--unit-test.md

@@ -0,0 +1,13 @@
+---
+name: "\U0001F6A8 Intermittent Unit Test Issue"
+about: Create an issue to help log a Unit Test failure
+labels: "eng:intermittent-test"
+title: "Intermittent Unit Test failure - <Classname.testName>"
+assignees: ''
+
+---
+
+### Test Run:
+Provide a test run report link here showcasing the problem (e.g, Taskcluster), and a link to the source Github event
+### Stacktrace:
+### Build: 

.github/ISSUE_TEMPLATE/release_checklist.md

@@ -1,69 +1,37 @@
 ## Overview ##
 
 Firefox for Android roughly follows the [Firefox Gecko release schedule](https://wiki.mozilla.org/Release_Management/Calendar#Calendars).
-This means we cut a beta at the end of every two sprints, with a full cycle (~4 weeks) of baking on Beta before going to release. Uplifts must be approved by Release Owner (st3fan).
+This means we cut a Beta every 4 weeks, with a full cycle (~4 weeks) of baking on Beta before going to Production release. 
 
 The [Firefox for Android release schedule](https://docs.google.com/spreadsheets/d/1HotjliSCGOp2nTkfXrxv8qYcurNpkqLWBKbbId6ovTY/edit#gid=0) contains more details related to specific Mobile handoffs.
 
-| Monday          | Tuesday                   | Wednesday                      | Thursday          | Friday          |
-|-----------------|---------------------------|--------------------------------|-------------------|-----------------|
-| (week 1)        |                           | (Y.2 sprint ended)             |Sprint **X.1** starts |              |
-| (week 2)        |                           |                                |                   |                 |
-| (week 3)        |                           | Cut **X.1-beta** 12PST         | **X.1-beta** QA / Sprint X.2 starts ||
-| (week 4)        |                           |                                |                   |                 |
-| (week 5)        |                           | Uplift L10N to **X.1-beta**    | Sprint Z.1 starts |                 |
-| (week 6)        | Build X.1-RC with GV Prod for QA |                         |                   |                 |
-| (week 7)        | Release X.1 - 5%          | Release X.1 20% / Cut Z.1-beta | Release X.1 100%  |                 |
-
 ### Requirements
 - JIRA access
 - Bugzilla account
 - Sentry access
 
-## Release Checklist
-There are two releases this covers: the current sprint that is going out to Beta, and the previous Beta that is going to Production.
+## Firefox for Android Release
+There are two releases this covers: the current changes in the Fenix Nightly channel that is going out to Beta, and the current Beta that is going to Production.
 
-## Start of Sprint X.1 [Thursday, 1st week of sprint]
-- [ ] [Create an issue](https://github.com/mozilla-mobile/fenix/issues/new?template=release_checklist.md&title=Releng+for+) "Releng for v[release]" to track the current sprint.
+## Cutting a Beta
 
-## Sprint X.1 End [Wednesday, 2nd week] Cutting a Beta
-- [ ] Make a new Beta
-    - [ ] Create a branch off of master (DO NOT PUSH YET) for the *current* milestone of format `releases_v85.0.0`. After that, anything landing in master will be part of the next release.
-       - ⚠️ Please **do not** use `/` in branch names anymore: Taskcluster silently ignores them and doesn't output tasks at the right index.
-    - [ ] Bump `version.txt` to match the new version number
-    - [ ] Grant [mozilla-release-automation-bot](https://github.com/mozilla-release-automation-bot) write access to this branch.
-    - [ ] On the new Beta branch, pin the AC version to the stable version ([example](https://github.com/mozilla-mobile/fenix/commit/e413da29f6a7a7d4a765817a9cd5687abbf27619)) with commit message "Issue #`<this releng issue>`: Pin to stable AC `<version>` for release v85"
-        - [ ] Update the title to include this AC version "Releng for v[release] with AC [version]"
-    - Note: You will need code review to make changes to the release branch after this point, because it is a protected branch.
-        - [ ] Push the branch.
+- [ ] Review [FeatureFlags](https://github.com/mozilla-mobile/fenix/blob/main/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt) to determine if there are features that need to be enabled (or disabled) for Beta and Production release of Fenix. This will be a discussion with PO, PMs, EMs.
+- [ ] Make a new Beta: Follow instructions [here](https://github.com/mozilla-mobile/fenix/wiki/Creating-a-release-branch) and notify the Release Management team (slack: #releaseduty-mobile). QA team is notified that a Beta release has been captured and they will run tests for Beta release sign-off
+- [ ] Once there is GREEN QA signoff, the Release Management team (slack: #releaseduty-mobile) pushes the Beta version in the [Google Play Console](https://play.google.com/console/)
+- [ ] Check Sentry each day for issues on [Firefox Beta](https://sentry.prod.mozaws.net/operations/firefox-beta/) and if nothing concerning, Release Management team bumps releases to 25%. Subsequent Beta builds are bumped to 100% assuming no blocking issues arise.
+### Bugfix uplifts / Beta Product Integrity 
+- [ ] If bugs are considered release blocker then find someone to fix them on main and the milestone branch (cherry-pick / uplift)
+    - [ ] Add the uplift request to the appropriate row in the [Uplifts document](https://docs.google.com/spreadsheets/d/1qIvHpcQ3BqJtlzV5T4M1MhbWVxkNiG-ToeYnWEBW4-I/edit#gid=0). Ask for approval of uplift from Release Owner [amedyne](https://github.com/amedyne) and then notify Release Management team (slack: #releaseduty-mobile) of the uplift changes
+- Note: Beta release versions are captured at least once a week during the Beta cycle.
 
-    - [ ] Tell Release Management the first beta is ready to be shipped. They'll use https://shipit.mozilla-releng.net/new to kick off a new release. This replaces the process that involved GitHub releases. Now Github releases are automatically created by [mozilla-release-automation-bot](https://github.com/mozilla-release-automation-bot)
-    - [ ] Send an email to QA at mozilla-mobile-qa@softvision.com with a link to the Taskcluster build (subdirectory of the [Fenix CI](https://firefox-ci-tc.services.mozilla.com/tasks/index/mobile.v2.fenix.beta))
 
-### Bugfix uplifts / Beta Product Integrity (Beta Release until PI green signoff)
-- [ ] If bugs are considered release blocker then find someone to fix them on master and the milestone branch (cherry-pick / uplift)
-    - [ ] Add the uplift request to the appropriate row in the [Uplifts document](https://docs.google.com/spreadsheets/d/1qIvHpcQ3BqJtlzV5T4M1MhbWVxkNiG-ToeYnWEBW4-I/edit#gid=0).
-- [ ] If needed, ship a new beta version (e.g. v1.0-beta.2) and follow the submission checklist again.
-- [ ] Once there is GREEN QA signoff, file a [release management bugzilla for rollout](https://bugzilla.mozilla.org/show_bug.cgi?id=1664366)
-    - [ ] Check Sentry each day for issues on [Firefox Beta](https://sentry.prod.mozaws.net/operations/firefox-beta/) and if nothing concerning, bump release in the bugzilla (5%, 20%, 100%)
+### Production Release Candidate 
+- Production Release Candidate is captured on the third week of Beta by the Release Management team (slack: #releaseduty-mobile). This is then sent to Quality Assurance for Production Release Testing Sign-off.  
 
-### Uplifting L10N strings to Beta [Wednesday, 2 weeks after sprint end]
-- [ ] Find the issue ([example](https://github.com/mozilla-mobile/fenix/issues/16381)) filed by L10N / delphine saying string are ready for uplift (it takes 2 weeks for localizers to prepare localization).
-- [ ] If there are new locales that are ready to be added to Release, add them to [l10n-release.toml](https://github.com/mozilla-mobile/fenix/blob/master/l10n-release.toml)
-- [ ] Run the [L10N uplift script](https://github.com/mozilla-mobile/fenix/blob/master/l10n-uplift.py) against the releases/vX.1 branch (releases/v85.0.0). There will likely be conflicts, but if you are confused, they should match the strings in [main/Nightly](https://github.com/mozilla-mobile/fenix/tree/master/app/src/main/res)
-- [ ] Once all conflicts are resolved, tag a new Beta to be released.
-- [ ] Notify delphine in the L10N issue that the strings have been uplifted, and string quarantine can be lifted
 
-### Production Release Candidate [Tuesday, 3 weeks after X.1 Beta was cut]
-- [ ] In android-components: Create a dot release with the GeckoView Production release candidate.
-- [ ] Open a PR against the release branch (releases/v85.0.0) with the AC version bump "Pin to stable AC `<version>` for release v85`. You will need code review.
-- [ ] Modify `version.txt` to now follow the pattern: `vX.X.X-rc.1` (e.g.: v85.0.0-rc.1)
-- [ ] Tell Release Management you would like to ship a new release.
-- [ ] Send an email to QA at mozilla-mobile-qa@softvision.com with a link to the Taskcluster build (subdirectory of the [Fenix CI](https://firefox-ci-tc.services.mozilla.com/tasks/index/mobile.v2.fenix.release))
+## Production Release
+- [ ] Once there is GREEN QA signoff, the Production Release Candidate is pushed to the Alpha testing track in [Google Play Console](https://play.google.com/console/u/0/developers/7083182635971239206/app/4972519468758466290/releases/overview) by the Release Management team (slack: #releaseduty-mobile)
+- [ ] If nothing is concerning, release management officially tags the Release Candidate as Production release, (usually 1 week after 1st Release Candidate)
+- [ ] Check Sentry for new crashes. Follow instructions for [Crash Monitoring](https://github.com/mozilla-mobile/fenix/wiki/Crash-Monitoring). File issues and triage.
+- [ ] If nothing concerning, release management bumps releases(5%, 25%, 100%)
 
-### Production Release [Release day, from [release calendar](https://docs.google.com/spreadsheets/d/1HotjliSCGOp2nTkfXrxv8qYcurNpkqLWBKbbId6ovTY/edit#gid=0)]
-- [ ] Modify `version.txt` to now follow the pattern: `vX.1.X` (e.g.: v85.1.0)
-- [ ] File Bugzilla ticket for [release management](https://bugzilla.mozilla.org/show_bug.cgi?id=1672212)
-
-- [ ] Check Sentry for new crashes. File issues and triage.
-- [ ] Each day, bump the release rollout if nothing concerning (5%, 20%, 100%)

.github/PULL_REQUEST_TEMPLATE

@@ -6,8 +6,18 @@
 - [ ] **Screenshots**: This PR includes screenshots or GIFs of the changes made or an explanation of why it does not
 - [ ] **Accessibility**: The code in this PR follows [accessibility best practices](https://github.com/mozilla-mobile/shared-docs/blob/master/android/accessibility_guide.md) or does not include any user facing features. In addition, it includes a screenshot of a successful [accessibility scan](https://play.google.com/store/apps/details?id=com.google.android.apps.accessibility.auditor&hl=en_US) to ensure no new defects are added to the product.
 
-### To download an APK when reviewing a PR:
-1. click on Show All Checks,
-2. click Details next to "Taskcluster (pull_request)" after it appears and then finishes with a green checkmark,
-3. click on the "Fenix - assemble" task, then click "Run Artifacts".
-4. the APK links should be on the left side of the screen, named for each CPU architecture
+### QA
+<!-- Before submitting the PR, please address each item -->
+- [x] **QA Needed**
+
+### To download an APK when reviewing a PR (after all CI tasks finished running):
+1. Click on `Checks` at the top of the PR page.
+2. Click on the `firefoxci-taskcluster` group on the left to expand all tasks.
+3. Click on the `build-debug` task.
+4. Click on `View task in Taskcluster` in the new `DETAILS` section.
+5. The APK links should be on the right side of the screen, named for each CPU architecture.
+
+### GitHub Automation
+<!-- Do not add anything below this line -->
+
+Used by GitHub Actions.

.github/stale.yml

@@ -14,6 +14,7 @@ onlyLabels: []
 exemptLabels:
   - pin
   - "feature request 🌟"
+  - "eng:disabled-test"
 
 # Set to true to ignore issues in a project (defaults to false)
 exemptProjects: false

.github/workflows/build-contributor-pr.yml

@@ -3,14 +3,14 @@ on: [pull_request]
 jobs:
   run-build:
     runs-on: ubuntu-20.04
-    if: github.event.pull_request.head.repo.full_name != github.repository && github.actor != 'MickeyMoz'
+    if: ${{ false }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
       - name: Setup Java
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: "Clean & Assemble Debug"
         uses: eskatos/gradle-command-action@v1
         with:
@@ -29,7 +29,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: "Test Debug Unit Tests"
         uses: eskatos/gradle-command-action@v1
         with:
@@ -48,7 +48,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: "Detekt"
         uses: eskatos/gradle-command-action@v1
         with:
@@ -72,7 +72,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: "Ktlint"
         uses: eskatos/gradle-command-action@v1
         with:
@@ -91,7 +91,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: "Lint Debug"
         uses: eskatos/gradle-command-action@v1
         with:
@@ -105,3 +105,29 @@ jobs:
           name: lintDebug report
           path: app/build/reports/lint-results-debug.html
 
+  run-ui:
+    runs-on: macos-11
+    if: ${{ false }}
+    timeout-minutes: 60
+    strategy:
+      matrix:
+        api-level: [28]
+        target: [google_apis]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Run subset of UI Tests
+        uses: reactivecircus/android-emulator-runner@v2.21.0
+        with:
+          api-level: ${{ matrix.api-level }}
+          target: ${{ matrix.target }}
+          arch: x86_64
+          profile: pixel_2
+          script:
+            "JAVA_HOME=$JAVA_HOME_11_X64 && ./gradlew connectedDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=\
+            org.mozilla.fenix.ui.NavigationToolbarTest#visitURLTest"
+      - name: Upload Test Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: test-report
+          path: app/build/reports

.github/workflows/fenix-sync-strings.yml

@@ -0,0 +1,44 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/
+
+name: "Fenix - Sync Strings"
+
+on:
+  schedule:
+    - cron: '0 2 * * *'
+
+jobs:
+  main:
+    name: "Sync Strings"
+    runs-on: ubuntu-20.04
+    steps:
+      - name: "Discover Fenix Beta Version"
+        id: fenix-beta-version
+        uses: mozilla-mobile/fenix-beta-version@4.1.0
+      - name: "Skip non-beta versions"
+        uses: andymckay/cancel-action@0.2
+        if: ${{ steps.fenix-beta-version.outputs.beta_version == '' }}
+      - name: "Checkout Master Branch"
+        uses: actions/checkout@v2
+        with:
+          path: main
+          ref: main
+      - name: "Checkout Beta Branch"
+        uses: actions/checkout@v2
+        with:
+          path: beta
+          ref: "releases_v${{ steps.fenix-beta-version.outputs.beta_version }}.0.0"
+      - name: "Sync Strings"
+        uses: mozilla-mobile/sync-strings-action@1.0.1
+        with:
+          src: main
+          dst: beta
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v3
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          path: beta
+          branch: automation/sync-strings-${{ steps.fenix-beta-version.outputs.beta_version }}
+          title: "Sync Strings from main to releases_${{steps.fenix-beta-version.outputs.beta_version}}.0"
+          body: "This (automated) PR syncs strings from `main` to `releases_${{steps.fenix-beta-version.outputs.beta_version}}.0.0`"

.github/workflows/fenix-update-ac.yml

@@ -0,0 +1,23 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/
+
+name: "Fenix - Update Android-Components"
+
+on:
+  schedule:
+    - cron: '*/15 * * * *'
+
+jobs:
+  main:
+    name: "Update Android-Components"
+    runs-on: ubuntu-20.04
+    steps:
+      - name: "Update Android-Components"
+        uses: mozilla-mobile/relbot@5.0.2
+        if: github.repository == 'mozilla-mobile/fenix'
+        with:
+          project: fenix
+          command: update-android-components
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/fenix-update-nimbus-experiments.yml

@@ -0,0 +1,42 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/
+
+name: "Fenix - Update Nimbus Experiments"
+
+on:
+  schedule:
+    - cron: '*/30 * * * *'
+  workflow_dispatch: {}
+
+jobs:
+  update-nimbus-experiments:
+    name: "Update Nimbus Experiments"
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Checkout Main Branch"
+        uses: actions/checkout@v2
+        with:
+          path: fenix
+          ref: main
+          fetch-depth: 0
+      - name: "Update Experiments JSON"
+        id: update-experiments-json
+        uses: mozilla-mobile/update-experiments@v2
+        with:
+          repo-path: fenix
+          output-path: app/src/main/res/raw/initial_experiments.json
+          experimenter-url: https://experimenter.services.mozilla.com/api/v6/experiments-first-run/
+          app-name: fenix
+          branch: automation/update-nimbus-experiments
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v3
+        if: steps.update-experiments-json.outputs.changed == 1 && steps.update-experiments-json.outputs.changed-branch == 1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          path: fenix
+          branch: automation/update-nimbus-experiments
+          commit-message: "update initial_experiments.json based on the current first-run experiments in experimenter"
+          title: "Update initial experiments JSON for Nimbus"
+          body: "This (automated) PR updates the initial_experiments.json on the `main` branch"
+          delete-branch: true

.github/workflows/glean-probe-scraper.yml

@@ -0,0 +1,10 @@
+---
+name: Glean probe-scraper
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+jobs:
+  glean-probe-scraper:
+    uses: mozilla/probe-scraper/.github/workflows/glean.yaml@main

.github/workflows/issue-linker.yml

@@ -0,0 +1,21 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/
+
+name: Issue Linker
+
+on:
+  pull_request_target:
+    branches:
+      - main
+
+jobs:
+  issue_linker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Issue Linker
+        uses: gabrielluong/issue-linker@1.0.0
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          commit-regexp: "#(\\d+)+"
+          section: "### GitHub Automation"

.github/workflows/milestone.yml

@@ -0,0 +1,20 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/
+
+name: Tag Milestone
+
+on:
+  issues:
+    types:
+      - closed
+
+jobs:
+  milestone:
+    runs-on: ubuntu-latest
+    if: github.actor == 'mergify[bot]'
+    steps:
+      - name: Tag Milestone
+        uses: gabrielluong/milestone@1.0.0
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/qa-needed.yml

@@ -0,0 +1,22 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/
+
+name: QA Needed
+
+on:
+  pull_request_target:
+    branches:
+      - main
+
+jobs:
+  qa_needed:
+    runs-on: ubuntu-latest
+    steps:
+      - name: QA Needed
+        uses: gabrielluong/qa-needed@1.0.1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          label: "eng:reopen-for-qa"
+          check-regexp: "- \\[([ xX]?)\\] \\*\\*QA Needed\\*\\*"
+          commit-regexp: "#(\\d+)+"

.github/workflows/reopen-for-qa-needed.yml

@@ -0,0 +1,21 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/
+
+name: Reopen for QA Needed
+
+on:
+  issues:
+    types:
+      - closed
+
+jobs:
+  reopen_qa_needed:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Reopen for QA Needed
+        uses: gabrielluong/reopen-for-qa-needed@1.0.0
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          reopen-label: "eng:reopen-for-qa"
+          qa-label: "eng:qa:needed"

.github/workflows/update-ac.yml

@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/
-
-name: "Update Android-Components"
-
-on:
-  schedule:
-    - cron: '*/15 * * * *'
-
-jobs:
-  main:
-    name: "Update Android-Components"
-    runs-on: ubuntu-20.04
-    steps:
-      - name: "Update Android-Components"
-        uses: mozilla-mobile/relbot@master
-        if: github.repository == 'mozilla-mobile/fenix'
-        with:
-          project: fenix
-          command: update-android-components
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -80,11 +80,12 @@ gen-external-apklibs
 .DS_Store
 
 # Secrets files, e.g. tokens
-.leanplum_token
 .adjust_token
 .sentry_token
 .mls_token
 .nimbus
+.wallpaper_url
+.pocket_consumer_key
 
 # Python Byte-compiled / optimized / DLL files
 __pycache__/

.mergify.yml

@@ -1,3 +1,9 @@
+queue_rules:
+  - name: default
+    conditions:
+      - or:
+        - status-success=complete-pr
+        - status-success=complete-push
 pull_request_rules:
   - name: Resolve conflict
     conditions:
@@ -5,83 +11,86 @@ pull_request_rules:
     actions:
         comment:
           message: This pull request has conflicts when rebasing. Could you fix it @{{author}}? 🙏
-  - name: MickeyMoz - Auto Merge
+  - name: Android-Components bump - Auto Merge
     conditions:
-      - author=MickeyMoz
-      - status-success=pr-complete
-      - files~=(Gecko.kt|AndroidComponents.kt)
+      - and:
+        - files=buildSrc/src/main/java/AndroidComponents.kt
+        - -files~=^(?!buildSrc/src/main/java/AndroidComponents.kt).+$
+        - author=github-actions[bot]
+        - status-success=complete-push
+        - or:
+          - and:
+            - base=main
+            - head~=^relbot/AC-Nightly-.+
+          - and:
+            - base~=^releases[_/].*
+            - head~=^relbot/fenix-\d+
     actions:
       review:
         type: APPROVE
-        message: MickeyMoz 💪
-      merge:
+        message: 🚢
+      queue:
         method: rebase
-        strict: smart
+        name: default
+        rebase_fallback: none
   - name: L10N - Auto Merge
     conditions:
-      - author=mozilla-l10n-automation-bot
-      - status-success=pr-complete
-      - files~=(strings.xml|l10n.toml)
+      - and:
+        - files~=^(l10n.toml|app/src/main/res/values[A-Za-z-]*/strings\.xml)$
+        # /!\ The line above doesn't prevent random files to be changed alongside
+        # l10n ones. That's why the additional condition exists below. For more
+        # information: https://docs.mergify.com/conditions/#how-to-match-lists
+        - -files~=^(?!(l10n.toml|app/src/main/res/values[A-Za-z-]*/strings\.xml)).+$
+        - or:
+          - and:
+            - author=mozilla-l10n-automation-bot
+            - base=main
+            - head=import-l10n
+            - status-success=complete-pr
+          - and:
+            - author=github-actions[bot]
+            - base~=^releases[_/].*
+            - head~=^automation/sync-strings-\d+
+            - status-success=complete-push
+            # Taskcluster only runs on git-push events because github-actions[bot] is not considered
+            # a collaborator, so pull request events are triggered. That said, github-actions[bot]
+            # doesn't create the PR on a separate fork (unlike mozilla-l10n-automation-bot). That's
+            # why git-push events are taken into account
     actions:
       review:
         type: APPROVE
         message: LGTM 😎
-      merge:
-        method: rebase
-        strict: smart
-  - name: Release automation (Old)
+      queue:
+        method: squash
+        name: default
+        rebase_fallback: none
+  - name: Needs landing - Rebase
     conditions:
-      - base~=releases[_/].*
-      - author=github-actions[bot]
-      # Listing checks manually beause we do not have a "push complete" check yet.
-      - check-success=build-android-test-debug
-      - check-success=build-debug
-      - check-success=build-nightly-simulation
-      - check-success=lint-compare-locales
-      - check-success=lint-detekt
-      - check-success=lint-ktlint
-      - check-success=lint-lint
-      - check-success=signing-android-test-debug
-      - check-success=signing-debug
-      - check-success=signing-nightly-simulation
-      - check-success=test-debug
-      - check-success=ui-test-x86-debug
-      - files~=(AndroidComponents.kt)
+      - or:
+        - check-success=complete-pr
+        - check-success=complete-push
+      - label=pr:needs-landing
+      - "#approved-reviews-by>=1"
+      - -draft
+      - label!=pr:work-in-progress
+      - label!=pr:do-not-land
     actions:
-      review:
-        type: APPROVE
-        message: 🚢
-      merge:
+      queue:
         method: rebase
-        strict: smart
-      delete_head_branch:
-        force: false
-  - name: Release automation (New)
+        name: default
+        rebase_fallback: none
+  - name: Needs landing - Squash
     conditions:
-      - base~=releases[_/].*
-      - author=github-actions[bot]
-      # Listing checks manually beause we do not have a "push complete" check yet.
-      - check-success=build-android-test-beta
-      - check-success=build-android-test-debug
-      - check-success=build-beta-firebase
-      - check-success=build-debug
-      - check-success=build-nightly-simulation
-      - check-success=lint-compare-locales
-      - check-success=lint-detekt
-      - check-success=lint-ktlint
-      - check-success=lint-lint
-      - check-success=signing-android-test-beta
-      - check-success=signing-beta-firebase
-      - check-success=signing-nightly-simulation
-      - check-success=test-debug
-      - check-success=ui-test-x86-beta
-      - files~=(AndroidComponents.kt)
+      - or:
+        - check-success=complete-pr
+        - check-success=complete-push
+      - label=pr:needs-landing-squashed
+      - "#approved-reviews-by>=1"
+      - -draft
+      - label!=pr:work-in-progress
+      - label!=pr:do-not-land
     actions:
-      review:
-        type: APPROVE
-        message: 🚢
-      merge:
-        method: rebase
-        strict: smart
-      delete_head_branch:
-        force: false
+      queue:
+        method: squash
+        name: default
+        rebase_fallback: none

.taskcluster.yml

@@ -6,333 +6,288 @@ policy:
     pullRequests: collaborators
 tasks:
     - $let:
-          taskgraph:
-              branch: taskgraph
-              revision: a458418ef7cdd6778f1283926c6116966255bc24
-          trustDomain: mobile
+        trustDomain: mobile
+
+        # Github events have this stuff in different places...
+        ownerEmail:
+            $if: 'tasks_for in ["cron", "action"]'
+            then: '${tasks_for}@noreply.mozilla.org'
+            else:
+                $if: 'tasks_for == "github-push"'
+                then:
+                    $if: 'event.pusher.email'
+                    then: '${event.pusher.email}'
+                    else: '${event.pusher.name}@users.noreply.github.com'
+                else:
+                    $if: 'tasks_for == "github-pull-request"'
+                    then: '${event.pull_request.user.login}@users.noreply.github.com'
+        baseRepoUrl:
+            $if: 'tasks_for == "github-push"'
+            then: '${event.repository.html_url}'
+            else:
+                $if: 'tasks_for == "github-pull-request"'
+                then: '${event.pull_request.base.repo.html_url}'
+                else:
+                    $if: 'tasks_for in ["cron", "action"]'
+                    then: '${repository.url}'
+        repoUrl:
+            $if: 'tasks_for == "github-push"'
+            then: '${event.repository.html_url}'
+            else:
+                $if: 'tasks_for == "github-pull-request"'
+                then: '${event.pull_request.head.repo.html_url}'
+                else:
+                    $if: 'tasks_for in ["cron", "action"]'
+                    then: '${repository.url}'
+        project:
+            $if: 'tasks_for == "github-push"'
+            then: '${event.repository.name}'
+            else:
+                $if: 'tasks_for == "github-pull-request"'
+                then: '${event.pull_request.head.repo.name}'
+                else:
+                    $if: 'tasks_for in ["cron", "action"]'
+                    then: '${repository.project}'
+        head_branch:
+            $if: 'tasks_for == "github-pull-request"'
+            then: ${event.pull_request.head.ref}
+            else:
+                $if: 'tasks_for == "github-push"'
+                then: ${event.ref}
+                else:
+                    $if: 'tasks_for in ["action", "cron"]'
+                    then: '${push.branch}'
+        head_sha:
+            $if: 'tasks_for == "github-push"'
+            then: '${event.after}'
+            else:
+                $if: 'tasks_for == "github-pull-request"'
+                then: '${event.pull_request.head.sha}'
+                else:
+                    $if: 'tasks_for in ["action", "cron"]'
+                    then: '${push.revision}'
+        ownTaskId:
+            $if: '"github" in tasks_for'
+            then: {$eval: as_slugid("decision_task")}
+            else:
+                $if: 'tasks_for in ["cron", "action"]'
+                then: '${ownTaskId}'
+        pullRequestAction:
+            $if: 'tasks_for == "github-pull-request"'
+            then: ${event.action}
+            else: 'UNDEFINED'
       in:
-          $let:
-              # Github events have this stuff in different places...
-              ownerEmail:
-                  $if: 'tasks_for in ["cron", "action"]'
-                  then: '${tasks_for}@noreply.mozilla.org'
-                  else:
-                      $if: 'event.sender.login == "bors[bot]"'
-                      then: 'skaspari+mozlando@mozilla.com'   # It must match what's in bors.toml
-                      else:
-                          $if: 'tasks_for == "github-push"'
-                          then: '${event.pusher.email}'
-                          else:
-                              $if: 'tasks_for == "github-pull-request"'
-                              then: '${event.pull_request.user.login}@users.noreply.github.com'
-                              else:
-                                  $if: 'tasks_for == "github-release"'
-                                  then: '${event.sender.login}@users.noreply.github.com'
-              baseRepoUrl:
-                  $if: 'tasks_for in ["github-push", "github-release"]'
-                  then: '${event.repository.html_url}'
-                  else:
-                      $if: 'tasks_for == "github-pull-request"'
-                      then: '${event.pull_request.base.repo.html_url}'
-                      else:
-                          $if: 'tasks_for in ["cron", "action"]'
-                          then: '${repository.url}'
-              repoUrl:
-                  $if: 'tasks_for in ["github-push", "github-release"]'
-                  then: '${event.repository.html_url}'
-                  else:
-                      $if: 'tasks_for == "github-pull-request"'
-                      then: '${event.pull_request.head.repo.html_url}'
-                      else:
-                          $if: 'tasks_for in ["cron", "action"]'
-                          then: '${repository.url}'
-              project:
-                  $if: 'tasks_for in ["github-push", "github-release"]'
-                  then: '${event.repository.name}'
-                  else:
-                      $if: 'tasks_for == "github-pull-request"'
-                      then: '${event.pull_request.head.repo.name}'
-                      else:
-                          $if: 'tasks_for in ["cron", "action"]'
-                          then: '${repository.project}'
-              head_branch:
-                  $if: 'tasks_for == "github-pull-request"'
-                  then: ${event.pull_request.head.ref}
-                  else:
-                      $if: 'tasks_for == "github-push"'
-                      then: ${event.ref}
-                      else:
-                          $if: 'tasks_for == "github-release"'
-                          then: '${event.release.target_commitish}'
-                          else:
-                              $if: 'tasks_for in ["action", "cron"]'
-                              then: '${push.branch}'
-              head_sha:
-                  $if: 'tasks_for == "github-push"'
-                  then: '${event.after}'
-                  else:
-                      $if: 'tasks_for == "github-pull-request"'
-                      then: '${event.pull_request.head.sha}'
-                      else:
-                          $if: 'tasks_for == "github-release"'
-                          then: '${event.release.tag_name}'
-                          else:
-                              $if: 'tasks_for in ["action", "cron"]'
-                              then: '${push.revision}'
-
-
-              head_tag:
-                  $if: 'tasks_for == "github-release"'
-                  then: '${event.release.tag_name}'
-                  else: ''
-              ownTaskId:
-                  $if: '"github" in tasks_for'
-                  then: {$eval: as_slugid("decision_task")}
-                  else:
-                      $if: 'tasks_for in ["cron", "action"]'
-                      then: '${ownTaskId}'
-              pullRequestAction:
-                  $if: 'tasks_for == "github-pull-request"'
-                  then: ${event.action}
-                  else: 'UNDEFINED'
-              releaseAction:
-                  $if: 'tasks_for == "github-release"'
-                  then: ${event.action}
-                  else: 'UNDEFINED'
-          in:
-              $if: >
-                tasks_for in ["action", "cron"]
-                || (tasks_for == "github-pull-request" && pullRequestAction in ["opened", "reopened", "synchronize"])
-                || (tasks_for == "github-push" && head_branch[:10] != "refs/tags/") && (head_branch != "staging.tmp") && (head_branch != "trying.tmp") && (head_branch[:8] != "mergify/")
-                || (tasks_for == "github-release" && releaseAction == "published" && (ownerEmail != "mozilla-release-automation-bot@users.noreply.github.com") && (ownerEmail != "mozilla-release-automation-bot-staging@users.noreply.github.com"))
-              then:
-                  $let:
-                      level:
-                          $if: 'tasks_for in ["github-push", "github-release", "action", "cron"] && repoUrl == "https://github.com/mozilla-mobile/fenix"'
-                          then: '3'
-                          else: '1'
-
-                      short_head_branch:
-                          $if: 'head_branch[:11] == "refs/heads/"'
-                          then: {$eval: 'head_branch[11:]'}
-                  in:
-                    $mergeDeep:
-                        - $if: 'tasks_for != "action"'
+        $if: >
+            tasks_for in ["action", "cron"]
+            || (tasks_for == "github-pull-request" && pullRequestAction in ["opened", "reopened", "synchronize"])
+            || (tasks_for == "github-push" && head_branch[:10] != "refs/tags/") && (head_branch != "staging.tmp") && (head_branch != "trying.tmp") && (head_branch[:8] != "mergify/")
+        then:
+            $let:
+                level:
+                    $if: 'tasks_for in ["github-push", "action", "cron"] && repoUrl == "https://github.com/mozilla-mobile/fenix"'
+                    then: '3'
+                    else: '1'
+                short_head_branch:
+                    $if: 'head_branch[:11] == "refs/heads/"'
+                    then: {$eval: 'head_branch[11:]'}
+            in:
+                taskId:
+                    $if: 'tasks_for != "action"'
+                    then: '${ownTaskId}'
+                taskGroupId:
+                    $if: 'tasks_for == "action"'
+                    then: '${action.taskGroupId}'
+                    else: '${ownTaskId}'  # same as taskId; this is how automation identifies a decision task
+                schedulerId: '${trustDomain}-level-${level}'
+                created: {$fromNow: ''}
+                deadline: {$fromNow: '1 day'}
+                expires: {$fromNow: '1 year 1 second'}  # 1 second so artifacts expire first, despite rounding errors
+                metadata:
+                    $merge:
+                        - owner: "${ownerEmail}"
+                          source: '${repoUrl}/raw/${head_sha}/.taskcluster.yml'
+                        - $if: 'tasks_for in ["github-push", "github-pull-request"]'
                           then:
-                              taskId: '${ownTaskId}'
-                        - taskGroupId:
-                              $if: 'tasks_for == "action"'
+                            name: "Decision Task"
+                            description: 'The task that creates all of the other tasks in the task graph'
+                          else:
+                            $if: 'tasks_for == "action"'
+                            then:
+                                name: "Action: ${action.title}"
+                                description: |
+                                    ${action.description}
+
+                                    Action triggered by clientID `${clientId}`
+                            else:
+                                name: "Decision Task for cron job ${cron.job_name}"
+                                description: 'Created by a [cron task](https://firefox-ci-tc.services.mozilla.com/tasks/${cron.task_id})'
+                provisionerId: "${trustDomain}-${level}"
+                workerType: "decision-gcp"
+                tags:
+                    $if: 'tasks_for in ["github-push", "github-pull-request"]'
+                    then:
+                        kind: decision-task
+                    else:
+                        $if: 'tasks_for == "action"'
+                        then:
+                            kind: 'action-callback'
+                        else:
+                            $if: 'tasks_for == "cron"'
+                            then:
+                                kind: cron-task
+                routes:
+                    $flattenDeep:
+                        - checks
+                        - $if: 'level == "3" || repoUrl == "https://github.com/mozilla-releng/staging-fenix"'
+                          then:
+                            - tc-treeherder.v2.${project}.${head_sha}
+                            # TODO Bug 1601928: Make this scope fork-friendly once ${project} is better defined. This will enable
+                            # staging release promotion on forks.
+                        - $if: 'tasks_for == "github-push"'
+                          then:
+                            - index.${trustDomain}.v2.${project}.branch.${short_head_branch}.latest.taskgraph.decision
+                            - index.${trustDomain}.v2.${project}.branch.${short_head_branch}.revision.${head_sha}.taskgraph.decision
+                            - index.${trustDomain}.v2.${project}.revision.${head_sha}.taskgraph.decision
+                        - $if: 'tasks_for == "cron"'
+                          then:
+                            # cron context provides ${head_branch} as a short one
+                            - index.${trustDomain}.v2.${project}.branch.${head_branch}.latest.taskgraph.decision-${cron.job_name}
+                            - index.${trustDomain}.v2.${project}.branch.${head_branch}.revision.${head_sha}.taskgraph.decision-${cron.job_name}
+                            - index.${trustDomain}.v2.${project}.branch.${head_branch}.revision.${head_sha}.taskgraph.cron.${ownTaskId}
+                scopes:
+                    $if: 'tasks_for == "github-push"'
+                    then:
+                        # `https://` is 8 characters so, ${repoUrl[8:]} is the repository without the protocol.
+                        - 'assume:repo:${repoUrl[8:]}:branch:${short_head_branch}'
+                    else:
+                        $if: 'tasks_for == "github-pull-request"'
+                        then:
+                            - 'assume:repo:github.com/${event.pull_request.base.repo.full_name}:pull-request'
+                        else:
+                            $if: 'tasks_for == "action"'
+                            then:
+                                # when all actions are hooks, we can calculate this directly rather than using a variable
+                                - '${action.repo_scope}'
+                            else:
+                                - 'assume:repo:${repoUrl[8:]}:cron:${cron.job_name}'
+
+                requires: all-completed
+                priority: lowest
+                retries: 5
+                payload:
+                    env:
+                        # run-task uses these to check out the source; the inputs
+                        # to `mach taskgraph decision` are all on the command line.
+                        $merge:
+                            - MOBILE_BASE_REPOSITORY: '${baseRepoUrl}'
+                              MOBILE_HEAD_REPOSITORY: '${repoUrl}'
+                              MOBILE_HEAD_REF: '${head_branch}'
+                              MOBILE_HEAD_REV: '${head_sha}'
+                              MOBILE_REPOSITORY_TYPE: git
+                              MOBILE_PIP_REQUIREMENTS: taskcluster/requirements.txt
+                              MOZ_AUTOMATION: "1"
+                              REPOSITORIES: {$json: {mobile: "Fenix"}}
+                              HG_STORE_PATH: /builds/worker/checkouts/hg-store
+                              ANDROID_SDK_ROOT: /builds/worker/android-sdk
+                            - $if: 'tasks_for in ["github-pull-request"]'
                               then:
-                                  '${action.taskGroupId}'
-                              else:
-                                  '${ownTaskId}'  # same as taskId; this is how automation identifies a decision task
-                          schedulerId: '${trustDomain}-level-${level}'
-                          created: {$fromNow: ''}
-                          deadline: {$fromNow: '1 day'}
-                          expires: {$fromNow: '1 year 1 second'}  # 1 second so artifacts expire first, despite rounding errors
-                          metadata:
-                              $merge:
-                                  - owner: "${ownerEmail}"
-                                    source: '${repoUrl}/raw/${head_sha}/.taskcluster.yml'
-                                  - $if: 'tasks_for in ["github-push", "github-pull-request", "github-release"]'
+                                MOBILE_PULL_REQUEST_NUMBER: '${event.pull_request.number}'
+                            - $if: 'tasks_for == "action"'
+                              then:
+                                ACTION_TASK_GROUP_ID: '${action.taskGroupId}'  # taskGroupId of the target task
+                                ACTION_TASK_ID: {$json: {$eval: 'taskId'}}  # taskId of the target task (JSON-encoded)
+                                ACTION_INPUT: {$json: {$eval: 'input'}}
+                                ACTION_CALLBACK: '${action.cb_name}'
+                    features:
+                        taskclusterProxy: true
+                        chainOfTrust: true
+                        # Note: This task is built server side without the context or tooling that
+                        # exist in tree so we must hard code the hash
+                    image: mozillareleases/taskgraph:decision-mobile-625975b642c148be4c6f1d8ee5cedf7399f5d0dd33d275ff69d5934e3082d4a9@sha256:bfb26700182486e1c6c52701baea6f386fa39e5e25417423c27845933605ad43
+
+                    maxRunTime: 1800
+
+                    command:
+                        - /usr/local/bin/run-task
+                        - '--mobile-checkout=/builds/worker/checkouts/src'
+                        - '--task-cwd=/builds/worker/checkouts/src'
+                        - '--'
+                        - bash
+                        - -cx
+                        - $let:
+                            extraArgs:
+                                $if: 'tasks_for == "cron"'
+                                then: '${cron.quoted_args}'
+                                else: ''
+                          in:
+                            $if: 'tasks_for == "action"'
+                            then: >
+                                taskcluster/scripts/decision-install-sdk.sh &&
+                                ln -s /builds/worker/artifacts artifacts &&
+                                ~/.local/bin/taskgraph action-callback
+                            else: >
+                                taskcluster/scripts/decision-install-sdk.sh &&
+                                ln -s /builds/worker/artifacts artifacts &&
+                                ~/.local/bin/taskgraph decision
+                                --pushlog-id='0'
+                                --pushdate='0'
+                                --project='${project}'
+                                --message=""
+                                --owner='${ownerEmail}'
+                                --level='${level}'
+                                --base-repository="$MOBILE_BASE_REPOSITORY"
+                                --head-repository="$MOBILE_HEAD_REPOSITORY"
+                                --head-ref="$MOBILE_HEAD_REF"
+                                --head-rev="$MOBILE_HEAD_REV"
+                                --repository-type="$MOBILE_REPOSITORY_TYPE"
+                                --tasks-for='${tasks_for}'
+                                ${extraArgs}
+
+                    artifacts:
+                        'public':
+                            type: 'directory'
+                            path: '/builds/worker/artifacts'
+                            expires:
+                                $fromNow: '1 year'
+                        'public/docker-contexts':
+                            type: 'directory'
+                            path: '/builds/worker/checkouts/src/docker-contexts'
+                            # This needs to be at least the deadline of the
+                            # decision task + the docker-image task deadlines.
+                            # It is set to a week to allow for some time for
+                            # debugging, but they are not useful long-term.
+                            expires:
+                                $fromNow: '7 day'
+
+                extra:
+                    $merge:
+                        - treeherder:
+                            $merge:
+                                - machine:
+                                    platform: gecko-decision
+                                - $if: 'tasks_for in ["github-push", "github-pull-request"]'
+                                  then:
+                                    symbol: D
+                                  else:
+                                    $if: 'tasks_for == "action"'
                                     then:
-                                        name: "Decision Task"
-                                        description: 'The task that creates all of the other tasks in the task graph'
+                                        groupName: 'action-callback'
+                                        groupSymbol: AC
+                                        symbol: "${action.symbol}"
                                     else:
-                                        $if: 'tasks_for == "action"'
-                                        then:
-                                            name: "Action: ${action.title}"
-                                            description: |
-                                                ${action.description}
-
-                                                Action triggered by clientID `${clientId}`
-                                        else:
-                                            name: "Decision Task for cron job ${cron.job_name}"
-                                            description: 'Created by a [cron task](https://firefox-ci-tc.services.mozilla.com/tasks/${cron.task_id})'
-                          provisionerId: "mobile-${level}"
-                          workerType: "decision"
-                          tags:
-                              $if: 'tasks_for in ["github-push", "github-pull-request"]'
-                              then:
-                                  kind: decision-task
-                              else:
-                                  $if: 'tasks_for == "action"'
-                                  then:
-                                      kind: 'action-callback'
-                                  else:
-                                      $if: 'tasks_for == "cron"'
-                                      then:
-                                          kind: cron-task
-                          routes:
-                              $flattenDeep:
-                                  - checks
-                                  - $if: 'level == "3" || repoUrl == "https://github.com/mozilla-releng/staging-fenix"'
-                                    then:
-                                        - tc-treeherder.v2.${project}.${head_sha}
-                                        # TODO Bug 1601928: Make this scope fork-friendly once ${project} is better defined. This will enable
-                                        # staging release promotion on forks.
-                                        - $if: 'tasks_for == "github-push"'
-                                          then:
-                                              - index.mobile.v2.${project}.branch.${short_head_branch}.latest.taskgraph.decision
-                                              - index.mobile.v2.${project}.branch.${short_head_branch}.revision.${head_sha}.taskgraph.decision
-                                              - index.mobile.v2.${project}.revision.${head_sha}.taskgraph.decision
-                                        - $if: 'tasks_for == "cron"'
-                                          then:
-                                              # cron context provides ${head_branch} as a short one
-                                              - index.mobile.v2.${project}.branch.${head_branch}.latest.taskgraph.decision-${cron.job_name}
-                                              - index.mobile.v2.${project}.branch.${head_branch}.revision.${head_sha}.taskgraph.decision-${cron.job_name}
-                                              - index.mobile.v2.${project}.branch.${head_branch}.revision.${head_sha}.taskgraph.cron.${ownTaskId}
-                          scopes:
-                              $if: 'tasks_for == "github-push"'
-                              then:
-                                  # `https://` is 8 characters so, ${repoUrl[8:]} is the repository without the protocol.
-                                  - 'assume:repo:${repoUrl[8:]}:branch:${short_head_branch}'
-                              else:
-                                  $if: 'tasks_for == "github-pull-request"'
-                                  then:
-                                      - 'assume:repo:github.com/${event.pull_request.base.repo.full_name}:pull-request'
-                                  else:
-                                      $if: 'tasks_for == "github-release"'
-                                      then:
-                                          - 'assume:repo:${repoUrl[8:]}:release'
-                                      else:
-                                          $if: 'tasks_for == "action"'
-                                          then:
-                                              # when all actions are hooks, we can calculate this directly rather than using a variable
-                                              - '${action.repo_scope}'
-                                          else:
-                                              - 'assume:repo:${repoUrl[8:]}:cron:${cron.job_name}'
-
-                          requires: all-completed
-                          priority: lowest
-                          retries: 5
-
-                          payload:
-                              env:
-                                  # run-task uses these to check out the source; the inputs
-                                  # to `mach taskgraph decision` are all on the command line.
-                                  $merge:
-                                      - MOBILE_BASE_REPOSITORY: '${baseRepoUrl}'
-                                        MOBILE_HEAD_REPOSITORY: '${repoUrl}'
-                                        MOBILE_HEAD_REF: '${head_branch}'
-                                        MOBILE_HEAD_REV: '${head_sha}'
-                                        MOBILE_HEAD_TAG: '${head_tag}'
-                                        MOBILE_REPOSITORY_TYPE: git
-                                        TASKGRAPH_BASE_REPOSITORY: https://hg.mozilla.org/ci/taskgraph
-                                        TASKGRAPH_HEAD_REPOSITORY: https://hg.mozilla.org/ci/${taskgraph.branch}
-                                        TASKGRAPH_HEAD_REV: ${taskgraph.revision}
-                                        TASKGRAPH_REPOSITORY_TYPE: hg
-                                        REPOSITORIES: {$json: {mobile: "Fenix", taskgraph: "Taskgraph"}}
-                                        HG_STORE_PATH: /builds/worker/checkouts/hg-store
-                                        ANDROID_SDK_ROOT: /builds/worker/android-sdk
-                                      - $if: 'tasks_for in ["github-pull-request"]'
-                                        then:
-                                            MOBILE_PULL_REQUEST_NUMBER: '${event.pull_request.number}'
-                                      - $if: 'tasks_for == "action"'
-                                        then:
-                                            ACTION_TASK_GROUP_ID: '${action.taskGroupId}'  # taskGroupId of the target task
-                                            ACTION_TASK_ID: {$json: {$eval: 'taskId'}}  # taskId of the target task (JSON-encoded)
-                                            ACTION_INPUT: {$json: {$eval: 'input'}}
-                                            ACTION_CALLBACK: '${action.cb_name}'
-                                      - $if: 'tasks_for == "github-release"'
-                                        then:
-                                            MOBILE_HEAD_TAG: '${event.release.tag_name}'
-                              features:
-                                  taskclusterProxy: true
-                                  chainOfTrust: true
-                              # Note: This task is built server side without the context or tooling that
-                              # exist in tree so we must hard code the hash
-                              image:
-                                  mozillareleases/taskgraph:decision-mobile-682fbaa1ef17e70ddfe3457da3eaf8e776c4a20fe5bfbdbeba0641fd5bceae2a@sha256:bbb2613aaab79d17e590fbd78c072d0643be40fd1237195703f84280ecc3b302
-
-                              maxRunTime: 1800
-
-                              command:
-                                  - /usr/local/bin/run-task
-                                  - '--mobile-checkout=/builds/worker/checkouts/src'
-                                  - '--taskgraph-checkout=/builds/worker/checkouts/taskgraph'
-                                  - '--task-cwd=/builds/worker/checkouts/src'
-                                  - '--'
-                                  - bash
-                                  - -cx
-                                  - $let:
-                                        extraArgs: {$if: 'tasks_for == "cron"', then: '${cron.quoted_args}', else: ''}
-                                    in:
-                                        $if: 'tasks_for == "action"'
-                                        then: >
-                                            PIP_IGNORE_INSTALLED=0 pip install --user /builds/worker/checkouts/taskgraph &&
-                                            PIP_IGNORE_INSTALLED=0 pip install --user mozilla-version &&
-                                            taskcluster/scripts/decision-install-sdk.sh &&
-                                            ln -s /builds/worker/artifacts artifacts &&
-                                            ~/.local/bin/taskgraph action-callback
-                                        else: >
-                                            PIP_IGNORE_INSTALLED=0 pip install --user /builds/worker/checkouts/taskgraph &&
-                                            PIP_IGNORE_INSTALLED=0 pip install --user mozilla-version &&
-                                            taskcluster/scripts/decision-install-sdk.sh &&
-                                            ln -s /builds/worker/artifacts artifacts &&
-                                            ~/.local/bin/taskgraph decision
-                                            --pushlog-id='0'
-                                            --pushdate='0'
-                                            --project='${project}'
-                                            --message=""
-                                            --owner='${ownerEmail}'
-                                            --level='${level}'
-                                            --base-repository="$MOBILE_BASE_REPOSITORY"
-                                            --head-repository="$MOBILE_HEAD_REPOSITORY"
-                                            --head-ref="$MOBILE_HEAD_REF"
-                                            --head-rev="$MOBILE_HEAD_REV"
-                                            --head-tag="$MOBILE_HEAD_TAG"
-                                            --repository-type="$MOBILE_REPOSITORY_TYPE"
-                                            --tasks-for='${tasks_for}'
-                                            ${extraArgs}
-
-                              artifacts:
-                                  'public':
-                                      type: 'directory'
-                                      path: '/builds/worker/artifacts'
-                                      expires: {$fromNow: '1 year'}
-                                  'public/docker-contexts':
-                                      type: 'directory'
-                                      path: '/builds/worker/checkouts/src/docker-contexts'
-                                      # This needs to be at least the deadline of the
-                                      # decision task + the docker-image task deadlines.
-                                      # It is set to a week to allow for some time for
-                                      # debugging, but they are not useful long-term.
-                                      expires: {$fromNow: '7 day'}
-
-                          extra:
-                              $merge:
-                                  - treeherder:
-                                        $merge:
-                                            - machine:
-                                                  platform: gecko-decision
-                                            - $if: 'tasks_for in ["github-push", "github-pull-request"]'
-                                              then:
-                                                  symbol: D
-                                              else:
-                                                  $if: 'tasks_for == "github-release"'
-                                                  then:
-                                                      symbol: 'ship_fenix'
-                                                  else:
-                                                      $if: 'tasks_for == "action"'
-                                                      then:
-                                                          groupName: 'action-callback'
-                                                          groupSymbol: AC
-                                                          symbol: "${action.symbol}"
-                                                      else:
-                                                          groupSymbol: cron
-                                                          symbol: "${cron.job_symbol}"
-                                  - $if: 'tasks_for == "action"'
-                                    then:
-                                        parent: '${action.taskGroupId}'
-                                        action:
-                                            name: '${action.name}'
-                                            context:
-                                                taskGroupId: '${action.taskGroupId}'
-                                                taskId: {$eval: 'taskId'}
-                                                input: {$eval: 'input'}
-                                                clientId: {$eval: 'clientId'}
-                                  - $if: 'tasks_for == "cron"'
-                                    then:
-                                        cron: {$json: {$eval: 'cron'}}
-                                  - tasks_for: '${tasks_for}'
+                                        groupSymbol: cron
+                                        symbol: "${cron.job_symbol}"
+                        - $if: 'tasks_for == "action"'
+                          then:
+                            parent: '${action.taskGroupId}'
+                            action:
+                                name: '${action.name}'
+                                context:
+                                    taskGroupId: '${action.taskGroupId}'
+                                    taskId: {$eval: 'taskId'}
+                                    input: {$eval: 'input'}
+                                    clientId: {$eval: 'clientId'}
+                        - $if: 'tasks_for == "cron"'
+                          then:
+                            cron: {$json: {$eval: 'cron'}}
+                        - tasks_for: '${tasks_for}'

Jenkinsfile

@@ -1,7 +1,7 @@
 pipeline {
     agent any
     triggers {
-        cron(env.BRANCH_NAME == 'master' ? 'H 0 * * *' : '')
+        cron(env.BRANCH_NAME == 'main' ? 'H 0 * * *' : '')
     }
     options {
         timestamps()
@@ -9,7 +9,7 @@ pipeline {
     }
     stages {
         stage('test') {
-        when { branch 'master' }
+        when { branch 'main' }
             steps {
                 dir('app/src/androidTest/java/org/mozilla/fenix/syncIntegration') {
                     sh 'pipenv install'
@@ -22,7 +22,7 @@ pipeline {
     post {
         always {
             script {
-                 if (env.BRANCH_NAME == 'master') {
+                 if (env.BRANCH_NAME == 'main') {
                  publishHTML(target: [
                      allowMissing: false,
                      alwaysLinkToLastBuild: true,
@@ -36,7 +36,7 @@ pipeline {
 
         failure {
             script {
-                if (env.BRANCH_NAME == 'master') {
+                if (env.BRANCH_NAME == 'main') {
                     slackSend(
                         color: 'danger',
                         message: "FAILED: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' (${env.BUILD_URL}HTML_20Report/)")

README.md

@@ -1,14 +1,12 @@
 # Firefox for Android
 
-[![Task Status](https://github.taskcluster.net/v1/repository/mozilla-mobile/fenix/master/badge.svg)](https://github.taskcluster.net/v1/repository/mozilla-mobile/fenix/master/latest)
-[![codecov](https://codecov.io/gh/mozilla-mobile/fenix/branch/master/graph/badge.svg)](https://codecov.io/gh/mozilla-mobile/fenix)
+[![Task Status](https://firefox-ci-tc.services.mozilla.com/api/github/v1/repository/mozilla-mobile/fenix/main/badge.svg)](https://firefox-ci-tc.services.mozilla.com/api/github/v1/repository/mozilla-mobile/fenix/main/latest)
+[![codecov](https://codecov.io/gh/mozilla-mobile/fenix/branch/main/graph/badge.svg)](https://codecov.io/gh/mozilla-mobile/fenix)
 
 Fenix (internal codename) is the all-new Firefox for Android browser, based on [GeckoView](https://mozilla.github.io/geckoview/) and [Mozilla Android Components](https://mozac.org/).
 
 <a href="https://play.google.com/store/apps/details?id=org.mozilla.firefox" target="_blank"><img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" alt="Get it on Google Play" height="90"/></a>
 
-** Note: The team is currently experiencing heavy triage and review load, so when triaging issues, we will mainly be looking to identify [S1 (high severity)](https://github.com/mozilla-mobile/fenix/labels/S1) issues. See our triage process [here](https://github.com/mozilla-mobile/fenix/wiki/Triage-Process). Please be patient if you don't hear back from us immediately on your issue! **
-
 ## Getting Involved
 
 Please read the [Community Participation Guidelines](https://www.mozilla.org/en-US/about/governance/policies/participation/) and the [Bugzilla Etiquette guidelines](https://bugzilla.mozilla.org/page.cgi?id=etiquette.html) before filing an issue. This is our professional working environment as much as it is our bug tracker, and we want to keep our workspace clean and healthy.
@@ -25,7 +23,7 @@ Please read the [Community Participation Guidelines](https://www.mozilla.org/en-
 * Check out the [project wiki](https://github.com/mozilla-mobile/fenix/wiki) for more information.
   * See [our guide on Writing Custom Lint Rules](https://github.com/mozilla-mobile/shared-docs/blob/master/android/writing_lint_rules.md).
 
-* Localization happens on [Pontoon](https://pontoon.mozilla.org/projects/android-l10n/). Please get in touch with delphine (at) mozilla (dot) com directly for more information.
+* Localization happens on [Pontoon](https://pontoon.mozilla.org/projects/firefox-for-android/). Please get in touch with delphine (at) mozilla (dot) com directly for more information.
 
 **Beginners!** - Watch out for [Issues with the "Good First Issue" label](https://github.com/mozilla-mobile/fenix/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22). These are easy bugs that have been left for first timers to have a go, get involved and make a positive contribution to the project!
 
@@ -92,6 +90,8 @@ Pre-requisites:
 
 3. Make sure to select the correct build variant in Android Studio. See the next section.
 
+4. Make sure to select "Default APK" under Installation Options inside Run/Debug configuration: see [this bug](https://bugzilla.mozilla.org/show_bug.cgi?id=1529082).
+
 ### Build Variants
 For general development, we recommend the **debug** build variant. Here's an explanation of each variant:
 
@@ -120,7 +120,6 @@ Before you can install any release builds, **You will need to sign production bu
 Some features are disabled by default when Fenix is built locally. This can be problematic at times for checking performance since you might want to know how your code behaves with those features.
 The known features that are disabled by default are:
 - Sentry
-- Leanplum
 - Adjust
 - Mozilla Location Services (also known as MLS)
 - Firebase Push Services
@@ -156,7 +155,7 @@ git push <remote> --no-verify
 
 Note: If while pushing you encounter this error "Could not initialize class org.codehaus.groovy.runtime.InvokerHelper" and are currently on Java14 then downgrading your Java version to Java13 or lower can resolve the issue
 
-Steps to downgrade Java Version on Mac with Brew: 
+Steps to downgrade Java Version on Mac with Brew:
 1. Install Homebrew (https://brew.sh/)
 2. run ```brew update```
 3. To uninstall your current java version, run ```sudo rm -fr /Library/Java/JavaVirtualMachines/<jdk-version>```
@@ -200,17 +199,21 @@ raptorEnabled
 If you're making changes to these projects and want to test them in Fenix, auto-publication workflow is the fastest, most reliable
 way to do that.
 
-In `local.properties`, specify a relative path to your local `android-components` and/or `application-services` checkouts. E.g.:
-- `autoPublish.android-components.dir=../android-components`
+In `local.properties`, specify a relative path to your local `android-components` and/or `application-services` projects. E.g.:
+- `autoPublish.android-components.dir=../firefox-android/android-components`
 - `autoPublish.application-services.dir=../application-services`
 
+*Note that the Android Components project was already migrated to the new [firefox-android](https://github.com/mozilla-mobile/firefox-android) repository. Therefore, this auto publication workflow won't be neccessary for Android Components once Fenix is integrated in the new repository as well.*
+
 Once these flags are set, your Fenix builds will include any local modifications present in these projects.
 
 See a [demo of auto-publication workflow in action](https://www.youtube.com/watch?v=qZKlBzVvQGc).
 
 In order to build successfully, you need to check out a commit in the dependency repository that has no breaking changes. The two best ways to do this are:
 - Run the `<android-components>/tools/list_compatible_dependency_versions.py` script to output a compatible commit
-- Check out the latest commit from master in this repository and the dependency repository. However, this may fail if there were breaking changes added recently to the dependency.
+- Check out the latest commit from main in this repository and the dependency repository. However, this may fail if there were breaking changes added recently to the dependency.
+
+If you're trying to build fenix with a local ac AND a local GV, you'll have to use another method: see [this doc](https://github.com/mozilla-mobile/fenix/blob/main/docs/substituting-local-ac-and-gv.md).
 
 ### Using Nimbus servers during local development
 If you're working with the Nimbus experiments platform, by default for local development Fenix configures Nimbus to not use a server.
@@ -221,6 +224,11 @@ If you wish to use a Nimbus server during local development, you can add a `http
 
 Testing experimental branches should be possible without a server.
 
+### Using custom Glean servers during local development
+If you wish to use a custom Glean server during local development, you can add a `https://` endpoint to the `local.properties` file.
+
+- `glean.custom.server.url`
+
 ### GeckoView
 Specify a relative path to your local `mozilla-central` checkout via `dependencySubstitutions.geckoviewTopsrcdir`,
 and optional a path to m-c object directory via `dependencySubstitutions.geckoviewTopobjdir`.

SECURITY.md

@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Report all security vunerablites to [Bugzilla Fenix::Security](https://bugzilla.mozilla.org/enter_bug.cgi?product=Fenix&component=Security). If they are not a security bug you will be asked to move your report to [Fenix GitHub](https://github.com/mozilla-mobile/fenix/issues). See the [Mozilla Security Bug Bounty Program](https://www.mozilla.org/en-US/security/bug-bounty/) and the [client security reporting](https://www.mozilla.org/en-US/security/client-bug-bounty/) pages for details. In any case where this document and the Mozilla.org pages differ the Mozilla.org pages are the official documentation.

app/benchmark.gradle

@@ -0,0 +1,81 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+// This comment contains the central documentation for how we configured Jetpack Benchmark. Currently:
+// - microbenchmark: configured differently than recommended (see inline notes below)
+// - macrobenchmark: not configured
+//
+// To run our benchmarks, you need to set the "benchmark" gradle property. You can:
+// - (preferred) Run via the command line (change the class you run on):
+// ./gradlew -Pbenchmark app:connectedCheck -Pandroid.testInstrumentationRunnerArguments.class=org.mozilla.fenix.perf.SampleBenchmark
+// - Use the IDE. Temporarily set the "benchmark" property in app/build.gradle with "ext.benchmark=true"
+// near the top of the file. DO NOT COMMIT THIS.
+// - (note: I was unable to get IDE run configurations working)
+//
+// To get the results, look at this file (we recommend using the median; results are in nanoseconds):
+// app/build/outputs/connected_android_test_additional_output/nightlyAndroidTest/connected/<device>/org.mozilla.fenix-benchmarkData.json
+//
+// I was unable to get the results to print directly in Android Studio (perhaps it's my device).
+//
+// The official documentation suggests configuring microbenchmark in a separate module. This would
+// require any benchmarked code to be in a library module, not the :app module (see below). To avoid
+// this requirement, we created the "benchmark" gradle property.
+//
+// For the most accurate results, the documentation recommends running tests on rooted devices with
+// the CPU clock locked.
+//
+// See https://developer.android.com/studio/profile/benchmark#what-to-benchmark for when writing a
+// jetpack microbenchmark is a good fit.
+
+// I think `android` represents this object:
+// https://google.github.io/android-gradle-dsl/3.3/com.android.build.gradle.AppExtension.html
+ext.maybeConfigForJetpackBenchmark = { android ->
+    if (!project.hasProperty("benchmark")) {
+        return
+    }
+
+    // The official documentation https://developer.android.com/studio/profile/benchmark#full-setup
+    // recommends setting up the Microbenchmark library in a separate module from your app: AFAICT,
+    // the reason for this is to prevent the benchmarks from being configured against debug
+    // builds. We chose not to do this because it's a lot of work to pull code out into a
+    // separate module just to benchmark it. We were able to replicate the outcome by setting
+    // this testBuildType property.
+    android.testBuildType "nightly"
+
+    // WARNING: our proguard configuration for androidTest is not set up correctly so the tests
+    // fail if we don't disable minification. DISABLING MINIFICATION PRODUCES BENCHMARKS THAT ARE
+    // LESS REPRESENTATIVE TO THE USER EXPERIENCE, however, so we made this tradeoff to reduce
+    // implementation time.
+    project.ext.disableOptimization = true
+
+    android.defaultConfig {
+        // WARNING: the benchmark framework warns you if you're running the test in a configuration
+        // that will compromise the accuracy of the results. Unfortunately, I couldn't get everything
+        // working so I had to suppress some things.
+        testInstrumentationRunnerArguments = [
+
+                // - ACTIVITY-MISSING: we're supposed to use the test instrumentation runner,
+                // "androidx.benchmark.junit4.AndroidBenchmarkRunner". However, when I do so, I get an error
+                // that we're unable to launch the activity. My understanding is that this runner will use an
+                // "IsolationActivity" to reduce the impact of other work on the device from affecting the benchmark
+                // and to opt into a lower-max CPU frequency on unrooted devices that support it
+                // - UNLOCKED: ./gradlew lockClocks, which locks the CPU frequency, fails on my device. See
+                // https://issuetracker.google.com/issues/176836267 for potential workarounds.
+                'androidx.benchmark.suppressErrors' : 'ACTIVITY-MISSING,UNLOCKED',
+
+                // The tests don't always output a JSON file with the data. To make sure it does, we have to
+                // set androidx.benchmark.output.enable to true.
+                'androidx.benchmark.output.enable' : 'true',
+
+                // We set the the output directory simply for simplicity since the benchmark_runner.py script
+                // can't know the name of the phone in the /build/outputs/ directory. The system defaults to
+                // {phone_name} which can be troublesome finding in some case.
+                //
+                // NOTE: Jetpack Benchmark outputs to Logcat too. However, the output in the logcat is
+                // the min of the several repeats, for more statistics. Therefore, to get more stats,
+                // we refer to the JSON file.
+                additionalTestOutputDir : '/storage/emulated/0/benchmark'
+        ]
+    }
+}

app/build.gradle

@@ -1,13 +1,17 @@
+import org.mozilla.fenix.gradle.tasks.ApkSizeTask
+
 plugins {
     id "com.jetbrains.python.envs" version "0.0.26"
+    id "com.google.protobuf" version "0.8.19"
 }
 
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-parcelize'
 apply plugin: 'jacoco'
 apply plugin: 'androidx.navigation.safeargs.kotlin'
 apply plugin: 'com.google.android.gms.oss-licenses-plugin'
+apply plugin: 'androidx.benchmark'
 
 
 import com.android.build.OutputFile
@@ -17,9 +21,12 @@ import org.gradle.internal.logging.text.StyledTextOutputFactory
 
 import static org.gradle.api.tasks.testing.TestResult.ResultType
 
+apply from: 'benchmark.gradle'
+
 android {
     compileSdkVersion Config.compileSdkVersion
 
+    project.maybeConfigForJetpackBenchmark(it)
     if (project.hasProperty("testBuildType")) {
         // Allowing to configure the test build type via command line flag (./gradlew -PtestBuildType=beta ..)
         // in order to run UI tests against other build variants than debug in automation.
@@ -37,9 +44,10 @@ android {
         testInstrumentationRunnerArguments clearPackageData: 'true'
         resValue "bool", "IS_DEBUG", "false"
         buildConfigField "boolean", "USE_RELEASE_VERSIONING", "false"
+        buildConfigField "String", "GIT_HASH", "\"\"" // see override in release builds for why it's blank.
         // This should be the "public" base URL of AMO.
         buildConfigField "String", "AMO_BASE_URL", "\"https://addons.mozilla.org\""
-        buildConfigField "String", "AMO_COLLECTION_NAME", "\"7dfae8669acc4312a65e8ba5553036\""
+        buildConfigField "String", "AMO_COLLECTION_NAME", "\"Extensions-for-Android\""
         buildConfigField "String", "AMO_COLLECTION_USER", "\"mozilla\""
         // These add-ons should be excluded for Mozilla Online builds.
         buildConfigField "String[]", "MOZILLA_ONLINE_ADDON_EXCLUSIONS",
@@ -51,7 +59,8 @@ android {
                         "\"foxyproxy@eric.h.jung\"," +
                         "\"{73a6fe31-595d-460b-a920-fcc0f8843232}\"," +
                         "\"jid1-BoFifL9Vbdl2zQ@jetpack\"," +
-                        "\"woop-NoopscooPsnSXQ@jetpack\"" +
+                        "\"woop-NoopscooPsnSXQ@jetpack\"," +
+                        "\"adnauseam@rednoise.org\"" +
                 "}"
         // This should be the base URL used to call the AMO API.
         buildConfigField "String", "AMO_SERVER_URL", "\"https://services.addons.mozilla.org\""
@@ -74,9 +83,13 @@ android {
         // in automation for UI testing non-debug builds.
         shrinkResources !project.hasProperty("disableOptimization")
         minifyEnabled !project.hasProperty("disableOptimization")
-        proguardFiles 'proguard-android-optimize-3.5.0-modified.txt', 'proguard-rules.pro'
+        proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         matchingFallbacks = ['release'] // Use on the "release" build type in dependencies (AARs)
 
+        // Changing the build config can cause files that depend on BuildConfig.java to recompile
+        // so we only set the git hash in release builds to avoid possible recompilation in debug builds.
+        buildConfigField "String", "GIT_HASH", "\"${Config.getGitHash()}\""
+
         if (gradle.hasProperty("localProperties.autosignReleaseWithDebugKey")) {
             signingConfig signingConfigs.debug
         }
@@ -137,6 +150,10 @@ android {
         }
     }
 
+    buildFeatures {
+        viewBinding true
+    }
+
     aaptOptions {
         // All JavaScript code used internally by GeckoView is packaged in a
         // file called omni.ja. If this file is compressed in the APK,
@@ -161,20 +178,6 @@ android {
         androidTest {
             resources.srcDirs += ['src/androidTest/resources']
         }
-        debug {
-            java.srcDirs = ['src/geckoNightly/java']
-        }
-        nightly {
-            java.srcDirs = ['src/geckoNightly/java']
-        }
-        beta {
-            java.srcDirs = ['src/migration/java', 'src/geckoBeta/java']
-            manifest.srcFile "src/migration/AndroidManifest.xml"
-        }
-        release {
-            java.srcDirs = ['src/migration/java', 'src/geckoRelease/java']
-            manifest.srcFile "src/migration/AndroidManifest.xml"
-        }
     }
 
     splits {
@@ -199,6 +202,8 @@ android {
 
     packagingOptions {
         exclude 'META-INF/atomicfu.kotlin_module'
+        exclude 'META-INF/AL2.0'
+        exclude 'META-INF/LGPL2.1'
     }
 
     testOptions {
@@ -209,35 +214,30 @@ android {
             // reserve more memory and also create a new process after every 80 test classes. This
             // is a band-aid solution and eventually we should try to find and fix the leaks
             // instead. :)
-            maxParallelForks = 2
             forkEvery = 80
-            maxHeapSize = "2048m"
+            maxHeapSize = "3072m"
             minHeapSize = "1024m"
         }
     }
+
+    buildFeatures {
+        compose true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = FenixVersions.androidx_compose_compiler
+    }
+
 }
 
 android.applicationVariants.all { variant ->
 
-// -------------------------------------------------------------------------------------------------
-// Set up kotlin-allopen plugin for writing tests
-// -------------------------------------------------------------------------------------------------
-
-    boolean hasTest = gradle.startParameter.taskNames.find { it.contains("test") || it.contains("Test") } != null
-    if (hasTest) {
-        apply plugin: 'kotlin-allopen'
-        allOpen {
-            annotation("org.mozilla.fenix.utils.OpenClass")
-        }
-    }
-
 // -------------------------------------------------------------------------------------------------
 // Generate version codes for builds
 // -------------------------------------------------------------------------------------------------
 
-    def isDebug = variant.buildType.resValues['IS_DEBUG']?.value ?: false
+    def isDebug = variant.buildType.resValues['bool/IS_DEBUG']?.value ?: false
     def useReleaseVersioning = variant.buildType.buildConfigFields['USE_RELEASE_VERSIONING']?.value ?: false
-    def versionName = Config.releaseVersionName(project)
 
     println("----------------------------------------------")
     println("Variant name:      " + variant.name)
@@ -251,17 +251,29 @@ android.applicationVariants.all { variant ->
         // same version code. Therefore we need to have different version codes for our ARM and x86
         // builds.
 
+        def versionName = variant.buildType.name == 'nightly' ? Config.nightlyVersionName() : Config.releaseVersionName(project)
+        println("versionName override: $versionName")
+
         variant.outputs.each { output ->
+            def isMozillaOnline = project.hasProperty("mozillaOnline") || gradle.hasProperty("localProperties.mozillaOnline")
             def abi = output.getFilter(OutputFile.ABI)
+            // If it is a Mozilla Online build, use a unified version code of armeabi-v7a
+            def arch = (isMozillaOnline) ? "armeabi-v7a" : abi
             // We use the same version code generator, that we inherited from Fennec, across all channels - even on
             // channels that never shipped a Fennec build.
-            def versionCodeOverride = Config.generateFennecVersionCode(abi)
+            def versionCodeOverride = Config.generateFennecVersionCode(arch)
 
-            println("versionCode for $abi = $versionCodeOverride")
+            println("versionCode for $abi = $versionCodeOverride, isMozillaOnline = $isMozillaOnline")
 
             output.versionNameOverride = versionName
             output.versionCodeOverride = versionCodeOverride
         }
+    } else if (gradle.hasProperty("localProperties.branchBuild.fenix.version")) {
+        def versionName = gradle.getProperty("localProperties.branchBuild.fenix.version")
+        println("versionName override: $versionName")
+        variant.outputs.each { output ->
+            output.versionNameOverride = versionName
+        }
     }
 
 // -------------------------------------------------------------------------------------------------
@@ -315,25 +327,6 @@ android.applicationVariants.all { variant ->
         println("--")
     }
 
-// -------------------------------------------------------------------------------------------------
-// Leanplum: Read token from local file if it exists
-// -------------------------------------------------------------------------------------------------
-
-    print("Leanplum token: ")
-
-    try {
-        def parts = new File("${rootDir}/.leanplum_token").text.trim().split(":")
-        def id = parts[0]
-        def key = parts[1]
-        buildConfigField 'String', 'LEANPLUM_ID', '"' + id + '"'
-        buildConfigField 'String', 'LEANPLUM_TOKEN', '"' + key + '"'
-        println "(Added from .leanplum_token file)"
-    } catch (FileNotFoundException ignored) {
-        buildConfigField 'String', 'LEANPLUM_ID', 'null'
-        buildConfigField 'String', 'LEANPLUM_TOKEN', 'null'
-        println("X_X")
-    }
-
 // -------------------------------------------------------------------------------------------------
 // MLS: Read token from local file if it exists
 // -------------------------------------------------------------------------------------------------
@@ -373,6 +366,21 @@ android.applicationVariants.all { variant ->
         println("--")
     }
 
+// -------------------------------------------------------------------------------------------------
+// Glean: Read custom server URL from local.properties of a local file if it exists
+// -------------------------------------------------------------------------------------------------
+
+    print("Glean custom server URL: ")
+
+    if (gradle.hasProperty("localProperties.glean.custom.server.url")) {
+        def url=gradle.getProperty("localProperties.glean.custom.server.url")
+        buildConfigField 'String', 'GLEAN_CUSTOM_URL', url
+        println "(Added from local.properties file)"
+    } else {
+        buildConfigField 'String', 'GLEAN_CUSTOM_URL', 'null'
+        println("--")
+    }
+
 // -------------------------------------------------------------------------------------------------
 // BuildConfig: Set flag for official builds; similar to MOZILLA_OFFICIAL in mozilla-central.
 // -------------------------------------------------------------------------------------------------
@@ -382,17 +390,62 @@ android.applicationVariants.all { variant ->
     } else {
         buildConfigField 'Boolean', 'MOZILLA_OFFICIAL', 'false'
     }
+
+// -------------------------------------------------------------------------------------------------
+// BuildConfig: Set remote wallpaper URL using local file if it exists
+// -------------------------------------------------------------------------------------------------
+
+    print("Wallpaper URL: ")
+
+    try {
+        def token = new File("${rootDir}/.wallpaper_url").text.trim()
+        buildConfigField 'String', 'WALLPAPER_URL', '"' + token + '"'
+        println "(Added from .wallpaper_url file)"
+    } catch (FileNotFoundException ignored) {
+        buildConfigField 'String', 'WALLPAPER_URL', '""'
+        println("--")
+    }
+
+// -------------------------------------------------------------------------------------------------
+// BuildConfig: Set the Pocket consumer key from a local file if it exists
+// -------------------------------------------------------------------------------------------------
+
+    print("Pocket consumer key: ")
+
+    try {
+        def token = new File("${rootDir}/.pocket_consumer_key").text.trim()
+        buildConfigField 'String', 'POCKET_CONSUMER_KEY', '"' + token + '"'
+        println "(Added from .pocket_consumer_key file)"
+    } catch (FileNotFoundException ignored) {
+        buildConfigField 'String', 'POCKET_CONSUMER_KEY', '""'
+        println("--")
+    }
 }
 
-androidExtensions {
-    experimental = true
-}
-
-// Generate Kotlin code and markdown docs for the Fenix Glean metrics.
-ext.gleanGenerateMarkdownDocs = true
-ext.gleanDocsDirectory = "$rootDir/docs"
+// Generate Kotlin code for the Fenix Glean metrics.
 apply plugin: "org.mozilla.telemetry.glean-gradle-plugin"
+apply plugin: "org.mozilla.components.nimbus-gradle-plugin"
 
+nimbus {
+    // The path to the Nimbus feature manifest file
+    manifestFile = "nimbus.fml.yaml"
+    // The fully qualified class name for the generated features.
+    // If the classname begins with a '.' this is taken as a suffix to the app's package name
+    destinationClass = ".nimbus.FxNimbus"
+    // Map from the variant name to the channel as experimenter and nimbus understand it.
+    // If nimbus's channels were accurately set up well for this project, then this
+    // shouldn't be needed.
+    channels = [
+            debug: "developer",
+            nightly: "nightly",
+            beta: "beta",
+            release: "release",
+    ]
+    // This is generated by the FML and should be checked into git.
+    // It will be fetched by Experimenter (the Nimbus experiment website)
+    // and used to inform experiment configuration.
+    experimenterManifest = ".experimenter.yaml"
+}
 configurations {
     // There's an interaction between Gradle's resolution of dependencies with different types
     // (@jar, @aar) for `implementation` and `testImplementation` and with Android Studio's built-in
@@ -408,202 +461,248 @@ configurations {
     // correct runtime classpath when invoked with Android Studio's built-in JUnit test runner.
     // Success!
     jnaForTest
-    // Robolectric, through `com.google.android.apps.common.testing.accessibility.framework`
-    // depends on an old version of protobuf that conflict with the Application Services one.
-    // See: https://github.com/mozilla/application-services/issues/2952
-    all*.exclude group: 'com.google.protobuf', module: 'protobuf-java'
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    kotlinOptions {
+        freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
+    }
 }
 
 dependencies {
-    jnaForTest Deps.jna
+    jnaForTest FenixDependencies.jna
     testImplementation files(configurations.jnaForTest.copyRecursive().files)
 
-    debugImplementation Deps.mozilla_browser_engine_gecko_nightly
+    implementation  FenixDependencies.mozilla_browser_engine_gecko
 
-    nightlyImplementation Deps.mozilla_browser_engine_gecko_nightly
-    betaImplementation Deps.mozilla_browser_engine_gecko_beta
-    releaseImplementation Deps.mozilla_browser_engine_gecko_release
+    implementation FenixDependencies.kotlin_stdlib
+    implementation FenixDependencies.kotlin_coroutines
+    implementation FenixDependencies.kotlin_coroutines_android
+    testImplementation FenixDependencies.kotlin_coroutines_test
+    implementation FenixDependencies.androidx_appcompat
+    implementation FenixDependencies.androidx_constraintlayout
+    implementation FenixDependencies.androidx_coordinatorlayout
+    implementation FenixDependencies.google_accompanist_drawablepainter
+    implementation FenixDependencies.google_accompanist_insets
 
-    implementation Deps.kotlin_stdlib
-    implementation Deps.kotlin_coroutines
-    implementation Deps.kotlin_coroutines_android
-    testImplementation Deps.kotlin_coroutines_test
-    implementation Deps.androidx_appcompat
-    implementation Deps.androidx_constraintlayout
-    implementation Deps.androidx_coordinatorlayout
+    implementation FenixDependencies.sentry
 
-    implementation Deps.sentry
+    implementation FenixDependencies.mozilla_compose_awesomebar
 
-    implementation Deps.leanplum_core
-    implementation Deps.leanplum_fcm
+    implementation FenixDependencies.mozilla_concept_awesomebar
+    implementation FenixDependencies.mozilla_concept_base
+    implementation FenixDependencies.mozilla_concept_engine
+    implementation FenixDependencies.mozilla_concept_menu
+    implementation FenixDependencies.mozilla_concept_push
+    implementation FenixDependencies.mozilla_concept_storage
+    implementation FenixDependencies.mozilla_concept_sync
+    implementation FenixDependencies.mozilla_concept_toolbar
+    implementation FenixDependencies.mozilla_concept_tabstray
 
-    implementation Deps.mozilla_concept_base
-    implementation Deps.mozilla_concept_engine
-    implementation Deps.mozilla_concept_menu
-    implementation Deps.mozilla_concept_push
-    implementation Deps.mozilla_concept_storage
-    implementation Deps.mozilla_concept_sync
-    implementation Deps.mozilla_concept_toolbar
-    implementation Deps.mozilla_concept_tabstray
+    implementation FenixDependencies.mozilla_browser_domains
+    implementation FenixDependencies.mozilla_browser_icons
+    implementation FenixDependencies.mozilla_browser_menu
+    implementation FenixDependencies.mozilla_browser_menu2
+    implementation FenixDependencies.mozilla_browser_session_storage
+    implementation FenixDependencies.mozilla_browser_state
+    implementation FenixDependencies.mozilla_browser_storage_sync
+    implementation FenixDependencies.mozilla_browser_tabstray
+    implementation FenixDependencies.mozilla_browser_thumbnails
+    implementation FenixDependencies.mozilla_browser_toolbar
 
-    implementation Deps.mozilla_browser_awesomebar
-    implementation Deps.mozilla_feature_downloads
-    implementation Deps.mozilla_browser_domains
-    implementation Deps.mozilla_browser_icons
-    implementation Deps.mozilla_browser_menu
-    implementation Deps.mozilla_browser_menu2
-    implementation Deps.mozilla_browser_search
-    implementation Deps.mozilla_browser_session
-    implementation Deps.mozilla_browser_session_storage
-    implementation Deps.mozilla_browser_state
-    implementation Deps.mozilla_browser_storage_sync
-    implementation Deps.mozilla_browser_tabstray
-    implementation Deps.mozilla_browser_thumbnails
-    implementation Deps.mozilla_browser_toolbar
+    implementation FenixDependencies.mozilla_feature_addons
+    implementation FenixDependencies.mozilla_feature_accounts
+    implementation FenixDependencies.mozilla_feature_app_links
+    implementation FenixDependencies.mozilla_feature_autofill
+    implementation FenixDependencies.mozilla_feature_awesomebar
+    implementation FenixDependencies.mozilla_feature_contextmenu
+    implementation FenixDependencies.mozilla_feature_customtabs
+    implementation FenixDependencies.mozilla_feature_downloads
+    implementation FenixDependencies.mozilla_feature_intent
+    implementation FenixDependencies.mozilla_feature_media
+    implementation FenixDependencies.mozilla_feature_prompts
+    implementation FenixDependencies.mozilla_feature_push
+    implementation FenixDependencies.mozilla_feature_privatemode
+    implementation FenixDependencies.mozilla_feature_pwa
+    implementation FenixDependencies.mozilla_feature_qr
+    implementation FenixDependencies.mozilla_feature_search
+    implementation FenixDependencies.mozilla_feature_session
+    implementation FenixDependencies.mozilla_feature_syncedtabs
+    implementation FenixDependencies.mozilla_feature_toolbar
+    implementation FenixDependencies.mozilla_feature_tabs
+    implementation FenixDependencies.mozilla_feature_findinpage
+    implementation FenixDependencies.mozilla_feature_logins
+    implementation FenixDependencies.mozilla_feature_site_permissions
+    implementation FenixDependencies.mozilla_feature_readerview
+    implementation FenixDependencies.mozilla_feature_tab_collections
+    implementation FenixDependencies.mozilla_feature_recentlyclosed
+    implementation FenixDependencies.mozilla_feature_top_sites
+    implementation FenixDependencies.mozilla_feature_share
+    implementation FenixDependencies.mozilla_feature_accounts_push
+    implementation FenixDependencies.mozilla_feature_webauthn
+    implementation FenixDependencies.mozilla_feature_webcompat
+    implementation FenixDependencies.mozilla_feature_webnotifications
+    implementation FenixDependencies.mozilla_feature_webcompat_reporter
 
-    implementation Deps.mozilla_support_extensions
-    implementation Deps.mozilla_feature_addons
+    implementation FenixDependencies.mozilla_service_pocket
+    implementation FenixDependencies.mozilla_service_contile
+    implementation FenixDependencies.mozilla_service_digitalassetlinks
+    implementation FenixDependencies.mozilla_service_sync_autofill
+    implementation FenixDependencies.mozilla_service_sync_logins
+    implementation FenixDependencies.mozilla_service_firefox_accounts
+    implementation(FenixDependencies.mozilla_service_glean)
+    implementation FenixDependencies.mozilla_service_location
+    implementation FenixDependencies.mozilla_service_nimbus
 
-    implementation Deps.mozilla_feature_accounts
-    implementation Deps.mozilla_feature_app_links
-    implementation Deps.mozilla_feature_autofill
-    implementation Deps.mozilla_feature_awesomebar
-    implementation Deps.mozilla_feature_contextmenu
-    implementation Deps.mozilla_feature_customtabs
-    implementation Deps.mozilla_feature_downloads
-    implementation Deps.mozilla_feature_intent
-    implementation Deps.mozilla_feature_media
-    implementation Deps.mozilla_feature_prompts
-    implementation Deps.mozilla_feature_push
-    implementation Deps.mozilla_feature_privatemode
-    implementation Deps.mozilla_feature_pwa
-    implementation Deps.mozilla_feature_qr
-    implementation Deps.mozilla_feature_search
-    implementation Deps.mozilla_feature_session
-    implementation Deps.mozilla_feature_syncedtabs
-    implementation Deps.mozilla_feature_toolbar
-    implementation Deps.mozilla_feature_tabs
-    implementation Deps.mozilla_feature_findinpage
-    implementation Deps.mozilla_feature_logins
-    implementation Deps.mozilla_feature_site_permissions
-    implementation Deps.mozilla_feature_readerview
-    implementation Deps.mozilla_feature_tab_collections
-    implementation Deps.mozilla_feature_recentlyclosed
-    implementation Deps.mozilla_feature_top_sites
-    implementation Deps.mozilla_feature_share
-    implementation Deps.mozilla_feature_accounts_push
-    implementation Deps.mozilla_feature_webauthn
-    implementation Deps.mozilla_feature_webcompat
-    implementation Deps.mozilla_feature_webnotifications
-    implementation Deps.mozilla_feature_webcompat_reporter
+    implementation FenixDependencies.mozilla_support_extensions
+    implementation FenixDependencies.mozilla_support_base
+    implementation FenixDependencies.mozilla_support_rusterrors
+    implementation FenixDependencies.mozilla_support_images
+    implementation FenixDependencies.mozilla_support_ktx
+    implementation FenixDependencies.mozilla_support_rustlog
+    implementation FenixDependencies.mozilla_support_utils
+    implementation FenixDependencies.mozilla_support_locale
 
-    implementation Deps.mozilla_service_digitalassetlinks
-    implementation Deps.mozilla_service_sync_autofill
-    implementation Deps.mozilla_service_sync_logins
-    implementation Deps.mozilla_service_firefox_accounts
-    implementation Deps.mozilla_service_glean
-    implementation Deps.mozilla_service_location
-    implementation Deps.mozilla_service_nimbus
+    implementation FenixDependencies.mozilla_ui_colors
+    implementation FenixDependencies.mozilla_ui_icons
+    implementation FenixDependencies.mozilla_lib_publicsuffixlist
+    implementation FenixDependencies.mozilla_ui_widgets
+    implementation FenixDependencies.mozilla_ui_tabcounter
 
-    implementation Deps.mozilla_support_base
-    implementation Deps.mozilla_support_images
-    implementation Deps.mozilla_support_ktx
-    implementation Deps.mozilla_support_rustlog
-    implementation Deps.mozilla_support_utils
-    implementation Deps.mozilla_support_locale
+    implementation FenixDependencies.mozilla_lib_crash
+    implementation FenixDependencies.lib_crash_sentry
+    implementation FenixDependencies.mozilla_lib_push_firebase
+    implementation FenixDependencies.mozilla_lib_state
+    implementation FenixDependencies.mozilla_lib_dataprotect
+    debugImplementation FenixDependencies.leakcanary
 
-    implementation Deps.mozilla_support_migration
+    implementation FenixDependencies.androidx_annotation
+    implementation FenixDependencies.androidx_compose_ui
+    implementation FenixDependencies.androidx_compose_ui_tooling
+    implementation FenixDependencies.androidx_compose_foundation
+    implementation FenixDependencies.androidx_compose_material
+    implementation FenixDependencies.androidx_legacy
+    implementation FenixDependencies.androidx_biometric
+    implementation FenixDependencies.androidx_paging
+    implementation FenixDependencies.androidx_preference
+    implementation FenixDependencies.androidx_fragment
+    implementation FenixDependencies.androidx_navigation_fragment
+    implementation FenixDependencies.androidx_navigation_ui
+    implementation FenixDependencies.androidx_recyclerview
+    implementation FenixDependencies.androidx_lifecycle_common
+    implementation FenixDependencies.androidx_lifecycle_livedata
+    implementation FenixDependencies.androidx_lifecycle_process
+    implementation FenixDependencies.androidx_lifecycle_runtime
+    implementation FenixDependencies.androidx_lifecycle_viewmodel
+    implementation FenixDependencies.androidx_core
+    implementation FenixDependencies.androidx_core_ktx
+    implementation FenixDependencies.androidx_transition
+    implementation FenixDependencies.androidx_work_ktx
+    implementation FenixDependencies.androidx_datastore
+    implementation FenixDependencies.protobuf_javalite
+    implementation FenixDependencies.google_material
 
-    implementation Deps.mozilla_ui_colors
-    implementation Deps.mozilla_ui_icons
-    implementation Deps.mozilla_lib_publicsuffixlist
-    implementation Deps.mozilla_ui_widgets
-    implementation Deps.mozilla_ui_tabcounter
+    implementation FenixDependencies.adjust
+    implementation FenixDependencies.installreferrer // Required by Adjust
 
-    implementation Deps.mozilla_lib_crash
-    implementation Deps.mozilla_lib_push_firebase
-    implementation Deps.mozilla_lib_dataprotect
-    debugImplementation Deps.leakcanary
+    implementation FenixDependencies.google_ads_id // Required for the Google Advertising ID
 
-    implementation Deps.androidx_legacy
-    implementation Deps.androidx_biometric
-    implementation Deps.androidx_paging
-    implementation Deps.androidx_preference
-    implementation Deps.androidx_fragment
-    implementation Deps.androidx_navigation_fragment
-    implementation Deps.androidx_navigation_ui
-    implementation Deps.androidx_recyclerview
-    implementation Deps.androidx_lifecycle_livedata
-    implementation Deps.androidx_lifecycle_runtime
-    implementation Deps.androidx_lifecycle_viewmodel
-    implementation Deps.androidx_core
-    implementation Deps.androidx_core_ktx
-    implementation Deps.androidx_transition
-    implementation Deps.androidx_work_ktx
-    implementation Deps.google_material
+    // Required for in-app reviews
+    implementation FenixDependencies.google_play_review
+    implementation FenixDependencies.google_play_review_ktx
 
-    implementation Deps.adjust
-    implementation Deps.installreferrer // Required by Adjust
-
-    implementation Deps.google_ads_id // Required for the Google Advertising ID
-
-    implementation Deps.google_play_store // Required for in-app reviews
-
-    androidTestImplementation Deps.uiautomator
-// Removed pending AndroidX fixes
+    androidTestImplementation FenixDependencies.uiautomator
     androidTestImplementation "tools.fastlane:screengrab:2.0.0"
-//    androidTestImplementation "br.com.concretesolutions:kappuccino:1.2.1"
+    // This Falcon version is added to maven central now required for Screengrab
+    implementation 'com.jraska:falcon:2.2.0'
 
-    androidTestImplementation Deps.espresso_core, {
+    androidTestImplementation FenixDependencies.androidx_compose_ui_test
+
+    androidTestImplementation FenixDependencies.espresso_core, {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
 
-    androidTestImplementation(Deps.espresso_contrib) {
+    androidTestImplementation(FenixDependencies.espresso_contrib) {
         exclude module: 'appcompat-v7'
         exclude module: 'support-v4'
         exclude module: 'support-annotations'
         exclude module: 'recyclerview-v7'
         exclude module: 'design'
         exclude module: 'espresso-core'
+        exclude module: 'protobuf-lite'
     }
 
-    androidTestImplementation Deps.androidx_test_core
-    androidTestImplementation Deps.espresso_idling_resources
-    androidTestImplementation Deps.espresso_intents
+    androidTestImplementation FenixDependencies.androidx_test_core
+    androidTestImplementation FenixDependencies.espresso_idling_resources
+    androidTestImplementation FenixDependencies.espresso_intents
 
-    androidTestImplementation Deps.tools_test_runner
-    androidTestImplementation Deps.tools_test_rules
-    androidTestUtil Deps.orchestrator
-    androidTestImplementation Deps.espresso_core, {
+    androidTestImplementation FenixDependencies.tools_test_runner
+    androidTestImplementation FenixDependencies.tools_test_rules
+    androidTestUtil FenixDependencies.orchestrator
+    androidTestImplementation FenixDependencies.espresso_core, {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
 
-    androidTestImplementation Deps.androidx_junit
-    androidTestImplementation Deps.androidx_work_testing
-    androidTestImplementation Deps.mockwebserver
-    testImplementation Deps.mozilla_support_test
-    testImplementation Deps.mozilla_support_test_libstate
-    testImplementation Deps.androidx_junit
-    testImplementation Deps.androidx_work_testing
-    testImplementation (Deps.robolectric) {
+    androidTestImplementation FenixDependencies.androidx_junit
+    androidTestImplementation FenixDependencies.androidx_test_extensions
+    androidTestImplementation FenixDependencies.androidx_work_testing
+    androidTestImplementation FenixDependencies.androidx_benchmark_junit4
+    androidTestImplementation FenixDependencies.mockwebserver
+    testImplementation FenixDependencies.mozilla_support_test
+    testImplementation FenixDependencies.mozilla_support_test_libstate
+    testImplementation FenixDependencies.androidx_junit
+    testImplementation FenixDependencies.androidx_test_extensions
+    testImplementation FenixDependencies.androidx_work_testing
+    testImplementation (FenixDependencies.robolectric) {
         exclude group: 'org.apache.maven'
     }
 
     testImplementation 'org.apache.maven:maven-ant-tasks:2.1.3'
-    implementation Deps.mozilla_support_rusthttp
+    implementation FenixDependencies.mozilla_support_rusthttp
 
-    testImplementation Deps.mockk
+    androidTestImplementation FenixDependencies.mockk_android
+    testImplementation FenixDependencies.mockk
 
     // For the initial release of Glean 19, we require consumer applications to
     // depend on a separate library for unit tests. This will be removed in future releases.
-    testImplementation "org.mozilla.telemetry:glean-forUnitTests:${project.ext.glean_version}"
+    testImplementation "org.mozilla.telemetry:glean-native-forUnitTests:${project.ext.glean_version}"
 
     lintChecks project(":mozilla-lint-rules")
 }
 
+protobuf {
+    // Mac M1 workaround until we can bump the version. Dependent on A-S.
+    // See https://github.com/mozilla-mobile/fenix/issues/22321
+    protoc {
+        if (osdetector.os == "osx") {
+            artifact = "${FenixDependencies.protobuf_compiler}:osx-x86_64"
+        } else {
+            artifact = FenixDependencies.protobuf_compiler
+        }
+    }
+
+    // Generates the java Protobuf-lite code for the Protobufs in this project. See
+    // https://github.com/google/protobuf-gradle-plugin#customizing-protobuf-compilation
+    // for more information.
+    generateProtoTasks {
+        all().each { task ->
+            task.builtins {
+                java {
+                    option 'lite'
+                }
+            }
+        }
+    }
+}
+
 if (project.hasProperty("coverage")) {
     tasks.withType(Test).configureEach {
         jacoco.includeNoLocationClasses = true
+        jacoco.excludes = ['jdk.internal.*']
+    }
+
+    jacoco {
+        toolVersion = "0.8.7"
     }
 
     android.applicationVariants.all { variant ->
@@ -739,14 +838,37 @@ if (gradle.hasProperty('localProperties.dependencySubstitutions.geckoviewTopsrcd
     apply from: "${topsrcdir}/substitute-local-geckoview.gradle"
 }
 
+def acSrcDir = null
 if (gradle.hasProperty('localProperties.autoPublish.android-components.dir')) {
-    ext.acSrcDir = gradle."localProperties.autoPublish.android-components.dir"
-    apply from: "../${acSrcDir}/substitute-local-ac.gradle"
+  acSrcDir = gradle.getProperty('localProperties.autoPublish.android-components.dir')
+} else if (gradle.hasProperty('localProperties.branchBuild.android-components.dir')) {
+  acSrcDir = gradle.getProperty('localProperties.branchBuild.android-components.dir')
+}
+if (acSrcDir) {
+    if (acSrcDir.startsWith("/")) {
+        apply from: "${acSrcDir}/substitute-local-ac.gradle"
+    } else {
+        apply from: "../${acSrcDir}/substitute-local-ac.gradle"
+    }
 }
 
+def appServicesSrcDir = null
 if (gradle.hasProperty('localProperties.autoPublish.application-services.dir')) {
-    ext.appServicesSrcDir = gradle."localProperties.autoPublish.application-services.dir"
-    apply from: "../${appServicesSrcDir}/build-scripts/substitute-local-appservices.gradle"
+  appServicesSrcDir = gradle.getProperty('localProperties.autoPublish.application-services.dir')
+} else if (gradle.hasProperty('localProperties.branchBuild.application-services.dir')) {
+  appServicesSrcDir = gradle.getProperty('localProperties.branchBuild.application-services.dir')
+}
+if (appServicesSrcDir) {
+    if (appServicesSrcDir.startsWith("/")) {
+        apply from: "${appServicesSrcDir}/build-scripts/substitute-local-appservices.gradle"
+    } else {
+        apply from: "../${appServicesSrcDir}/build-scripts/substitute-local-appservices.gradle"
+    }
+}
+
+if (gradle.hasProperty('localProperties.autoPublish.glean.dir')) {
+    ext.gleanSrcDir = gradle."localProperties.autoPublish.glean.dir"
+    apply from: "../${gleanSrcDir}/build-scripts/substitute-local-glean.gradle"
 }
 
 // Define a reusable task for updating the versions of our built-in web extensions. We automate this
@@ -769,13 +891,13 @@ ext.updateExtensionVersion = { task, extDir ->
     }
 }
 
-tasks.register("updateAdsExtensionVersion", Copy) { task ->
-    updateExtensionVersion(task, 'src/main/assets/extensions/ads')
+android.applicationVariants.all { variant ->
+    tasks.register("apkSize${variant.name.capitalize()}", ApkSizeTask) {
+        variantName = variant.name
+        apks = variant.outputs.collect { output -> output.outputFile.name }
+        dependsOn "package${variant.name.capitalize()}"
+    }
 }
 
-tasks.register("updateCookiesExtensionVersion", Copy) { task ->
-    updateExtensionVersion(task, 'src/main/assets/extensions/cookies')
-}
-
-preBuild.dependsOn "updateAdsExtensionVersion"
-preBuild.dependsOn "updateCookiesExtensionVersion"
+// Enable expiration by major version.
+ext.gleanExpireByVersion = Config.majorVersion(project)

app/lint.xml

@@ -14,7 +14,7 @@
     <issue id="PluralsCandidate" severity="ignore" />
     <issue id="StringFormatCount" severity="ignore" />
     <issue id="TypographyEllipsis" severity="ignore" />
-    <issue id="ExtraTranslation" severity="warning" />
+    <issue id="ExtraTranslation" severity="ignore" />
 
     <!-- Lints that are disabled by default -->
     <issue id="ConvertToWebp" severity="warning" />
@@ -50,7 +50,11 @@
     <!-- Performance: checks we'd like to eventually set to error. -->
     <issue id="UseCompoundDrawables" severity="warning" />
     <issue id="Overdraw" severity="warning" />
-    <issue id="UnusedResources" severity="warning" />
+    <issue id="UnusedResources" severity="error">
+        <!-- Using an automated process to remove localized strings after they are removed from the default strings.xml
+        means the files for localized strings will contain unused resources for a few days after the original removal operation. -->
+        <ignore path="**/values-*/strings.xml" />
+    </issue>
 
     <!-- Performance: checks that we're unsure of the value of that we might want to investigate. -->
     <issue id="UnpackedNativeCode" severity="informational" />

app/pings.yaml

@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 ---
-$schema: moz://mozilla.org/schemas/glean/pings/1-0-0
+$schema: moz://mozilla.org/schemas/glean/pings/2-0-0
 
 activation:
   description: |
@@ -17,7 +17,7 @@ activation:
   data_reviews:
     - https://github.com/mozilla-mobile/fenix/pull/1707#issuecomment-486972209
   notification_emails:
-    - fenix-core@mozilla.com
+    - android-probes@mozilla.com
 
 first-session:
   description: |
@@ -29,25 +29,36 @@ first-session:
   data_reviews:
     - https://github.com/mozilla-mobile/fenix/pull/8074#issuecomment-586512202
   notification_emails:
-    - fenix-core@mozilla.com
+    - android-probes@mozilla.com
 
-startup-timeline:
+topsites-impression:
   description: |
-    This ping is intended to provide an understanding of startup performance.
-
-    In addition to being captured on real devices, the ping data was prematurely
-    optimized into this separate ping to be isolated from other metrics to be
-    more easily captured by performance testing automation but that hasn't
-    happened in practice. We would have removed it but implementation
-    details don't make that possible:
-    https://github.com/mozilla-mobile/fenix/issues/17972#issuecomment-781002987
-  include_client_id: true
+    Recorded when a sponsored top site is rendered and visible on the home
+    screen. Visibility is qualified as when the homepage is brought to the
+    front of the Browser, and sponsored tiles are 100% visible on screen.
+  include_client_id: false
   bugs:
-    - https://github.com/mozilla-mobile/fenix/issues/8803
-    - https://github.com/mozilla-mobile/fenix/issues/17972
+    - https://github.com/mozilla-mobile/fenix/issues/23893
   data_reviews:
-    - https://github.com/mozilla-mobile/fenix/pull/9788#pullrequestreview-394228626
-    - https://github.com/mozilla-mobile/fenix/pull/18043#issue-575389284
+    - https://github.com/mozilla-mobile/fenix/pull/23945
   notification_emails:
-    - perf-android-fe@mozilla.com
-    - mcomella@mozilla.com
+    - android-probes@mozilla.com
+
+spoc:
+  description: |
+    Contains data identifying with which Pocket sponsored story the user
+    interacted with and the type of interaction: story impression or click.
+  include_client_id: false
+  reasons:
+    impression: |
+      A sponsored story had more than 50% of it's content visible
+      on the screen.
+    click: |
+      A sponsored story was clicked by the user.
+  bugs:
+    - https://github.com/mozilla-mobile/fenix/issues/27549
+    - https://mozilla-hub.atlassian.net/browse/FNXV2-21791
+  data_reviews:
+    - https://github.com/mozilla-mobile/fenix/pull/27550#issuecomment-1295027631
+  notification_emails:
+    - android-probes@mozilla.com

app/proguard-android-optimize-3.5.0-modified.txt

@@ -1,120 +0,0 @@
-####################################################################################################
-# Copy of `proguard-android-optimize.txt`.
-# We need to _remove_ some of the configuration, so the only way to achieve that is to dump it here
-# and modify it.
-####################################################################################################
-
-# This is a configuration file for ProGuard.
-# http://proguard.sourceforge.net/index.html#manual/usage.html
-#
-# Starting with version 2.2 of the Android plugin for Gradle, this file is distributed together with
-# the plugin and unpacked at build-time. The files in $ANDROID_HOME are no longer maintained and
-# will be ignored by new version of the Android plugin for Gradle.
-
-# Optimizations: If you don't want to optimize, use the proguard-android.txt configuration file
-# instead of this one, which turns off the optimization flags.
-# Adding optimization introduces certain risks, since for example not all optimizations performed by
-# ProGuard works on all versions of Dalvik.  The following flags turn off various optimizations
-# known to have issues, but the list may not be complete or up to date. (The "arithmetic"
-# optimization can be used if you are only targeting Android 2.0 or later.)  Make sure you test
-# thoroughly if you go this route.
--optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/*
--optimizationpasses 5
-
--dontusemixedcaseclassnames
--dontskipnonpubliclibraryclasses
--verbose
-
-# Preserve some attributes that may be required for reflection.
--keepattributes *Annotation*,Signature,InnerClasses,EnclosingMethod
-
--keep public class com.google.vending.licensing.ILicensingService
--keep public class com.android.vending.licensing.ILicensingService
--keep public class com.google.android.vending.licensing.ILicensingService
--dontnote com.android.vending.licensing.ILicensingService
--dontnote com.google.vending.licensing.ILicensingService
--dontnote com.google.android.vending.licensing.ILicensingService
-
-# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native
--keepclasseswithmembernames class * {
-    native <methods>;
-}
-
-# Keep setters in Views so that animations can still work.
--keepclassmembers public class * extends android.view.View {
-    void set*(***);
-    *** get*();
-}
-
-# We want to keep methods in Activity that could be used in the XML attribute onClick.
--keepclassmembers class * extends android.app.Activity {
-    public void *(android.view.View);
-}
-
-# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
--keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
-
--keepclassmembers class * implements android.os.Parcelable {
-    public static final ** CREATOR;
-}
-
--keepclassmembers class **.R$* {
-    public static <fields>;
-}
-
-# Preserve annotated Javascript interface methods.
--keepclassmembers class * {
-    @android.webkit.JavascriptInterface <methods>;
-}
-
-# The support libraries contains references to newer platform versions.
-# Don't warn about those in case this app is linking against an older
-# platform version. We know about them, and they are safe.
--dontnote android.support.**
--dontnote androidx.**
--dontwarn android.support.**
--dontwarn androidx.**
-
-# This class is deprecated, but remains for backward compatibility.
--dontwarn android.util.FloatMath
-
-# Understand the @Keep support annotation.
--keep class android.support.annotation.Keep
--keep class androidx.annotation.Keep
-
--keep @android.support.annotation.Keep class * {*;}
--keep @androidx.annotation.Keep class * {*;}
-
--keepclasseswithmembers class * {
-    @android.support.annotation.Keep <methods>;
-}
-
--keepclasseswithmembers class * {
-    @androidx.annotation.Keep <methods>;
-}
-
--keepclasseswithmembers class * {
-    @android.support.annotation.Keep <fields>;
-}
-
--keepclasseswithmembers class * {
-    @androidx.annotation.Keep <fields>;
-}
-
--keepclasseswithmembers class * {
-    @android.support.annotation.Keep <init>(...);
-}
-
--keepclasseswithmembers class * {
-    @androidx.annotation.Keep <init>(...);
-}
-
-# These classes are duplicated between android.jar and org.apache.http.legacy.jar.
--dontnote org.apache.http.**
--dontnote android.net.http.**
-
-# These classes are duplicated between android.jar and core-lambda-stubs.jar.
--dontnote java.lang.invoke.**

app/proguard-rules.pro

@@ -32,17 +32,20 @@
 -keep class org.mozilla.gecko.util.DebugConfig { *; }
 
 ####################################################################################################
-# Force removal of slow Dispatchers.Main ServiceLoader
+# kotlinx.coroutines: use the fast service loader to init MainDispatcherLoader by including a rule
+# to rewrite this property to return true:
+# https://github.com/Kotlin/kotlinx.coroutines/blob/8c98180f177bbe4b26f1ed9685a9280fea648b9c/kotlinx-coroutines-core/jvm/src/internal/MainDispatchers.kt#L19
+#
+# R8 is expected to optimize the default implementation to avoid a performance issue but a bug in R8
+# as bundled with AGP v7.0.0 causes this optimization to fail so we use the fast service loader instead. See:
+# https://github.com/mozilla-mobile/focus-android/issues/5102#issuecomment-897854121
+#
+# The fast service loader appears to be as performant as the R8 optimization so it's not worth the
+# churn to later remove this workaround. If needed, the upstream fix is being handled in
+# https://issuetracker.google.com/issues/196302685
 ####################################################################################################
-# Allow R8 to optimize away the FastServiceLoader.
-# Together with ServiceLoader optimization in R8
-# this results in direct instantiation when loading Dispatchers.Main
 -assumenosideeffects class kotlinx.coroutines.internal.MainDispatcherLoader {
-    boolean FAST_SERVICE_LOADER_ENABLED return false;
-}
-
--assumenosideeffects class kotlinx.coroutines.internal.FastServiceLoader {
-    boolean ANDROID_DETECTED return true;
+    boolean FAST_SERVICE_LOADER_ENABLED return true;
 }
 
 ####################################################################################################

app/sampledata/migration_items

@@ -1,5 +0,0 @@
-History
-Bookmarks
-Logins
-Open Tabs
-Settings

app/src/androidTest/assets/pages/addressForm.html

@@ -0,0 +1,16 @@
+<html>
+<head>
+    <meta name="viewport" content="width=device-width">
+    <title>Address_Form</title>
+</head>
+<body>
+    <form>
+    <p>Street Address: <input id="streetAddress" type="text"></p>
+    <p>City: <input id="city" type="text"></p>
+    <p>Zip Code: <input id="zipCode" type="text"></p>
+    <p>Country: <input id="country" type="text"></p>
+    <p>Telephone: <input id="telephone" type="text"></p>
+    <p>Email: <input id="email" type="text"></p>
+    </form>
+</body>
+</html>

app/src/androidTest/assets/pages/audioMediaPage.html

@@ -9,18 +9,5 @@
         <source src="../resources/audioSample.mp3">
     </audio>
 </div>
-<div class="playbackState">
-</div>
-<script>
-        const audio = document.querySelector('audio');
-
-        audio.addEventListener('playing', (event) => {
-          document.querySelector('.playbackState').innerText="Media file is playing"
-        });
-
-		audio.addEventListener('pause', (event) => {
-          document.querySelector('.playbackState').innerText="Media file is paused"
-        });
-</script>
 </body>
 </html>

app/src/androidTest/assets/pages/creditCardForm.html

@@ -0,0 +1,13 @@
+<html>
+<head>
+    <meta name="viewport" content="width=device-width">
+    <title>Credit_Card_Form</title>
+</head>
+<body>
+    <form>
+    <p>Card information</p>
+    <p>Card Number: <input id="cardNumber" type="text" placeholder="1234 1234 1234 1234"></p>
+    <p>Name on card: <input id="nameOnCard"type="text" placeholder="Name on card"></p>
+    </form>
+</body>
+</html>

app/src/androidTest/assets/pages/cross-site-cookies.html

@@ -0,0 +1,8 @@
+<html>
+<body>
+<h2>Cross-site cookies storage access test</h2>
+<h3>anti-tracker-test.com</h3>
+<h4>different site, cross-origin iframe</h4>
+<iframe width=500 height=1000 src="https://mozilla-mobile.github.io/testapp/anti-tracker-test_set_storage_with_sa_api.html"></iframe>
+</body>
+</html>

app/src/androidTest/assets/pages/download.html

@@ -1,10 +0,0 @@
-<html>
-<body>
-    <a id="link" href="../resources/Globe.svg" download>Page content: Globe.svg</a>
-    <script>
-        (function() {
-           document.getElementById("link").click()
-         })();
-    </script>
-</body>
-</html>

app/src/androidTest/assets/pages/externalLinks.html

@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Html_Control_Form</title>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width">
+</head>
+
+<p>Misc Link Types</p>
+<section>
+    <a href="https://duckduckgo.com/">External link</a>
+</section>
+
+<section>
+    <a href="mailto://example@example.com">Email link</a>
+</section>
+
+<section>
+    <a href="tel://1234567890">Telephone link</a>
+</section>
+
+</html>

app/src/androidTest/assets/pages/generic3.html

@@ -5,6 +5,9 @@
 <body>
 <h1>
     <p id="testContent">Page content: 3</p>
+    <p>
+        <a href="https://play.google.com/store/apps/details?id=org.mozilla.fenix">Mozilla Playstore link</a>
+    </p>
 </h1>
 </body>
 </html>

app/src/androidTest/assets/pages/generic4.html

@@ -1,5 +1,6 @@
 <html>
 <head>
+    <meta name="viewport" content="width=device-width" />
     <title>Test_Page_4</title>
 </head>
 <body>

app/src/androidTest/assets/pages/htmlControls.html

@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Html_Control_Form</title>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width">
+</head>
+
+<p>Calendar Form</p>
+<section>
+    <input type="date" id="calendar">
+    <button onclick="printDate()" id="submitDate"> Submit date </button>
+    <div id="displayDate"></div>
+</section>
+
+<p>Clock Form</p>
+<section>
+    <input type="time" id="clock">
+    <button onclick="printTime()" id="submitTime"> Submit time </button>
+    <div id="displayTime"></div>
+</section>
+
+<p>Color Form</p>
+<section>
+    <input type="color" id="colorPicker">
+    <button onclick="printColor()" id="submitColor"> Submit color </button>
+    <div id="displayColor"></div>
+</section>
+
+<p>Drop-down Form</p>
+<select id="dropDown">
+    <option type="text" text="The Only Ones">The Only Ones</option>
+    <option type="text" text="The National">The National</option>
+</select>
+<button onclick="printOption()" id="submitOption"> Submit drop down option </button>
+<div id="displayOption"></div>
+
+<script>
+    function printOption() {
+      let dropDown = document.querySelector("#dropDown");
+      let displayOption = document.querySelector("#displayOption");
+
+      displayOption.innerHTML = "Selected option is: " + dropDown.value;
+    }
+  </script>
+
+<script>
+    function printDate() {
+      let calendar = document.querySelector("#calendar");
+      let displayDate = document.querySelector("#displayDate");
+
+      displayDate.innerHTML = "Selected date is: " + calendar.value;
+    }
+  </script>
+
+
+<script>
+    function printTime() {
+      let time = document.querySelector("#clock");
+      let displayTime = document.querySelector("#displayTime");
+
+      displayTime.innerHTML = "Selected time is: " + time.value;
+    }
+  </script>
+
+<script>
+    function printColor() {
+      let colorPicker = document.querySelector("#colorPicker");
+      let displayColor = document.querySelector("#displayColor");
+
+      displayColor.innerHTML = "Selected color is: " + colorPicker.value;
+    }
+  </script>
+</html>

app/src/androidTest/assets/pages/storage_check.html

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<meta name="viewport" content="width=device-width">
+<body>
+
+<h1>Storage check</h1>
+
+<script type="text/javascript">
+    if (sessionStorage.getItem('sessionTest') == 'session storage') {
+        document.write('<p>Session storage has value</p>');
+    } else {
+        document.write('<p>Session storage empty</p>');
+    }
+
+    if (localStorage.getItem('localTest') == 'local storage') {
+        document.write('<p>Local storage has value</p>');
+    } else {
+        document.write('<p>Local storage empty</p>');
+    }
+</script>
+
+</body>
+</html>

app/src/androidTest/assets/pages/storage_write.html

@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<meta name="viewport" content="width=device-width">
+<body>
+
+<h1>Storage Write</h1>
+
+<p id="cookies"></p>
+<button id="setCookies">Set cookies</button>
+
+<script type="text/javascript">
+    (function() {
+       document.getElementById("cookies").textContent = document.cookie?document.cookie:"No cookies set";
+    })();
+
+    document.getElementById("setCookies").addEventListener("click", function() {
+        document.cookie = "user=android";
+        document.getElementById("cookies").textContent = document.cookie;
+    });
+
+    sessionStorage.setItem('sessionTest', 'session storage');
+    localStorage.setItem('localTest', 'local storage');
+
+    document.write('<p>Values written to storage</p>');
+</script>
+
+</body>
+</html>

app/src/androidTest/assets/pages/trackingPage.html

@@ -13,31 +13,31 @@
     <h3>Level 1 (Basic) List</h3>
     <p>social-track-digest256:</p>
     <img
-            src="https://social-track-digest256.dummytracker.org/test_not_blocked.png"
-            onerror="this.onerror=null;this.src='https://not-a-tracker.dummytracker.org/test_blocked.png'">
+            src="https://social-track-digest256.dummytracker.org/test_not_blocked.png" alt="social not blocked"
+            onerror="this.onerror=null;this.src='https://not-a-tracker.dummytracker.org/test_blocked.png';this.alt='social blocked'">
     <br/>
     <p>ads-track-digest256:</p>
     <img
             src="https://ads-track-digest256.dummytracker.org/test_not_blocked.png"
-            onerror="this.onerror=null;this.src='https://not-a-tracker.dummytracker.org/test_blocked.png'">
+            onerror="this.onerror=null;this.src='https://not-a-tracker.dummytracker.org/test_blocked.png';this.alt='ads blocked'">
     <br/>
     <p>analytics-track-digest256:</p>
     <img
             src="https://analytics-track-digest256.dummytracker.org/test_not_blocked.png"
-            onerror="this.onerror=null;this.src='https://not-a-tracker.dummytracker.org/test_blocked.png'">
+            onerror="this.onerror=null;this.src='https://not-a-tracker.dummytracker.org/test_blocked.png';this.alt='analytics blocked'">
     <br/>
     <p>Fingerprinting:
     <pre id="result">test not run</pre>
     <script src="https://base-fingerprinting-track-digest256.dummytracker.org/tracker.js"
-            onerror="this.onerror=null;var result=document.getElementById('result');result.innerHTML='blocked';"
-            onload="this.onload=null;var result=document.getElementById('result');result.innerHTML='NOT blocked';"
+            onerror="this.onerror=null;var result=document.getElementById('result');result.innerHTML='Fingerprinting blocked';"
+            onload="this.onload=null;var result=document.getElementById('result');result.innerHTML='Fingerprinting NOT blocked';"
     ></script>
     </p>
     <br/>
     <p>Cryptomining:
       <img
-              src="https://base-cryptomining-track-digest256.dummytracker.org/test_not_blocked.png" alt="not blocked"
-              onerror="this.onerror=null;this.src='https://not-a-tracker.dummytracker.org/test_blocked.png';this.alt='blocked'">
+              src="https://base-cryptomining-track-digest256.dummytracker.org/test_not_blocked.png" alt="Cryptomining not blocked"
+              onerror="this.onerror=null;this.src='https://not-a-tracker.dummytracker.org/test_blocked.png';this.alt='Cryptomining blocked'">
     </p>
 
     <p><b>Cookie blocking</b>

app/src/androidTest/assets/pages/videoMediaPage.html

@@ -1,26 +1,14 @@
 <html>
 <head>
     <title>Video_Test_Page</title>
+    <meta name="viewport" content="width=device-width">
 </head>
 <body>
 <p id="testContent">Page content: video player</p>
 <div id="video-container">
     <video id="videoSample" width="320" height="240" controls loop>
-            <source src="../resources/videoSample.webm">
+        <source src="../resources/clip.mp4">
     </video>
 </div>
-<div class="playbackState">
-</div>
-<script>
-        const video = document.querySelector('video');
-
-        video.addEventListener('playing', (event) => {
-          document.querySelector('.playbackState').innerText="Media file is playing";
-        });
-
-		video.addEventListener('pause', (event) => {
-          document.querySelector('.playbackState').innerHTML="Media file is paused";
-        });
-</script>
 </body>
 </html>

app/src/androidTest/assets/resources/Globe.svg

@@ -1,4 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill="context-fill" d="M8 0a8 8 0 1 0 8 8 8.009 8.009 0 0 0-8-8zm5.163 4.958h-1.552a7.7 7.7 0 0 0-1.051-2.376 6.03 6.03 0 0 1 2.603 2.376zM14 8a5.963 5.963 0 0 1-.335 1.958h-1.821A12.327 12.327 0 0 0 12 8a12.327 12.327 0 0 0-.156-1.958h1.821A5.963 5.963 0 0 1 14 8zm-6 6c-1.075 0-2.037-1.2-2.567-2.958h5.135C10.037 12.8 9.075 14 8 14zM5.174 9.958a11.084 11.084 0 0 1 0-3.916h5.651A11.114 11.114 0 0 1 11 8a11.114 11.114 0 0 1-.174 1.958zM2 8a5.963 5.963 0 0 1 .335-1.958h1.821a12.361 12.361 0 0 0 0 3.916H2.335A5.963 5.963 0 0 1 2 8zm6-6c1.075 0 2.037 1.2 2.567 2.958H5.433C5.963 3.2 6.925 2 8 2zm-2.56.582a7.7 7.7 0 0 0-1.051 2.376H2.837A6.03 6.03 0 0 1 5.44 2.582zm-2.6 8.46h1.549a7.7 7.7 0 0 0 1.051 2.376 6.03 6.03 0 0 1-2.603-2.376zm7.723 2.376a7.7 7.7 0 0 0 1.051-2.376h1.552a6.03 6.03 0 0 1-2.606 2.376z"></path></svg>

app/src/androidTest/java/org/mozilla/fenix/AppRequestInterceptor.kt

@@ -5,11 +5,17 @@
 package org.mozilla.fenix
 
 import android.content.Context
+import android.net.ConnectivityManager
+import androidx.core.content.getSystemService
 import androidx.navigation.NavController
+import mozilla.components.browser.errorpages.ErrorPages
+import mozilla.components.browser.errorpages.ErrorType
 import mozilla.components.concept.engine.EngineSession
 import mozilla.components.concept.engine.request.RequestInterceptor
+import org.mozilla.fenix.GleanMetrics.ErrorPage
 import org.mozilla.fenix.ext.components
-import org.mozilla.fenix.ui.robots.appContext
+import org.mozilla.fenix.ext.isOnline
+import org.mozilla.fenix.helpers.TestHelper.appContext
 import java.lang.ref.WeakReference
 
 /**
@@ -33,10 +39,178 @@ class AppRequestInterceptor(private val context: Context) : RequestInterceptor {
         isSameDomain: Boolean,
         isRedirect: Boolean,
         isDirectNavigation: Boolean,
-        isSubframeRequest: Boolean
+        isSubframeRequest: Boolean,
+    ): RequestInterceptor.InterceptionResponse? {
+        interceptFxaRequest(
+            engineSession,
+            uri,
+            lastUri,
+            hasUserGesture,
+            isSameDomain,
+            isRedirect,
+            isDirectNavigation,
+            isSubframeRequest,
+        )?.let { response ->
+            return response
+        }
+
+        interceptAmoRequest(uri, isSameDomain, hasUserGesture)?.let { response ->
+            return response
+        }
+
+        return context.components.services.appLinksInterceptor
+            .onLoadRequest(
+                engineSession,
+                uri,
+                lastUri,
+                hasUserGesture,
+                isSameDomain,
+                isRedirect,
+                isDirectNavigation,
+                isSubframeRequest,
+            )
+    }
+
+    override fun onErrorRequest(
+        session: EngineSession,
+        errorType: ErrorType,
+        uri: String?,
+    ): RequestInterceptor.ErrorResponse? {
+        val improvedErrorType = improveErrorType(errorType)
+        val riskLevel = getRiskLevel(improvedErrorType)
+
+        ErrorPage.visitedError.record(ErrorPage.VisitedErrorExtra(improvedErrorType.name))
+
+        val errorPageUri = ErrorPages.createUrlEncodedErrorPage(
+            context = context,
+            errorType = improvedErrorType,
+            uri = uri,
+            htmlResource = riskLevel.htmlRes,
+        )
+
+        return RequestInterceptor.ErrorResponse(errorPageUri)
+    }
+
+    /**
+     * Checks if the provided [uri] is a request to install an add-on from addons.mozilla.org and
+     * redirects to Add-ons Manager to trigger installation if needed.
+     *
+     * @return [RequestInterceptor.InterceptionResponse.Deny] when installation was triggered and
+     * the original request can be skipped, otherwise null to continue loading the page.
+     */
+    private fun interceptAmoRequest(
+        uri: String,
+        isSameDomain: Boolean,
+        hasUserGesture: Boolean,
+    ): RequestInterceptor.InterceptionResponse? {
+        // First we execute a quick check to see if this is a request we're interested in i.e. a
+        // request triggered by the user and coming from AMO.
+        if (hasUserGesture && isSameDomain && uri.startsWith(AMO_BASE_URL)) {
+            // Check if this is a request to install an add-on.
+            val matchResult = AMO_INSTALL_URL_REGEX.toRegex().matchEntire(uri)
+            if (matchResult != null) {
+                // Navigate and trigger add-on installation.
+                matchResult.groupValues.getOrNull(1)?.let { addonId ->
+                    navController?.get()?.navigate(
+                        NavGraphDirections.actionGlobalAddonsManagementFragment(addonId),
+                    )
+
+                    // We've redirected to the add-ons management fragment, skip original request.
+                    return RequestInterceptor.InterceptionResponse.Deny
+                }
+            }
+        }
+
+        // In all other case we let the original request proceed.
+        return null
+    }
+
+    @Suppress("LongParameterList")
+    private fun interceptFxaRequest(
+        engineSession: EngineSession,
+        uri: String,
+        lastUri: String?,
+        hasUserGesture: Boolean,
+        isSameDomain: Boolean,
+        isRedirect: Boolean,
+        isDirectNavigation: Boolean,
+        isSubframeRequest: Boolean,
     ): RequestInterceptor.InterceptionResponse? {
         return appContext.components.services.accountsAuthFeature.interceptor.onLoadRequest(
-            engineSession, uri, lastUri, hasUserGesture, isSameDomain, isRedirect, isDirectNavigation, isSubframeRequest
+            engineSession,
+            uri,
+            lastUri,
+            hasUserGesture,
+            isSameDomain,
+            isRedirect,
+            isDirectNavigation,
+            isSubframeRequest,
         )
     }
+
+    /**
+     * Where possible, this will make the error type more accurate by including information not
+     * available to AC.
+     */
+    private fun improveErrorType(errorType: ErrorType): ErrorType {
+        // This is not an ideal solution. For context, see:
+        // https://github.com/mozilla-mobile/android-components/pull/5068#issuecomment-558415367
+
+        val isConnected: Boolean = context.getSystemService<ConnectivityManager>()!!.isOnline()
+
+        return when {
+            errorType == ErrorType.ERROR_UNKNOWN_HOST && !isConnected -> ErrorType.ERROR_NO_INTERNET
+            else -> errorType
+        }
+    }
+
+    private fun getRiskLevel(errorType: ErrorType): RiskLevel = when (errorType) {
+        ErrorType.UNKNOWN,
+        ErrorType.ERROR_NET_INTERRUPT,
+        ErrorType.ERROR_NET_TIMEOUT,
+        ErrorType.ERROR_CONNECTION_REFUSED,
+        ErrorType.ERROR_UNKNOWN_SOCKET_TYPE,
+        ErrorType.ERROR_REDIRECT_LOOP,
+        ErrorType.ERROR_OFFLINE,
+        ErrorType.ERROR_NET_RESET,
+        ErrorType.ERROR_UNSAFE_CONTENT_TYPE,
+        ErrorType.ERROR_CORRUPTED_CONTENT,
+        ErrorType.ERROR_CONTENT_CRASHED,
+        ErrorType.ERROR_INVALID_CONTENT_ENCODING,
+        ErrorType.ERROR_UNKNOWN_HOST,
+        ErrorType.ERROR_MALFORMED_URI,
+        ErrorType.ERROR_FILE_NOT_FOUND,
+        ErrorType.ERROR_FILE_ACCESS_DENIED,
+        ErrorType.ERROR_PROXY_CONNECTION_REFUSED,
+        ErrorType.ERROR_UNKNOWN_PROXY_HOST,
+        ErrorType.ERROR_NO_INTERNET,
+        ErrorType.ERROR_HTTPS_ONLY,
+        ErrorType.ERROR_BAD_HSTS_CERT,
+        ErrorType.ERROR_UNKNOWN_PROTOCOL,
+        -> RiskLevel.Low
+
+        ErrorType.ERROR_SECURITY_BAD_CERT,
+        ErrorType.ERROR_SECURITY_SSL,
+        ErrorType.ERROR_PORT_BLOCKED,
+        -> RiskLevel.Medium
+
+        ErrorType.ERROR_SAFEBROWSING_HARMFUL_URI,
+        ErrorType.ERROR_SAFEBROWSING_MALWARE_URI,
+        ErrorType.ERROR_SAFEBROWSING_PHISHING_URI,
+        ErrorType.ERROR_SAFEBROWSING_UNWANTED_URI,
+        -> RiskLevel.High
+    }
+
+    internal enum class RiskLevel(val htmlRes: String) {
+        Low(LOW_AND_MEDIUM_RISK_ERROR_PAGES),
+        Medium(LOW_AND_MEDIUM_RISK_ERROR_PAGES),
+        High(HIGH_RISK_ERROR_PAGES),
+    }
+
+    companion object {
+        internal const val LOW_AND_MEDIUM_RISK_ERROR_PAGES = "low_and_medium_risk_error_pages.html"
+        internal const val HIGH_RISK_ERROR_PAGES = "high_risk_error_pages.html"
+        internal const val AMO_BASE_URL = BuildConfig.AMO_BASE_URL
+        internal const val AMO_INSTALL_URL_REGEX = "$AMO_BASE_URL/android/downloads/file/([^\\s]+)/([^\\s]+\\.xpi)"
+    }
 }

app/src/androidTest/java/org/mozilla/fenix/components/FxaServer.kt

@@ -5,8 +5,8 @@
 package org.mozilla.fenix.components
 
 import android.content.Context
-import mozilla.components.service.fxa.ServerConfig.Server
 import mozilla.components.service.fxa.ServerConfig
+import mozilla.components.service.fxa.ServerConfig.Server
 
 /**
  * Utility to configure Firefox Account stage servers.
@@ -14,7 +14,7 @@ import mozilla.components.service.fxa.ServerConfig
 
 object FxaServer {
     private const val CLIENT_ID = "a2270f727f45f648"
-    const val REDIRECT_URL = "urn:ietf:wg:oauth:2.0:oob:oauth-redirect-webchannel"
+    private const val REDIRECT_URL = "urn:ietf:wg:oauth:2.0:oob:oauth-redirect-webchannel"
 
     @Suppress("UNUSED_PARAMETER")
     fun config(context: Context): ServerConfig {

app/src/androidTest/java/org/mozilla/fenix/customannotations/SmokeTest.kt

@@ -0,0 +1,13 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.customannotations
+
+/**
+ * A custom annotation to mark the smoke tests corresponding to the ones in TestRail:
+ * https://testrail.stage.mozaws.net/index.php?/suites/view/3192
+ */
+@Target(AnnotationTarget.FUNCTION, AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class SmokeTest

app/src/androidTest/java/org/mozilla/fenix/glean/BaselinePingTest.kt

@@ -2,6 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+@file:Suppress("DEPRECATION")
+
 package org.mozilla.fenix.glean
 
 import android.content.Context
@@ -11,6 +13,7 @@ import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.ActivityTestRule
 import androidx.test.uiautomator.UiDevice
 import androidx.test.uiautomator.UiSelector
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -21,9 +24,11 @@ import mozilla.components.service.glean.net.ConceptFetchHttpUploader
 import mozilla.components.service.glean.testing.GleanTestLocalServer
 import okhttp3.mockwebserver.RecordedRequest
 import org.json.JSONObject
-import org.junit.Assert.assertTrue
 import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Before
 import org.junit.BeforeClass
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -32,9 +37,9 @@ import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.HomeActivityTestRule
 import org.mozilla.fenix.helpers.MockWebServerHelper
-import java.util.concurrent.TimeUnit
 import java.io.BufferedReader
 import java.io.ByteArrayInputStream
+import java.util.concurrent.TimeUnit
 import java.util.zip.GZIPInputStream
 
 /**
@@ -66,6 +71,7 @@ fun RecordedRequest.getPlainBody(): String {
 @RunWith(AndroidJUnit4::class)
 class BaselinePingTest {
     private val server = MockWebServerHelper.createAlwaysOkMockWebServer()
+    private lateinit var mDevice: UiDevice
 
     @get:Rule
     val activityRule: ActivityTestRule<HomeActivity> = HomeActivityTestRule()
@@ -73,13 +79,21 @@ class BaselinePingTest {
     @get:Rule
     val gleanRule = GleanTestLocalServer(ApplicationProvider.getApplicationContext(), server.port)
 
+    @Before
+    fun setup() {
+        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+    }
+
     companion object {
         @BeforeClass
         @JvmStatic
+        @OptIn(DelicateCoroutinesApi::class) // GlobalScope usage
         fun setupOnce() {
-            val httpClient = ConceptFetchHttpUploader(lazy {
-                GeckoViewFetchClient(ApplicationProvider.getApplicationContext())
-            })
+            val httpClient = ConceptFetchHttpUploader(
+                lazy {
+                    GeckoViewFetchClient(ApplicationProvider.getApplicationContext())
+                },
+            )
 
             // Fenix does not initialize the Glean SDK in tests/debug builds, but this test
             // requires Glean to be initialized so we need to do it manually. Additionally,
@@ -89,7 +103,7 @@ class BaselinePingTest {
                     applicationContext = ApplicationProvider.getApplicationContext(),
                     uploadEnabled = true,
                     configuration = Configuration(httpClient = httpClient),
-                    buildInfo = GleanBuildInfo.buildInfo
+                    buildInfo = GleanBuildInfo.buildInfo,
                 )
             }
         }
@@ -106,7 +120,7 @@ class BaselinePingTest {
     private fun waitForPingContent(
         pingName: String,
         pingReason: String?,
-        maxAttempts: Int = 3
+        maxAttempts: Int = 3,
     ): JSONObject? {
         var attempts = 0
         do {
@@ -130,27 +144,30 @@ class BaselinePingTest {
         return null
     }
 
+    @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1807288")
     @Test
     fun validateBaselinePing() {
         // Wait for the app to be idle/ready.
         InstrumentationRegistry.getInstrumentation().waitForIdleSync()
-        val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
-        device.waitForIdle()
+        mDevice.waitForIdle()
 
         // Wait for 1 second: this should guarantee we have some valid duration in the
         // ping.
         Thread.sleep(1000)
 
         // Move it to background.
-        device.pressHome()
+        mDevice.pressHome()
 
         // Due to bug 1632184, we need move the activity to foreground again, in order
         // for a 'background' ping with reason 'foreground' to be generated and also trigger
         // sending the ping that was submitted on background. This can go away once bug 1634375
         // is fixed.
-        device.pressRecentApps()
-        device.findObject(UiSelector().descriptionContains(
-            ApplicationProvider.getApplicationContext<Context>().getString(R.string.app_name)))
+        mDevice.pressRecentApps()
+        mDevice.findObject(
+            UiSelector().descriptionContains(
+                ApplicationProvider.getApplicationContext<Context>().getString(R.string.app_name),
+            ),
+        )
             .click()
 
         // Validate the received data.

app/src/androidTest/java/org/mozilla/fenix/helpers/Assert.kt

@@ -5,11 +5,6 @@
 package org.mozilla.fenix.helpers
 
 import android.graphics.Bitmap
-
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
 import android.graphics.Color
 import org.junit.Assert.assertEquals
 

app/src/androidTest/java/org/mozilla/fenix/helpers/Constants.kt

@@ -1,11 +1,47 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 package org.mozilla.fenix.helpers
 
+import org.mozilla.fenix.helpers.TestHelper.getSponsoredShortcutTitle
+
 object Constants {
 
+    // Device or AVD requires a Google Services Android OS installation
     object PackageName {
         const val GOOGLE_PLAY_SERVICES = "com.android.vending"
         const val GOOGLE_APPS_PHOTOS = "com.google.android.apps.photos"
+        const val GOOGLE_QUICK_SEARCH = "com.google.android.googlequicksearchbox"
+        const val YOUTUBE_APP = "com.google.android.youtube"
+        const val GMAIL_APP = "com.google.android.gm"
+        const val PHONE_APP = "com.android.dialer"
+        const val ANDROID_SETTINGS = "com.android.settings"
     }
 
+    const val SPEECH_RECOGNITION = "android.speech.action.RECOGNIZE_SPEECH"
+    const val POCKET_RECOMMENDED_STORIES_UTM_PARAM = "utm_source=pocket-newtab-android"
     const val LONG_CLICK_DURATION: Long = 5000
+    const val LISTS_MAXSWIPES: Int = 3
+    const val RETRY_COUNT = 3
+
+    val searchEngineCodes = mapOf(
+        "Google" to "client=firefox-b-m",
+        "Bing" to "firefox&pc=MOZB&form=MOZMBA",
+        "DuckDuckGo" to "t=fpas",
+    )
+
+    val firstSponsoredShortcutTitle by lazy { getSponsoredShortcutTitle(2) }
+    val secondSponsoredShortcutTitle by lazy { getSponsoredShortcutTitle(3) }
+
+    // Expected for en-us defaults
+    val defaultTopSitesList by lazy {
+        mapOf(
+            "Google" to "Google",
+            "First sponsored shortcut" to firstSponsoredShortcutTitle,
+            "Second sponsored shortcut" to secondSponsoredShortcutTitle,
+            "Top Articles" to "Top Articles",
+            "Wikipedia" to "Wikipedia",
+        )
+    }
 }

app/src/androidTest/java/org/mozilla/fenix/helpers/Experimentation.kt

@@ -0,0 +1,19 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.helpers
+
+import org.mozilla.experiments.nimbus.GleanPlumbMessageHelper
+import org.mozilla.fenix.ext.components
+import org.mozilla.fenix.helpers.TestHelper.appContext
+
+object Experimentation {
+    val experiments =
+        appContext.components.analytics.experiments
+
+    fun withHelper(block: GleanPlumbMessageHelper.() -> Unit) {
+        val helper = experiments.createMessageHelper()
+        block(helper)
+    }
+}

app/src/androidTest/java/org/mozilla/fenix/helpers/FeatureSettingsHelper.kt

@@ -0,0 +1,87 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.helpers
+
+import androidx.test.platform.app.InstrumentationRegistry
+import org.mozilla.fenix.ext.settings
+
+/**
+ * Helper for querying the status and modifying various features and settings in the application.
+ */
+interface FeatureSettingsHelper {
+    /**
+     * Whether the onboarding for existing users should be shown or not.
+     * It should appear only once on the first visit to homescreen.
+     */
+    var isHomeOnboardingDialogEnabled: Boolean
+
+    /**
+     * Whether the Pocket stories feature is enabled or not.
+     */
+    var isPocketEnabled: Boolean
+
+    /**
+     * Whether the "Jump back in" CFR should be shown or not.
+     * It should appear on the first visit to homescreen given that there is a tab opened.
+     */
+    var isJumpBackInCFREnabled: Boolean
+
+    /**
+     * Whether the onboarding dialog for choosing wallpapers should be shown or not.
+     */
+    var isWallpaperOnboardingEnabled: Boolean
+
+    /**
+     * Whether the "Jump back in" homescreen section is enabled or not.
+     * It shows the last visited tab on this device and on other synced devices.
+     */
+    var isRecentTabsFeatureEnabled: Boolean
+
+    /**
+     * Whether the "Recently visited" homescreen section is enabled or not.
+     * It can show up to 9 history highlights and history groups.
+     */
+    var isRecentlyVisitedFeatureEnabled: Boolean
+
+    /**
+     * Whether the onboarding dialog for PWAs should be shown or not.
+     * It can show the first time a website that can be installed as a PWA is accessed.
+     */
+    var isPWAsPromptEnabled: Boolean
+
+    /**
+     * Whether the "Site permissions" option is checked in the "Delete browsing data" screen or not.
+     */
+    var isDeleteSitePermissionsEnabled: Boolean
+
+    /**
+     * Enable or disable showing the TCP CFR when accessing a webpage for the first time.
+     */
+    var isTCPCFREnabled: Boolean
+
+    /**
+     * The current "Enhanced Tracking Protection" policy.
+     * @see ETPPolicy
+     */
+    var etpPolicy: ETPPolicy
+
+    fun applyFlagUpdates()
+
+    fun resetAllFeatureFlags()
+
+    companion object {
+        val settings = InstrumentationRegistry.getInstrumentation().targetContext.settings()
+    }
+}
+
+/**
+ * All "Enhanced Tracking Protection" modes.
+ */
+enum class ETPPolicy {
+    STANDARD,
+    STRICT,
+    CUSTOM,
+    ;
+}

app/src/androidTest/java/org/mozilla/fenix/helpers/FeatureSettingsHelperDelegate.kt

@@ -0,0 +1,159 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.helpers
+
+import org.mozilla.fenix.R
+import org.mozilla.fenix.ext.getPreferenceKey
+import org.mozilla.fenix.helpers.ETPPolicy.CUSTOM
+import org.mozilla.fenix.helpers.ETPPolicy.STANDARD
+import org.mozilla.fenix.helpers.ETPPolicy.STRICT
+import org.mozilla.fenix.helpers.FeatureSettingsHelper.Companion.settings
+import org.mozilla.fenix.helpers.TestHelper.appContext
+import org.mozilla.fenix.onboarding.FenixOnboarding
+import org.mozilla.fenix.utils.Settings
+
+/**
+ * Helper for querying the status and modifying various features and settings in the application.
+ */
+class FeatureSettingsHelperDelegate : FeatureSettingsHelper {
+    /**
+     * The current feature flags used inside the app before the tests start.
+     * These will be restored when the tests end.
+     */
+    private val initialFeatureFlags = FeatureFlags(
+        isHomeOnboardingDialogEnabled = settings.showHomeOnboardingDialog,
+        homeOnboardingDialogVersion = getHomeOnboardingVersion(),
+        isPocketEnabled = settings.showPocketRecommendationsFeature,
+        isJumpBackInCFREnabled = settings.shouldShowJumpBackInCFR,
+        isRecentTabsFeatureEnabled = settings.showRecentTabsFeature,
+        isRecentlyVisitedFeatureEnabled = settings.historyMetadataUIFeature,
+        isPWAsPromptEnabled = !settings.userKnowsAboutPwas,
+        isTCPCFREnabled = settings.shouldShowTotalCookieProtectionCFR,
+        isWallpaperOnboardingEnabled = settings.showWallpaperOnboarding,
+        isDeleteSitePermissionsEnabled = settings.deleteSitePermissions,
+        etpPolicy = getETPPolicy(settings),
+    )
+
+    /**
+     * The current feature flags updated in tests.
+     */
+    private var updatedFeatureFlags = initialFeatureFlags.copy()
+
+    override var isHomeOnboardingDialogEnabled: Boolean
+        get() = updatedFeatureFlags.isHomeOnboardingDialogEnabled &&
+            FenixOnboarding(appContext).userHasBeenOnboarded()
+        set(value) {
+            updatedFeatureFlags.isHomeOnboardingDialogEnabled = value
+            updatedFeatureFlags.homeOnboardingDialogVersion = when (value) {
+                true -> FenixOnboarding.CURRENT_ONBOARDING_VERSION
+                false -> 0
+            }
+        }
+    override var isPocketEnabled: Boolean by updatedFeatureFlags::isPocketEnabled
+    override var isJumpBackInCFREnabled: Boolean by updatedFeatureFlags::isJumpBackInCFREnabled
+    override var isWallpaperOnboardingEnabled: Boolean by updatedFeatureFlags::isWallpaperOnboardingEnabled
+    override var isRecentTabsFeatureEnabled: Boolean by updatedFeatureFlags::isRecentTabsFeatureEnabled
+    override var isRecentlyVisitedFeatureEnabled: Boolean by updatedFeatureFlags::isRecentlyVisitedFeatureEnabled
+    override var isPWAsPromptEnabled: Boolean by updatedFeatureFlags::isPWAsPromptEnabled
+    override var isTCPCFREnabled: Boolean by updatedFeatureFlags::isTCPCFREnabled
+    override var etpPolicy: ETPPolicy by updatedFeatureFlags::etpPolicy
+
+    override fun applyFlagUpdates() {
+        applyFeatureFlags(updatedFeatureFlags)
+    }
+
+    override fun resetAllFeatureFlags() {
+        applyFeatureFlags(initialFeatureFlags)
+    }
+    override var isDeleteSitePermissionsEnabled: Boolean by updatedFeatureFlags::isDeleteSitePermissionsEnabled
+
+    private fun applyFeatureFlags(featureFlags: FeatureFlags) {
+        settings.showHomeOnboardingDialog = featureFlags.isHomeOnboardingDialogEnabled
+        setHomeOnboardingVersion(featureFlags.homeOnboardingDialogVersion)
+        settings.showPocketRecommendationsFeature = featureFlags.isPocketEnabled
+        settings.shouldShowJumpBackInCFR = featureFlags.isJumpBackInCFREnabled
+        settings.showRecentTabsFeature = featureFlags.isRecentTabsFeatureEnabled
+        settings.historyMetadataUIFeature = featureFlags.isRecentlyVisitedFeatureEnabled
+        settings.userKnowsAboutPwas = !featureFlags.isPWAsPromptEnabled
+        settings.shouldShowTotalCookieProtectionCFR = featureFlags.isTCPCFREnabled
+        settings.showWallpaperOnboarding = featureFlags.isWallpaperOnboardingEnabled
+        settings.deleteSitePermissions = featureFlags.isDeleteSitePermissionsEnabled
+        setETPPolicy(featureFlags.etpPolicy)
+    }
+}
+
+private data class FeatureFlags(
+    var isHomeOnboardingDialogEnabled: Boolean,
+    var homeOnboardingDialogVersion: Int,
+    var isPocketEnabled: Boolean,
+    var isJumpBackInCFREnabled: Boolean,
+    var isRecentTabsFeatureEnabled: Boolean,
+    var isRecentlyVisitedFeatureEnabled: Boolean,
+    var isPWAsPromptEnabled: Boolean,
+    var isTCPCFREnabled: Boolean,
+    var isWallpaperOnboardingEnabled: Boolean,
+    var isDeleteSitePermissionsEnabled: Boolean,
+    var etpPolicy: ETPPolicy,
+)
+
+internal fun getETPPolicy(settings: Settings): ETPPolicy {
+    return when {
+        settings.useStrictTrackingProtection -> STRICT
+        settings.useCustomTrackingProtection -> CUSTOM
+        else -> STANDARD
+    }
+}
+
+private fun setETPPolicy(policy: ETPPolicy) {
+    when (policy) {
+        STRICT -> settings.setStrictETP()
+        // The following two cases update ETP in the same way "setStrictETP" does.
+        STANDARD -> {
+            settings.preferences.edit()
+                .putBoolean(
+                    appContext.getPreferenceKey(R.string.pref_key_tracking_protection_strict_default),
+                    false,
+                )
+                .putBoolean(
+                    appContext.getPreferenceKey(R.string.pref_key_tracking_protection_custom_option),
+                    false,
+                )
+                .putBoolean(
+                    appContext.getPreferenceKey(R.string.pref_key_tracking_protection_standard_option),
+                    true,
+                )
+                .commit()
+        }
+        CUSTOM -> {
+            settings.preferences.edit()
+                .putBoolean(
+                    appContext.getPreferenceKey(R.string.pref_key_tracking_protection_strict_default),
+                    false,
+                )
+                .putBoolean(
+                    appContext.getPreferenceKey(R.string.pref_key_tracking_protection_standard_option),
+                    true,
+                )
+                .putBoolean(
+                    appContext.getPreferenceKey(R.string.pref_key_tracking_protection_custom_option),
+                    true,
+                )
+                .commit()
+        }
+    }
+}
+
+private fun getHomeOnboardingVersion(): Int {
+    return FenixOnboarding(appContext)
+        .preferences
+        .getInt(FenixOnboarding.LAST_VERSION_ONBOARDING_KEY, 0)
+}
+
+private fun setHomeOnboardingVersion(version: Int) {
+    FenixOnboarding(appContext)
+        .preferences.edit()
+        .putInt(FenixOnboarding.LAST_VERSION_ONBOARDING_KEY, version)
+        .commit()
+}

app/src/androidTest/java/org/mozilla/fenix/helpers/HomeActivityTestRule.kt

@@ -2,16 +2,20 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+@file:Suppress("DEPRECATION")
+
 package org.mozilla.fenix.helpers
 
+import android.content.Intent
 import android.view.ViewConfiguration.getLongPressTimeout
 import androidx.test.espresso.intent.rule.IntentsTestRule
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.ActivityTestRule
-import androidx.test.uiautomator.UiDevice
+import androidx.test.uiautomator.UiSelector
 import org.mozilla.fenix.HomeActivity
+import org.mozilla.fenix.helpers.FeatureSettingsHelper.Companion.settings
+import org.mozilla.fenix.helpers.TestHelper.appContext
+import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.onboarding.FenixOnboarding
-import org.mozilla.fenix.ui.robots.appContext
 
 /**
  * A [org.junit.Rule] to handle shared test set up for tests on [HomeActivity].
@@ -23,20 +27,91 @@ import org.mozilla.fenix.ui.robots.appContext
 class HomeActivityTestRule(
     initialTouchMode: Boolean = false,
     launchActivity: Boolean = true,
-    private val skipOnboarding: Boolean = false
-) :
-    ActivityTestRule<HomeActivity>(HomeActivity::class.java, initialTouchMode, launchActivity) {
+    private val skipOnboarding: Boolean = false,
+) : ActivityTestRule<HomeActivity>(HomeActivity::class.java, initialTouchMode, launchActivity),
+    FeatureSettingsHelper by FeatureSettingsHelperDelegate() {
+
+    // Using a secondary constructor allows us to easily delegate the settings to FeatureSettingsHelperDelegate.
+    // Otherwise if wanting to use the same names we would have to override these settings in the primary
+    // constructor and in that elide the FeatureSettingsHelperDelegate.
+    constructor(
+        initialTouchMode: Boolean = false,
+        launchActivity: Boolean = true,
+        skipOnboarding: Boolean = false,
+        isHomeOnboardingDialogEnabled: Boolean = settings.showHomeOnboardingDialog &&
+            FenixOnboarding(appContext).userHasBeenOnboarded(),
+        isPocketEnabled: Boolean = settings.showPocketRecommendationsFeature,
+        isJumpBackInCFREnabled: Boolean = settings.shouldShowJumpBackInCFR,
+        isRecentTabsFeatureEnabled: Boolean = settings.showRecentTabsFeature,
+        isRecentlyVisitedFeatureEnabled: Boolean = settings.historyMetadataUIFeature,
+        isPWAsPromptEnabled: Boolean = !settings.userKnowsAboutPwas,
+        isTCPCFREnabled: Boolean = settings.shouldShowTotalCookieProtectionCFR,
+        isWallpaperOnboardingEnabled: Boolean = settings.showWallpaperOnboarding,
+        isDeleteSitePermissionsEnabled: Boolean = settings.deleteSitePermissions,
+        etpPolicy: ETPPolicy = getETPPolicy(settings),
+    ) : this(initialTouchMode, launchActivity, skipOnboarding) {
+        this.isHomeOnboardingDialogEnabled = isHomeOnboardingDialogEnabled
+        this.isPocketEnabled = isPocketEnabled
+        this.isJumpBackInCFREnabled = isJumpBackInCFREnabled
+        this.isRecentTabsFeatureEnabled = isRecentTabsFeatureEnabled
+        this.isRecentlyVisitedFeatureEnabled = isRecentlyVisitedFeatureEnabled
+        this.isPWAsPromptEnabled = isPWAsPromptEnabled
+        this.isTCPCFREnabled = isTCPCFREnabled
+        this.isWallpaperOnboardingEnabled = isWallpaperOnboardingEnabled
+        this.isDeleteSitePermissionsEnabled = isDeleteSitePermissionsEnabled
+        this.etpPolicy = etpPolicy
+    }
+
+    /**
+     * Update settings after the activity was created.
+     */
+    fun applySettingsExceptions(settings: (FeatureSettingsHelper) -> Unit) {
+        FeatureSettingsHelperDelegate().also {
+            settings(it)
+            applyFlagUpdates()
+        }
+    }
+
     private val longTapUserPreference = getLongPressTimeout()
 
     override fun beforeActivityLaunched() {
         super.beforeActivityLaunched()
         setLongTapTimeout(3000)
+        applyFlagUpdates()
         if (skipOnboarding) { skipOnboardingBeforeLaunch() }
     }
 
     override fun afterActivityFinished() {
         super.afterActivityFinished()
         setLongTapTimeout(longTapUserPreference)
+        resetAllFeatureFlags()
+        closeNotificationShade()
+    }
+
+    companion object {
+        /**
+         * Create a new instance of [HomeActivityTestRule] which by default will disable specific
+         * app features that would otherwise negatively impact most tests.
+         *
+         * The disabled features are:
+         *  - the Jump back in CFR,
+         *  - the Total Cookie Protection CFR,
+         *  - the PWA prompt dialog,
+         *  - the wallpaper onboarding.
+         */
+        fun withDefaultSettingsOverrides(
+            initialTouchMode: Boolean = false,
+            launchActivity: Boolean = true,
+            skipOnboarding: Boolean = false,
+        ) = HomeActivityTestRule(
+            initialTouchMode = initialTouchMode,
+            launchActivity = launchActivity,
+            skipOnboarding = skipOnboarding,
+            isJumpBackInCFREnabled = false,
+            isPWAsPromptEnabled = false,
+            isTCPCFREnabled = false,
+            isWallpaperOnboardingEnabled = false,
+        )
     }
 }
 
@@ -48,30 +123,143 @@ class HomeActivityTestRule(
  * @param launchActivity See [IntentsTestRule]
  */
 
-class HomeActivityIntentTestRule(
+class HomeActivityIntentTestRule internal constructor(
     initialTouchMode: Boolean = false,
     launchActivity: Boolean = true,
-    private val skipOnboarding: Boolean = false
-) :
-    IntentsTestRule<HomeActivity>(HomeActivity::class.java, initialTouchMode, launchActivity) {
+    private val skipOnboarding: Boolean = false,
+) : IntentsTestRule<HomeActivity>(HomeActivity::class.java, initialTouchMode, launchActivity),
+    FeatureSettingsHelper by FeatureSettingsHelperDelegate() {
+    // Using a secondary constructor allows us to easily delegate the settings to FeatureSettingsHelperDelegate.
+    // Otherwise if wanting to use the same names we would have to override these settings in the primary
+    // constructor and in that elide the FeatureSettingsHelperDelegate.
+    constructor(
+        initialTouchMode: Boolean = false,
+        launchActivity: Boolean = true,
+        skipOnboarding: Boolean = false,
+        isHomeOnboardingDialogEnabled: Boolean = settings.showHomeOnboardingDialog &&
+            FenixOnboarding(appContext).userHasBeenOnboarded(),
+        isPocketEnabled: Boolean = settings.showPocketRecommendationsFeature,
+        isJumpBackInCFREnabled: Boolean = settings.shouldShowJumpBackInCFR,
+        isRecentTabsFeatureEnabled: Boolean = settings.showRecentTabsFeature,
+        isRecentlyVisitedFeatureEnabled: Boolean = settings.historyMetadataUIFeature,
+        isPWAsPromptEnabled: Boolean = !settings.userKnowsAboutPwas,
+        isTCPCFREnabled: Boolean = settings.shouldShowTotalCookieProtectionCFR,
+        isWallpaperOnboardingEnabled: Boolean = settings.showWallpaperOnboarding,
+        isDeleteSitePermissionsEnabled: Boolean = settings.deleteSitePermissions,
+        etpPolicy: ETPPolicy = getETPPolicy(settings),
+    ) : this(initialTouchMode, launchActivity, skipOnboarding) {
+        this.isHomeOnboardingDialogEnabled = isHomeOnboardingDialogEnabled
+        this.isPocketEnabled = isPocketEnabled
+        this.isJumpBackInCFREnabled = isJumpBackInCFREnabled
+        this.isRecentTabsFeatureEnabled = isRecentTabsFeatureEnabled
+        this.isRecentlyVisitedFeatureEnabled = isRecentlyVisitedFeatureEnabled
+        this.isPWAsPromptEnabled = isPWAsPromptEnabled
+        this.isTCPCFREnabled = isTCPCFREnabled
+        this.isWallpaperOnboardingEnabled = isWallpaperOnboardingEnabled
+        this.isDeleteSitePermissionsEnabled = isDeleteSitePermissionsEnabled
+        this.etpPolicy = etpPolicy
+    }
+
     private val longTapUserPreference = getLongPressTimeout()
 
+    private lateinit var intent: Intent
+
+    /**
+     * Update settings after the activity was created.
+     */
+    fun applySettingsExceptions(settings: (FeatureSettingsHelper) -> Unit) {
+        FeatureSettingsHelperDelegate().apply {
+            settings(this)
+            applyFlagUpdates()
+        }
+    }
+
+    override fun getActivityIntent(): Intent? {
+        return if (this::intent.isInitialized) {
+            this.intent
+        } else {
+            super.getActivityIntent()
+        }
+    }
+
+    fun withIntent(intent: Intent): HomeActivityIntentTestRule {
+        this.intent = intent
+        return this
+    }
+
     override fun beforeActivityLaunched() {
         super.beforeActivityLaunched()
         setLongTapTimeout(3000)
+        applyFlagUpdates()
         if (skipOnboarding) { skipOnboardingBeforeLaunch() }
     }
 
     override fun afterActivityFinished() {
         super.afterActivityFinished()
         setLongTapTimeout(longTapUserPreference)
+        closeNotificationShade()
+        resetAllFeatureFlags()
+    }
+
+    /**
+     * Update the settings values from when this rule was first instantiated to account for any changes
+     * done while running the tests.
+     * Useful in the scenario about the activity being restarted which would otherwise set the initial
+     * settings and override any changes made in the meantime.
+     */
+    fun updateCachedSettings() {
+        isHomeOnboardingDialogEnabled =
+            settings.showHomeOnboardingDialog && FenixOnboarding(appContext).userHasBeenOnboarded()
+        isPocketEnabled = settings.showPocketRecommendationsFeature
+        isJumpBackInCFREnabled = settings.shouldShowJumpBackInCFR
+        isRecentTabsFeatureEnabled = settings.showRecentTabsFeature
+        isRecentlyVisitedFeatureEnabled = settings.historyMetadataUIFeature
+        isPWAsPromptEnabled = !settings.userKnowsAboutPwas
+        isTCPCFREnabled = settings.shouldShowTotalCookieProtectionCFR
+        isWallpaperOnboardingEnabled = settings.showWallpaperOnboarding
+        isDeleteSitePermissionsEnabled = settings.deleteSitePermissions
+        etpPolicy = getETPPolicy(settings)
+    }
+
+    companion object {
+        /**
+         * Create a new instance of [HomeActivityIntentTestRule] which by default will disable specific
+         * app features that would otherwise negatively impact most tests.
+         *
+         * The disabled features are:
+         *  - the Jump back in CFR,
+         *  - the Total Cookie Protection CFR,
+         *  - the PWA prompt dialog,
+         *  - the wallpaper onboarding.
+         */
+        fun withDefaultSettingsOverrides(
+            initialTouchMode: Boolean = false,
+            launchActivity: Boolean = true,
+            skipOnboarding: Boolean = false,
+        ) = HomeActivityIntentTestRule(
+            initialTouchMode = initialTouchMode,
+            launchActivity = launchActivity,
+            skipOnboarding = skipOnboarding,
+            isJumpBackInCFREnabled = false,
+            isPWAsPromptEnabled = false,
+            isTCPCFREnabled = false,
+            isWallpaperOnboardingEnabled = false,
+        )
     }
 }
 
 // changing the device preference for Touch and Hold delay, to avoid long-clicks instead of a single-click
 fun setLongTapTimeout(delay: Int) {
-    val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
-    mDevice.executeShellCommand("settings put secure long_press_timeout $delay")
+    // Issue: https://github.com/mozilla-mobile/fenix/issues/25132
+    var attempts = 0
+    while (attempts++ < 3) {
+        try {
+            mDevice.executeShellCommand("settings put secure long_press_timeout $delay")
+            break
+        } catch (e: RuntimeException) {
+            e.printStackTrace()
+        }
+    }
 }
 
 private fun skipOnboardingBeforeLaunch() {
@@ -79,3 +267,12 @@ private fun skipOnboardingBeforeLaunch() {
     // this API so it can be fragile.
     FenixOnboarding(appContext).finish()
 }
+
+private fun closeNotificationShade() {
+    if (mDevice.findObject(
+            UiSelector().resourceId("com.android.systemui:id/notification_stack_scroller"),
+        ).exists()
+    ) {
+        mDevice.pressHome()
+    }
+}

app/src/androidTest/java/org/mozilla/fenix/helpers/IdlingResourceHelper.kt

@@ -1,3 +1,9 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@file:Suppress("DEPRECATION")
+
 package org.mozilla.fenix.helpers
 
 import androidx.test.espresso.IdlingRegistry
@@ -11,16 +17,22 @@ object IdlingResourceHelper {
     fun registerAddonInstallingIdlingResource(activityTestRule: ActivityTestRule<HomeActivity>) {
         IdlingRegistry.getInstance().register(
             AddonsInstallingIdlingResource(
-                activityTestRule.activity.supportFragmentManager
-            )
+                activityTestRule.activity.supportFragmentManager,
+            ),
         )
     }
 
     fun unregisterAddonInstallingIdlingResource(activityTestRule: ActivityTestRule<HomeActivity>) {
         IdlingRegistry.getInstance().unregister(
             AddonsInstallingIdlingResource(
-                activityTestRule.activity.supportFragmentManager
-            )
+                activityTestRule.activity.supportFragmentManager,
+            ),
         )
     }
+
+    fun unregisterAllIdlingResources() {
+        for (resource in IdlingRegistry.getInstance().resources) {
+            IdlingRegistry.getInstance().unregister(resource)
+        }
+    }
 }

app/src/androidTest/java/org/mozilla/fenix/helpers/MatcherHelper.kt

@@ -0,0 +1,85 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.helpers
+
+import androidx.test.uiautomator.UiObject
+import androidx.test.uiautomator.UiSelector
+import org.junit.Assert.assertTrue
+import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
+import org.mozilla.fenix.helpers.TestHelper.mDevice
+
+/**
+ * Helper for querying and interacting with items based on their matchers.
+ */
+object MatcherHelper {
+
+    fun itemWithResId(resourceId: String) =
+        mDevice.findObject(UiSelector().resourceId(resourceId))
+
+    fun itemContainingText(itemText: String) =
+        mDevice.findObject(UiSelector().textContains(itemText))
+
+    fun itemWithDescription(description: String) =
+        mDevice.findObject(UiSelector().descriptionContains(description))
+
+    fun checkedItemWithResId(resourceId: String, isChecked: Boolean) =
+        mDevice.findObject(UiSelector().resourceId(resourceId).checked(isChecked))
+
+    fun checkedItemWithResIdAndText(resourceId: String, text: String, isChecked: Boolean) =
+        mDevice.findObject(
+            UiSelector()
+                .resourceId(resourceId)
+                .textContains(text)
+                .checked(isChecked),
+        )
+
+    fun itemWithResIdAndDescription(resourceId: String, description: String) =
+        mDevice.findObject(UiSelector().resourceId(resourceId).descriptionContains(description))
+
+    fun itemWithResIdAndText(resourceId: String, text: String) =
+        mDevice.findObject(UiSelector().resourceId(resourceId).text(text))
+
+    fun assertItemWithResIdExists(vararg appItems: UiObject) {
+        for (appItem in appItems) {
+            assertTrue(appItem.waitForExists(waitingTime))
+        }
+    }
+
+    fun assertItemContainingTextExists(vararg appItems: UiObject) {
+        for (appItem in appItems) {
+            assertTrue(appItem.waitForExists(waitingTime))
+        }
+    }
+
+    fun assertItemWithDescriptionExists(vararg appItems: UiObject) {
+        for (appItem in appItems) {
+            assertTrue(appItem.waitForExists(waitingTime))
+        }
+    }
+
+    fun assertCheckedItemWithResIdExists(vararg appItems: UiObject) {
+        for (appItem in appItems) {
+            assertTrue(appItem.waitForExists(waitingTime))
+        }
+    }
+
+    fun assertCheckedItemWithResIdAndTextExists(vararg appItems: UiObject) {
+        for (appItem in appItems) {
+            assertTrue(appItem.waitForExists(waitingTime))
+        }
+    }
+
+    fun assertItemWithResIdAndDescriptionExists(vararg appItems: UiObject) {
+        for (appItem in appItems) {
+            assertTrue(appItem.waitForExists(waitingTime))
+        }
+    }
+
+    fun assertItemWithResIdAndTextExists(vararg appItems: UiObject) {
+        for (appItem in appItems) {
+            assertTrue(appItem.waitForExists(waitingTime))
+        }
+    }
+}

app/src/androidTest/java/org/mozilla/fenix/helpers/Matchers.kt

@@ -44,7 +44,7 @@ fun withBitmapDrawable(bitmap: Bitmap, name: String): Matcher<View>? = BitmapDra
 
 fun nthChildOf(
     parentMatcher: Matcher<View>,
-    childPosition: Int
+    childPosition: Int,
 ): Matcher<View> {
     return object : TypeSafeMatcher<View>() {
         override fun describeTo(description: Description) {

app/src/androidTest/java/org/mozilla/fenix/helpers/MockLocationUpdatesRule.kt

@@ -0,0 +1,111 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.helpers
+
+import android.content.Context
+import android.location.Location
+import android.location.LocationManager
+import android.os.Build
+import android.os.SystemClock
+import android.util.Log
+import androidx.test.core.app.ApplicationProvider
+import org.junit.rules.ExternalResource
+import org.mozilla.fenix.helpers.TestHelper.mDevice
+import java.util.Date
+import kotlin.random.Random
+
+private const val mockProviderName = LocationManager.GPS_PROVIDER
+
+/**
+ * Rule that sets up a mock location provider that can inject location samples
+ * straight to the device that the test is running on.
+ *
+ * Credit to the mapbox team
+ * https://github.com/mapbox/mapbox-navigation-android/blob/87fab7ea1152b29533ee121eaf6c05bc202adf02/libtesting-ui/src/main/java/com/mapbox/navigation/testing/ui/MockLocationUpdatesRule.kt
+ *
+ */
+class MockLocationUpdatesRule : ExternalResource() {
+    private val appContext = (ApplicationProvider.getApplicationContext() as Context)
+    val latitude = Random.nextDouble(-90.0, 90.0)
+    val longitude = Random.nextDouble(-180.0, 180.0)
+
+    private val locationManager: LocationManager by lazy {
+        (appContext.getSystemService(Context.LOCATION_SERVICE) as LocationManager)
+    }
+
+    override fun before() {
+        /* ADB command to enable the mock location setting on the device.
+         * Will not be turned back off due to limitations on knowing its initial state.
+         */
+        mDevice.executeShellCommand(
+            "appops set " +
+                appContext.packageName +
+                " android:mock_location allow",
+        )
+
+        // To mock locations we need a location provider, so we generate and set it here.
+        try {
+            locationManager.addTestProvider(
+                mockProviderName,
+                false,
+                false,
+                false,
+                false,
+                true,
+                true,
+                true,
+                3,
+                2,
+            )
+        } catch (ex: Exception) {
+            // unstable
+            Log.w("MockLocationUpdatesRule", "addTestProvider failed")
+        }
+        locationManager.setTestProviderEnabled(mockProviderName, true)
+    }
+
+    // Cleaning up the location provider after the test.
+    override fun after() {
+        locationManager.setTestProviderEnabled(mockProviderName, false)
+        locationManager.removeTestProvider(mockProviderName)
+    }
+
+    /**
+     * Generate a valid mock location data and set with the help of a test provider.
+     *
+     * @param modifyLocation optional callback for modifying the constructed location before setting it.
+     */
+    fun setMockLocation(modifyLocation: (Location.() -> Unit)? = null) {
+        check(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            "MockLocationUpdatesRule is supported only on Android devices " +
+                "running version >= Build.VERSION_CODES.M"
+        }
+
+        val location = Location(mockProviderName)
+        location.time = Date().time
+        location.elapsedRealtimeNanos = SystemClock.elapsedRealtimeNanos()
+        location.accuracy = 5f
+        location.altitude = 0.0
+        location.bearing = 0f
+        location.speed = 5f
+        location.latitude = latitude
+        location.longitude = longitude
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            location.verticalAccuracyMeters = 5f
+            location.bearingAccuracyDegrees = 5f
+            location.speedAccuracyMetersPerSecond = 5f
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            location.elapsedRealtimeUncertaintyNanos = 0.0
+        }
+
+        modifyLocation?.let {
+            location.apply(it)
+        }
+
+        locationManager.setTestProviderLocation(mockProviderName, location)
+    }
+}

app/src/androidTest/java/org/mozilla/fenix/helpers/RecyclerViewIdlingResource.kt

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 package org.mozilla.fenix.helpers
 
 import androidx.test.espresso.IdlingResource

app/src/androidTest/java/org/mozilla/fenix/helpers/RetryTestRule.kt

@@ -0,0 +1,102 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.helpers
+
+import androidx.test.espresso.IdlingResourceTimeoutException
+import androidx.test.espresso.NoMatchingViewException
+import androidx.test.uiautomator.UiObjectNotFoundException
+import junit.framework.AssertionFailedError
+import kotlinx.coroutines.runBlocking
+import org.junit.rules.TestRule
+import org.junit.runner.Description
+import org.junit.runners.model.Statement
+import org.mozilla.fenix.components.PermissionStorage
+import org.mozilla.fenix.helpers.IdlingResourceHelper.unregisterAllIdlingResources
+import org.mozilla.fenix.helpers.TestHelper.appContext
+
+/**
+ *  Rule to retry flaky tests for a given number of times, catching some of the more common exceptions.
+ *  The Rule doesn't clear the app state in between retries, so we are doing some cleanup here.
+ *  The @Before and @After methods are not called between retries.
+ *
+ */
+class RetryTestRule(private val retryCount: Int = 5) : TestRule {
+    // Used for clearing all permission data after each test try
+    private val permissionStorage = PermissionStorage(appContext.applicationContext)
+
+    @Suppress("TooGenericExceptionCaught", "ComplexMethod")
+    override fun apply(base: Statement, description: Description): Statement {
+        return statement {
+            for (i in 1..retryCount) {
+                try {
+                    base.evaluate()
+                    break
+                } catch (t: AssertionError) {
+                    unregisterAllIdlingResources()
+                    runBlocking {
+                        permissionStorage.deleteAllSitePermissions()
+                    }
+                    if (i == retryCount) {
+                        throw t
+                    }
+                } catch (t: AssertionFailedError) {
+                    unregisterAllIdlingResources()
+                    runBlocking {
+                        permissionStorage.deleteAllSitePermissions()
+                    }
+                    if (i == retryCount) {
+                        throw t
+                    }
+                } catch (t: UiObjectNotFoundException) {
+                    unregisterAllIdlingResources()
+                    runBlocking {
+                        permissionStorage.deleteAllSitePermissions()
+                    }
+                    if (i == retryCount) {
+                        throw t
+                    }
+                } catch (t: NoMatchingViewException) {
+                    unregisterAllIdlingResources()
+                    runBlocking {
+                        permissionStorage.deleteAllSitePermissions()
+                    }
+                    if (i == retryCount) {
+                        throw t
+                    }
+                } catch (t: IdlingResourceTimeoutException) {
+                    unregisterAllIdlingResources()
+                    runBlocking {
+                        permissionStorage.deleteAllSitePermissions()
+                    }
+                    if (i == retryCount) {
+                        throw t
+                    }
+                } catch (t: RuntimeException) {
+                    unregisterAllIdlingResources()
+                    runBlocking {
+                        permissionStorage.deleteAllSitePermissions()
+                    }
+                    if (i == retryCount) {
+                        throw t
+                    }
+                } catch (t: NullPointerException) {
+                    unregisterAllIdlingResources()
+                    runBlocking {
+                        permissionStorage.deleteAllSitePermissions()
+                    }
+                    if (i == retryCount) {
+                        throw t
+                    }
+                }
+            }
+        }
+    }
+
+    private inline fun statement(crossinline eval: () -> Unit): Statement {
+        return object : Statement() {
+            override fun evaluate() = eval()
+        }
+    }
+}

app/src/androidTest/java/org/mozilla/fenix/helpers/SearchDispatcher.kt

@@ -0,0 +1,64 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.helpers
+
+import android.os.Handler
+import android.os.Looper
+import androidx.test.platform.app.InstrumentationRegistry
+import okhttp3.mockwebserver.Dispatcher
+import okhttp3.mockwebserver.MockResponse
+import okhttp3.mockwebserver.MockWebServer
+import okhttp3.mockwebserver.RecordedRequest
+import okio.Buffer
+import okio.source
+import java.io.IOException
+import java.io.InputStream
+
+/**
+ * A [MockWebServer] [Dispatcher] that will return a generic search results page in the body of
+ * requests and responds with status 200.
+ *
+ * If the dispatcher is unable to read a requested asset, it will fail the test by throwing an
+ * Exception on the main thread.
+ *
+ * @sample [org.mozilla.fenix.ui.SearchTest]
+ */
+class SearchDispatcher : Dispatcher() {
+    private val mainThreadHandler = Handler(Looper.getMainLooper())
+
+    override fun dispatch(request: RecordedRequest): MockResponse {
+        val assetManager = InstrumentationRegistry.getInstrumentation().context.assets
+        try {
+            // When we perform a search with the custom search engine, returns the generic4.html test page as search results
+            if (request.path!!.contains("searchResults.html?search=")) {
+                MockResponse().setResponseCode(HTTP_OK)
+                val path = "pages/generic4.html"
+                assetManager.open(path).use { inputStream ->
+                    return fileToResponse(inputStream)
+                }
+            }
+            return MockResponse().setResponseCode(HTTP_NOT_FOUND)
+        } catch (e: IOException) {
+            // e.g. file not found.
+            // We're on a background thread so we need to forward the exception to the main thread.
+            mainThreadHandler.postAtFrontOfQueue { throw e }
+            return MockResponse().setResponseCode(HTTP_NOT_FOUND)
+        }
+    }
+}
+
+@Throws(IOException::class)
+private fun fileToResponse(file: InputStream): MockResponse {
+    return MockResponse()
+        .setResponseCode(HTTP_OK)
+        .setBody(fileToBytes(file))
+}
+
+@Throws(IOException::class)
+private fun fileToBytes(file: InputStream): Buffer {
+    val result = Buffer()
+    result.writeAll(file.source())
+    return result
+}

app/src/androidTest/java/org/mozilla/fenix/helpers/TestAssetHelper.kt

@@ -5,7 +5,6 @@
 package org.mozilla.fenix.helpers
 
 import android.net.Uri
-
 import okhttp3.mockwebserver.MockWebServer
 import org.mozilla.fenix.helpers.ext.toUri
 import java.util.concurrent.TimeUnit
@@ -16,7 +15,8 @@ import java.util.concurrent.TimeUnit
 object TestAssetHelper {
     @Suppress("MagicNumber")
     val waitingTime: Long = TimeUnit.SECONDS.toMillis(15)
-    val waitingTimeShort: Long = TimeUnit.SECONDS.toMillis(1)
+    val waitingTimeLong = TimeUnit.SECONDS.toMillis(25)
+    val waitingTimeShort: Long = TimeUnit.SECONDS.toMillis(3)
 
     data class TestAsset(val url: Uri, val content: String, val title: String)
 
@@ -34,7 +34,7 @@ object TestAssetHelper {
             TestAsset(
                 server.url("pages/generic$it.html").toString().toUri()!!,
                 "Page content: $it",
-                ""
+                "",
             )
         }
     }
@@ -68,17 +68,11 @@ object TestAssetHelper {
         return TestAsset(url, content, "")
     }
 
-    fun getDownloadAsset(server: MockWebServer): TestAsset {
-        val url = server.url("pages/download.html").toString().toUri()!!
-        val content = "Page content: Globe.svg"
-
-        return TestAsset(url, content, "")
-    }
-
     fun getEnhancedTrackingProtectionAsset(server: MockWebServer): TestAsset {
         val url = server.url("pages/trackingPage.html").toString().toUri()!!
+        val content = "Level 1 (Basic) List"
 
-        return TestAsset(url, "", "")
+        return TestAsset(url, content, "")
     }
 
     fun getImageAsset(server: MockWebServer): TestAsset {
@@ -93,6 +87,30 @@ object TestAssetHelper {
         return TestAsset(url, "", "")
     }
 
+    fun getAddressFormAsset(server: MockWebServer): TestAsset {
+        val url = server.url("pages/addressForm.html").toString().toUri()!!
+
+        return TestAsset(url, "", "")
+    }
+
+    fun getCreditCardFormAsset(server: MockWebServer): TestAsset {
+        val url = server.url("pages/creditCardForm.html").toString().toUri()!!
+
+        return TestAsset(url, "", "")
+    }
+
+    fun getHTMLControlsFormAsset(server: MockWebServer): TestAsset {
+        val url = server.url("pages/htmlControls.html").toString().toUri()!!
+
+        return TestAsset(url, "", "")
+    }
+
+    fun getExternalLinksAsset(server: MockWebServer): TestAsset {
+        val url = server.url("pages/externalLinks.html").toString().toUri()!!
+
+        return TestAsset(url, "", "")
+    }
+
     fun getAudioPageAsset(server: MockWebServer): TestAsset {
         val url = server.url("pages/audioMediaPage.html").toString().toUri()!!
         val title = "Audio_Test_Page"
@@ -108,4 +126,10 @@ object TestAssetHelper {
 
         return TestAsset(url, content, title)
     }
+
+    fun getStorageTestAsset(server: MockWebServer, pageAsset: String): TestAsset {
+        val url = server.url("pages/$pageAsset").toString().toUri()!!
+
+        return TestAsset(url, "", "")
+    }
 }

app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt

@@ -2,44 +2,89 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+@file:Suppress("DEPRECATION")
+
 package org.mozilla.fenix.helpers
 
+import android.Manifest
+import android.app.ActivityManager
+import android.app.PendingIntent
 import android.content.ActivityNotFoundException
+import android.content.ClipData
+import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
+import android.content.res.Configuration
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.Color
 import android.net.Uri
 import android.os.Build
-import android.os.Environment
-import androidx.preference.PreferenceManager
+import android.os.storage.StorageManager
+import android.os.storage.StorageVolume
+import android.provider.Settings
+import android.util.Log
+import android.view.View
+import androidx.annotation.RequiresApi
+import androidx.browser.customtabs.CustomTabsIntent
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.IdlingRegistry
+import androidx.test.espresso.IdlingResource
 import androidx.test.espresso.action.ViewActions.longClick
 import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.intent.Intents.intended
+import androidx.test.espresso.intent.matcher.IntentMatchers.toPackage
+import androidx.test.espresso.matcher.ViewMatchers.hasSibling
+import androidx.test.espresso.matcher.ViewMatchers.withChild
 import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withParent
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.permission.PermissionRequester
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.UiDevice
+import androidx.test.uiautomator.UiObject
 import androidx.test.uiautomator.UiScrollable
 import androidx.test.uiautomator.UiSelector
 import androidx.test.uiautomator.Until
-import kotlinx.coroutines.runBlocking
+import junit.framework.AssertionFailedError
+import mozilla.components.browser.state.search.SearchEngine
+import mozilla.components.support.ktx.android.content.appName
 import org.hamcrest.CoreMatchers
 import org.hamcrest.CoreMatchers.allOf
+import org.hamcrest.Matcher
+import org.junit.Assert
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.mozilla.fenix.Config
+import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
+import org.mozilla.fenix.customtabs.ExternalAppBrowserActivity
+import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
+import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeShort
 import org.mozilla.fenix.helpers.ext.waitNotNull
 import org.mozilla.fenix.helpers.idlingresource.NetworkConnectionIdlingResource
-import org.mozilla.fenix.ui.robots.mDevice
+import org.mozilla.fenix.ui.robots.BrowserRobot
+import org.mozilla.fenix.utils.IntentUtils
+import org.mozilla.gecko.util.ThreadUtils
 import java.io.File
+import java.util.Locale
+import java.util.regex.Pattern
 
 object TestHelper {
 
-    val packageName = InstrumentationRegistry.getInstrumentation().targetContext.packageName
+    val appContext: Context = InstrumentationRegistry.getInstrumentation().targetContext
+    val appName = appContext.appName
+    var mDevice: UiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+    val packageName: String = appContext.packageName
 
     fun scrollToElementByText(text: String): UiScrollable {
         val appView = UiScrollable(UiSelector().scrollable(true))
+        appView.waitForExists(waitingTime)
         appView.scrollTextIntoView(text)
         return appView
     }
@@ -47,25 +92,19 @@ object TestHelper {
     fun longTapSelectItem(url: Uri) {
         mDevice.waitNotNull(
             Until.findObject(By.text(url.toString())),
-            TestAssetHelper.waitingTime
+            waitingTime,
         )
         onView(
             allOf(
                 withId(R.id.url),
-                withText(url.toString())
-            )
+                withText(url.toString()),
+            ),
         ).perform(longClick())
     }
 
-    fun setPreference(context: Context, pref: String, value: Int) {
-        val preferences = PreferenceManager.getDefaultSharedPreferences(context)
-        val editor = preferences.edit()
-        editor.putInt(pref, value)
-        editor.apply()
-    }
-
-    fun restartApp(activity: HomeActivityTestRule) {
+    fun restartApp(activity: HomeActivityIntentTestRule) {
         with(activity) {
+            updateCachedSettings()
             finishActivity()
             mDevice.waitForIdle()
             launchActivity(null)
@@ -74,7 +113,7 @@ object TestHelper {
 
     fun getPermissionAllowID(): String {
         return when
-            (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
+        (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
             true -> "com.android.permissioncontroller"
             false -> "com.android.packageinstaller"
         }
@@ -83,10 +122,16 @@ object TestHelper {
     fun waitUntilObjectIsFound(resourceName: String) {
         mDevice.waitNotNull(
             Until.findObjects(By.res(resourceName)),
-            TestAssetHelper.waitingTime
+            waitingTime,
         )
     }
 
+    fun waitUntilSnackbarGone() {
+        mDevice.findObject(
+            UiSelector().resourceId("$packageName:id/snackbar_layout"),
+        ).waitUntilGone(waitingTime)
+    }
+
     fun verifyUrl(urlSubstring: String, resourceName: String, resId: Int) {
         waitUntilObjectIsFound(resourceName)
         mDevice.findObject(UiSelector().text(urlSubstring)).waitForExists(waitingTime)
@@ -98,7 +143,7 @@ object TestHelper {
         val intent = Intent().apply {
             action = Intent.ACTION_VIEW
             data = Uri.parse(url)
-            `package` = "org.mozilla.fenix.debug"
+            `package` = packageName
             flags = Intent.FLAG_ACTIVITY_NEW_TASK
         }
         try {
@@ -109,23 +154,24 @@ object TestHelper {
         }
     }
 
-    // Remove test file from the device Downloads folder
-    @Suppress("Deprecation")
-    fun deleteDownloadFromStorage(fileName: String) {
-        runBlocking {
-            val downloadedFile = File(
-                Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS),
-                fileName
-            )
-
-            if (downloadedFile.exists()) {
-                downloadedFile.delete()
-            }
+    @RequiresApi(Build.VERSION_CODES.R)
+    fun deleteDownloadedFileOnStorage(fileName: String) {
+        val storageManager: StorageManager? = appContext.getSystemService(Context.STORAGE_SERVICE) as StorageManager?
+        val storageVolumes = storageManager!!.storageVolumes
+        val storageVolume: StorageVolume = storageVolumes[0]
+        val file = File(storageVolume.directory!!.path + "/Download/" + fileName)
+        try {
+            file.delete()
+            Log.d("TestLog", "File delete try 1")
+            assertFalse("The file was not deleted", file.exists())
+        } catch (e: AssertionError) {
+            file.delete()
+            Log.d("TestLog", "File delete retried")
+            assertFalse("The file was not deleted", file.exists())
         }
     }
 
     fun setNetworkEnabled(enabled: Boolean) {
-        val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
         val networkDisconnectedIdlingResource = NetworkConnectionIdlingResource(false)
         val networkConnectedIdlingResource = NetworkConnectionIdlingResource(true)
 
@@ -153,4 +199,266 @@ object TestHelper {
             }
         }
     }
+
+    fun createCustomTabIntent(
+        pageUrl: String,
+        customMenuItemLabel: String = "",
+        customActionButtonDescription: String = "",
+    ): Intent {
+        val appContext = InstrumentationRegistry.getInstrumentation()
+            .targetContext
+            .applicationContext
+        val pendingIntent = PendingIntent.getActivity(appContext, 0, Intent(), IntentUtils.defaultIntentPendingFlags)
+        val customTabsIntent = CustomTabsIntent.Builder()
+            .addMenuItem(customMenuItemLabel, pendingIntent)
+            .setShareState(CustomTabsIntent.SHARE_STATE_ON)
+            .setActionButton(
+                createTestBitmap(),
+                customActionButtonDescription,
+                pendingIntent,
+                true,
+            )
+            .build()
+        customTabsIntent.intent.data = Uri.parse(pageUrl)
+        return customTabsIntent.intent
+    }
+
+    private fun createTestBitmap(): Bitmap {
+        val bitmap = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888)
+        val canvas = Canvas(bitmap)
+        canvas.drawColor(Color.GREEN)
+        return bitmap
+    }
+
+    fun isPackageInstalled(packageName: String): Boolean {
+        return try {
+            val packageManager = InstrumentationRegistry.getInstrumentation().context.packageManager
+            packageManager.getApplicationInfo(packageName, 0).enabled
+        } catch (exception: PackageManager.NameNotFoundException) {
+            false
+        }
+    }
+
+    fun assertExternalAppOpens(appPackageName: String) {
+        if (isPackageInstalled(appPackageName)) {
+            try {
+                intended(toPackage(appPackageName))
+            } catch (e: AssertionFailedError) {
+                e.printStackTrace()
+            }
+        } else {
+            mDevice.waitNotNull(
+                Until.findObject(By.text("Could not open file")),
+                waitingTime,
+            )
+        }
+    }
+
+    fun assertNativeAppOpens(appPackageName: String, url: String = "") {
+        if (isPackageInstalled(appPackageName)) {
+            mDevice.waitForIdle(waitingTimeShort)
+            assertTrue(
+                mDevice.findObject(UiSelector().packageName(appPackageName))
+                    .waitForExists(waitingTime),
+            )
+        } else {
+            BrowserRobot().verifyUrl(url)
+        }
+    }
+
+    fun assertPlayStoreOpens() {
+        if (isPackageInstalled(Constants.PackageName.GOOGLE_PLAY_SERVICES)) {
+            try {
+                intended(toPackage(Constants.PackageName.GOOGLE_PLAY_SERVICES))
+            } catch (e: AssertionFailedError) {
+                BrowserRobot().verifyRateOnGooglePlayURL()
+            }
+        } else {
+            BrowserRobot().verifyRateOnGooglePlayURL()
+        }
+    }
+
+    /**
+     * Checks whether the latest activity of the application is used for custom tabs or PWAs.
+     *
+     * @return Boolean value that helps us know if the current activity supports custom tabs or PWAs.
+     */
+    fun isExternalAppBrowserActivityInCurrentTask(): Boolean {
+        val activityManager = appContext.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
+
+        mDevice.waitForIdle(waitingTimeShort)
+
+        return activityManager.appTasks[0].taskInfo.topActivity!!.className == ExternalAppBrowserActivity::class.java.name
+    }
+
+    /**
+     * Run test with automatically registering idling resources and cleanup.
+     *
+     * @param idlingResources zero or more [IdlingResource] to be used when running [testBlock].
+     * @param testBlock test code to execute.
+     */
+    fun registerAndCleanupIdlingResources(
+        vararg idlingResources: IdlingResource,
+        testBlock: () -> Unit,
+    ) {
+        idlingResources.forEach {
+            IdlingRegistry.getInstance().register(it)
+        }
+
+        try {
+            testBlock()
+        } finally {
+            idlingResources.forEach {
+                IdlingRegistry.getInstance().unregister(it)
+            }
+        }
+    }
+
+    // exit from Menus to home screen or browser
+    fun exitMenu() {
+        val toolbar =
+            mDevice.findObject(UiSelector().resourceId("$packageName:id/toolbar"))
+        while (!toolbar.waitForExists(waitingTimeShort)) {
+            mDevice.pressBack()
+        }
+    }
+
+    fun UiDevice.waitForObjects(obj: UiObject, waitingTime: Long = TestAssetHelper.waitingTime) {
+        this.waitForIdle()
+        Assert.assertNotNull(obj.waitForExists(waitingTime))
+    }
+
+    fun hasCousin(matcher: Matcher<View>): Matcher<View> {
+        return withParent(
+            hasSibling(
+                withChild(
+                    matcher,
+                ),
+            ),
+        )
+    }
+
+    fun getStringResource(id: Int) = appContext.resources.getString(id, appName)
+
+    fun setCustomSearchEngine(searchEngine: SearchEngine) {
+        with(appContext.components.useCases.searchUseCases) {
+            addSearchEngine(searchEngine)
+            selectSearchEngine(searchEngine)
+        }
+    }
+
+    fun grantPermission() {
+        if (Build.VERSION.SDK_INT >= 23) {
+            mDevice.findObject(
+                By.text(
+                    when (Build.VERSION.SDK_INT) {
+                        Build.VERSION_CODES.R -> Pattern.compile(
+                            "WHILE USING THE APP",
+                            Pattern.CASE_INSENSITIVE,
+                        )
+                        else -> Pattern.compile("Allow", Pattern.CASE_INSENSITIVE)
+                    },
+                ),
+            ).click()
+        }
+    }
+
+    fun denyPermission() {
+        if (Build.VERSION.SDK_INT >= 23) {
+            mDevice.findObject(
+                By.text(
+                    when (Build.VERSION.SDK_INT) {
+                        Build.VERSION_CODES.R -> Pattern.compile(
+                            "DENY",
+                            Pattern.CASE_INSENSITIVE,
+                        )
+                        else -> Pattern.compile("Deny", Pattern.CASE_INSENSITIVE)
+                    },
+                ),
+            ).click()
+        }
+    }
+
+    fun isTestLab(): Boolean {
+        return Settings.System.getString(appContext.contentResolver, "firebase.test.lab").toBoolean()
+    }
+
+    private val charPool: List<Char> = ('a'..'z') + ('A'..'Z') + ('0'..'9')
+    fun generateRandomString(stringLength: Int) =
+        (1..stringLength)
+            .map { kotlin.random.Random.nextInt(0, charPool.size) }
+            .map(charPool::get)
+            .joinToString("")
+
+    /**
+     * Changes the default language of the entire device, not just the app.
+     * Runs on Debug variant as we don't want to adjust Release permission manifests
+     * Runs the test in its testBlock.
+     * Cleans up and sets the default locale after it's done.
+     */
+    fun runWithSystemLocaleChanged(locale: Locale, testRule: ActivityTestRule<HomeActivity>, testBlock: () -> Unit) {
+        if (Config.channel.isDebug) {
+            /* Sets permission to change device language */
+            PermissionRequester().apply {
+                addPermissions(
+                    Manifest.permission.CHANGE_CONFIGURATION,
+                )
+                requestPermissions()
+            }
+
+            val defaultLocale = Locale.getDefault()
+
+            try {
+                setSystemLocale(locale)
+                testBlock()
+                ThreadUtils.runOnUiThread { testRule.activity.recreate() }
+            } catch (e: Exception) {
+                e.printStackTrace()
+            } finally {
+                setSystemLocale(defaultLocale)
+            }
+        }
+    }
+
+    /**
+     * Changes the default language of the entire device, not just the app.
+     */
+    private fun setSystemLocale(locale: Locale) {
+        val activityManagerNative = Class.forName("android.app.ActivityManagerNative")
+        val am = activityManagerNative.getMethod("getDefault", *arrayOfNulls(0))
+            .invoke(activityManagerNative, *arrayOfNulls(0))
+        val config = InstrumentationRegistry.getInstrumentation().context.resources.configuration
+        config.javaClass.getDeclaredField("locale")[config] = locale
+        config.javaClass.getDeclaredField("userSetLocale").setBoolean(config, true)
+        am.javaClass.getMethod(
+            "updateConfiguration",
+            Configuration::class.java,
+        ).invoke(am, config)
+    }
+
+    /**
+     * Creates clipboard data.
+     */
+    fun setTextToClipBoard(context: Context, message: String) {
+        val clipBoard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+        val clipData = ClipData.newPlainText("label", message)
+
+        clipBoard.setPrimaryClip(clipData)
+    }
+
+    /**
+     * Returns sponsored shortcut title based on the index.
+     */
+    fun getSponsoredShortcutTitle(position: Int): String {
+        val sponsoredShortcut = mDevice.findObject(
+            UiSelector()
+                .resourceId("$packageName:id/top_site_item")
+                .index(position - 1),
+        ).getChild(
+            UiSelector()
+                .resourceId("$packageName:id/top_site_title"),
+        ).text
+
+        return sponsoredShortcut
+    }
 }

app/src/androidTest/java/org/mozilla/fenix/helpers/ViewVisibilityIdlingResource.kt

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 package org.mozilla.fenix.helpers
 
 import android.view.View
@@ -5,7 +9,7 @@ import androidx.test.espresso.IdlingResource
 
 class ViewVisibilityIdlingResource(
     private val view: View,
-    private val expectedVisibility: Int
+    private val expectedVisibility: Int,
 ) : IdlingResource {
     private var resourceCallback: IdlingResource.ResourceCallback? = null
     private var isIdle: Boolean = false

app/src/androidTest/java/org/mozilla/fenix/helpers/assertions/AwesomeBarAssertion.kt

@@ -1,36 +0,0 @@
-package org.mozilla.fenix.helpers.assertions
-
-import android.view.View
-import androidx.test.espresso.ViewAssertion
-import mozilla.components.browser.awesomebar.BrowserAwesomeBar
-
-class AwesomeBarAssertion {
-    companion object {
-        fun suggestionsAreGreaterThan(minimumSuggestions: Int): ViewAssertion {
-            return ViewAssertion { view, noViewFoundException ->
-                if (noViewFoundException != null) throw noViewFoundException
-
-                val suggestionsCount = getSuggestionCountFromView(view)
-
-                if (suggestionsCount <= minimumSuggestions)
-                    throw AssertionError("The suggestion count is less than or equal to the minimum suggestions")
-            }
-        }
-
-        fun suggestionsAreEqualTo(expectedItemCount: Int): ViewAssertion {
-            return ViewAssertion { view, noViewFoundException ->
-                if (noViewFoundException != null) throw noViewFoundException
-
-                val suggestionsCount = getSuggestionCountFromView(view)
-
-                if (suggestionsCount != expectedItemCount)
-                    throw AssertionError("The expected item count is $expectedItemCount, and the suggestions count within the AwesomeBar is $suggestionsCount")
-            }
-        }
-
-        private fun getSuggestionCountFromView(view: View): Int {
-            return (view as BrowserAwesomeBar).adapter?.itemCount
-                ?: throw AssertionError("This view is not of type BrowserAwesomeBar")
-        }
-    }
-}

app/src/androidTest/java/org/mozilla/fenix/helpers/ext/String.kt

@@ -16,10 +16,10 @@ import java.net.URISyntaxException
  */
 fun String.removePrefixesIgnoreCase(vararg prefixes: String): String {
     var value = this
-    var lower = this.toLowerCase()
+    var lower = this.lowercase()
 
     prefixes.forEach {
-        if (lower.startsWith(it.toLowerCase())) {
+        if (lower.startsWith(it.lowercase())) {
             value = value.substring(it.length)
             lower = lower.substring(it.length)
         }

app/src/androidTest/java/org/mozilla/fenix/helpers/ext/ViewInteraction.kt

@@ -43,6 +43,6 @@ fun ViewInteraction.clickAtLocationInView(locationInView: GeneralLocation): View
             locationInView,
             Press.FINGER,
             InputDevice.SOURCE_UNKNOWN,
-            MotionEvent.BUTTON_PRIMARY
-        )
+            MotionEvent.BUTTON_PRIMARY,
+        ),
     )

app/src/androidTest/java/org/mozilla/fenix/helpers/ext/WaitNotNull.kt

@@ -16,5 +16,5 @@ import org.mozilla.fenix.helpers.TestAssetHelper
  */
 fun UiDevice.waitNotNull(
     searchCondition: SearchCondition<*>,
-    waitTime: Long = TestAssetHelper.waitingTime
+    waitTime: Long = TestAssetHelper.waitingTime,
 ) = assertNotNull(wait(searchCondition, waitTime))

app/src/androidTest/java/org/mozilla/fenix/helpers/idlingresource/AddonsInstallingIdlingResource.kt

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 package org.mozilla.fenix.helpers.idlingresource
 
 import androidx.fragment.app.FragmentManager
@@ -6,7 +10,7 @@ import androidx.test.espresso.IdlingResource
 import mozilla.components.feature.addons.ui.AddonInstallationDialogFragment
 
 class AddonsInstallingIdlingResource(
-    val fragmentManager: FragmentManager
+    private val fragmentManager: FragmentManager,
 ) :
     IdlingResource {
     private var resourceCallback: IdlingResource.ResourceCallback? = null
@@ -21,8 +25,9 @@ class AddonsInstallingIdlingResource(
     }
 
     override fun registerIdleTransitionCallback(callback: IdlingResource.ResourceCallback?) {
-        if (callback != null)
+        if (callback != null) {
             resourceCallback = callback
+        }
     }
 
     private fun isInstalledAddonDialogShown(): Boolean {

app/src/androidTest/java/org/mozilla/fenix/helpers/idlingresource/AddonsLoadingIdlingResource.kt

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 package org.mozilla.fenix.helpers.idlingresource
 
 import android.view.View
@@ -16,14 +20,16 @@ class AddonsLoadingIdlingResource(val fragmentManager: FragmentManager) : Idling
 
     override fun isIdleNow(): Boolean {
         val idle = addonsFinishedLoading()
-        if (idle)
+        if (idle) {
             resourceCallback?.onTransitionToIdle()
+        }
         return idle
     }
 
     override fun registerIdleTransitionCallback(callback: IdlingResource.ResourceCallback?) {
-        if (callback != null)
+        if (callback != null) {
             resourceCallback = callback
+        }
     }
 
     private fun addonsFinishedLoading(): Boolean {
@@ -33,8 +39,9 @@ class AddonsLoadingIdlingResource(val fragmentManager: FragmentManager) : Idling
             addonsManagementFragment.view?.findViewById<View>(R.id.add_ons_progress_bar)
         } ?: return true
 
-        if (progressbar.visibility == VISIBLE)
+        if (progressbar.visibility == VISIBLE) {
             return false
+        }
 
         return true
     }

app/src/androidTest/java/org/mozilla/fenix/helpers/idlingresource/NetworkConnectionIdlingResource.kt

@@ -32,14 +32,16 @@ class NetworkConnectionIdlingResource(private val networkConnected: Boolean) : I
             } else {
                 !isOnline()
             }
-        if (idle)
+        if (idle) {
             resourceCallback?.onTransitionToIdle()
+        }
         return idle
     }
 
     override fun registerIdleTransitionCallback(callback: IdlingResource.ResourceCallback?) {
-        if (callback != null)
+        if (callback != null) {
             resourceCallback = callback
+        }
     }
 
     private fun isOnline(): Boolean {

app/src/androidTest/java/org/mozilla/fenix/helpers/matchers/BitmapDrawableMatcher.kt

@@ -1,13 +1,17 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 package org.mozilla.fenix.helpers.matchers
 
 import android.graphics.Bitmap
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.StateListDrawable
 import android.view.View
 import android.widget.ImageView
 import androidx.test.espresso.matcher.BoundedMatcher
 import org.hamcrest.Description
-import android.graphics.drawable.BitmapDrawable
-import android.graphics.drawable.StateListDrawable
-import android.graphics.drawable.Drawable
 
 class BitmapDrawableMatcher(private val bitmap: Bitmap, private val name: String) :
     BoundedMatcher<View, ImageView>(ImageView::class.java) {

app/src/androidTest/java/org/mozilla/fenix/helpers/matchers/BottomSheetBehaviorMatchers.kt

@@ -28,7 +28,7 @@ class BottomSheetBehaviorHalfExpandedMaxRatioMatcher(private val maxHalfExpanded
     override fun describeTo(description: Description?) {
         description?.appendText(
             "BottomSheetBehavior with an at max halfExpandedRation: " +
-                "$maxHalfExpandedRatio"
+                "$maxHalfExpandedRatio",
         )
     }
 

app/src/androidTest/java/org/mozilla/fenix/helpers/matchers/RecyclerViewItemMatcher.kt

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 package org.mozilla.fenix.helpers.matchers
 
 import android.view.View

app/src/androidTest/java/org/mozilla/fenix/perf/SampleBenchmark.kt

@@ -0,0 +1,38 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.perf
+
+import androidx.benchmark.junit4.BenchmarkRule
+import androidx.benchmark.junit4.measureRepeated
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Ignore
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * To run this benchmark:
+ * - Comment out @Ignore: DO NOT COMMIT THIS!
+ * - See run instructions in app/benchmark.gradle
+ *
+ * See https://developer.android.com/studio/profile/benchmark#write-benchmark for how to write a
+ * real benchmark, including testing UI code. See
+ * https://developer.android.com/studio/profile/benchmark#what-to-benchmark for when jetpack
+ * microbenchmark is a good fit.
+ */
+@Ignore("This is a sample: we don't want it to run when we run all the tests")
+@RunWith(AndroidJUnit4::class)
+class SampleBenchmark {
+    @get:Rule
+    val benchmarkRule = BenchmarkRule()
+
+    @Test
+    fun additionBenchmark() = benchmarkRule.measureRepeated {
+        var i = 0
+        while (i < 10_000_000) {
+            i++
+        }
+    }
+}

app/src/androidTest/java/org/mozilla/fenix/perf/StartupExcessiveResourceUseTest.kt

@@ -4,7 +4,6 @@
 
 package org.mozilla.fenix.perf
 
-import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import androidx.constraintlayout.widget.ConstraintLayout
@@ -12,68 +11,92 @@ import androidx.core.view.children
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.UiDevice
-import kotlinx.android.synthetic.main.activity_home.*
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.helpers.HomeActivityTestRule
 
-// BEFORE INCREASING THESE VALUES, PLEASE CONSULT WITH THE PERF TEAM.
-private const val EXPECTED_SUPPRESSION_COUNT = 11
-private const val EXPECTED_RUNBLOCKING_COUNT = 2
-private const val EXPECTED_COMPONENT_INIT_COUNT = 42
-private const val EXPECTED_VIEW_HIERARCHY_DEPTH = 12
-private const val EXPECTED_RECYCLER_VIEW_CONSTRAINT_LAYOUT_CHILDREN = 4
-private const val EXPECTED_NUMBER_OF_INFLATION = 12
+// BEFORE CHANGING EXPECTED_* VALUES, PLEASE READ THE TEST CLASS KDOC.
 
-private val failureMsgStrictMode = getErrorMessage(
-    shortName = "StrictMode suppression",
-    implications = "suppressing a StrictMode violation can introduce performance regressions?"
-)
-
-private val failureMsgRunBlocking = getErrorMessage(
-    shortName = "runBlockingIncrement",
-    implications = "using runBlocking may block the main thread and have other negative performance implications?"
-)
-
-private val failureMsgComponentInit = getErrorMessage(
-    shortName = "Component init",
-    implications = "initializing new components on start up may be an indication that we're doing more work than necessary on start up?"
-)
-
-private val failureMsgViewHierarchyDepth = getErrorMessage(
-    shortName = "view hierarchy depth",
-    implications = "having a deep view hierarchy can slow down measure/layout performance?"
-) + "Please note that we're not sure if this is a useful metric to assert: with your feedback, " +
-    "we'll find out over time if it is or is not."
-
-private val failureMsgRecyclerViewConstraintLayoutChildren = getErrorMessage(
-    shortName = "ConstraintLayout being a common direct descendant of a RecyclerView",
-    implications = "ConstraintLayouts are slow to inflate and are primarily used to flatten deep " +
-        "view hierarchies so can be under-performant as a common RecyclerView child?"
-) + "Please note that we're not sure if this is a useful metric to assert: with your feedback, " +
-    "we'll find out over time if it is or is not."
-
-private val failureMsgNumberOfInflation = getErrorMessage(
-    shortName = "Number of inflation on start up doesn't match expected count",
-    implications = "The number of inflation can negatively impact start up time. Having more inflations" +
-            "will most likely mean we're adding extra work on the UI thread."
-)
 /**
- * A performance test to limit the number of StrictMode suppressions and number of runBlocking used
- * on startup.
+ * The number of times a StrictMode violation is suppressed during this start up scenario.
+ * Incrementing the expected value indicates a potential performance regression.
  *
- * This test was written by the perf team.
+ * One feature of StrictMode is to detect potential performance regressions and, in particular, to
+ * detect main thread IO. This includes network requests (which can block for multiple seconds),
+ * file read/writes (which generally block for tens to hundreds of milliseconds), and file stats
+ * (like most SharedPreferences accesses, which block for small amounts of time). Main thread IO
+ * should be replaced with a background operation that posts to the main thread when the IO request
+ * is complete.
  *
- * StrictMode detects main thread IO, which is often indicative of a performance issue.
- * It's easy to suppress StrictMode so we wrote a test to ensure we have a discussion
- * if the StrictMode count changes.
+ * Say no to main thread IO! 🙅
+ */
+private const val EXPECTED_SUPPRESSION_COUNT = 18
+
+/**
+ * The number of times we call the `runBlocking` coroutine method on the main thread during this
+ * start up scenario. Increment the expected values indicates a potential performance regression.
  *
- * RunBlocking is mostly used to return values to a thread from a coroutine. However, if that
- * coroutine takes too long, it can lead that thread to block every other operations.
+ * runBlocking indicates that we're blocking the current thread waiting for the result of another
+ * coroutine. While the main thread is blocked, 1) we can't handle user input and the user may feel
+ * Firefox is slow and 2) we can't use the main thread to continue initialization that must occur on
+ * the main thread (like initializing UI), slowing down start up overall. Blocking calls should
+ * generally be replaced with a slow operation on a background thread launching onto the main thread
+ * when completed. However, in a very small number of cases, blocking may be impossible to avoid.
+ */
+private val EXPECTED_RUNBLOCKING_RANGE = 0..2 // CI has +1 counts compared to local runs: increment these together
+
+/**
+ * The number of `ConstraintLayout`s we inflate that are children of a `RecyclerView` during this
+ * start up scenario. Incrementing the expected value indicates a potential performance regression.
+ * THIS IS AN EXPERIMENTAL METRIC and we are not yet confident reducing this count will mitigate
+ * start up regressions. If you do not find it useful or if it's too noisy, you can consider
+ * removing it.
  *
- * The perf team is code owners for this package so they should be notified when the counts are modified.
+ * ConstraintLayout is expensive to inflate (though fast to measure/layout) so we want to avoid
+ * creating too many of them synchronously during start up. Generally, these should be inflated
+ * asynchronously or replaced with cheaper layouts (if they're not too expensive to measure/layout).
+ * If the view hierarchy uses Jetpack Compose, switching to that is also an option.
+ */
+private val EXPECTED_RECYCLER_VIEW_CONSTRAINT_LAYOUT_CHILDREN =
+    4..6 // The messaging framework is not deterministic and could add to the count.
+
+/**
+ * The number of layouts we inflate during this start up scenario. Incrementing the expected value
+ * indicates a potential performance regression. THIS IS AN EXPERIMENTAL METRIC and we are not yet
+ * confident reducing this count will mitigate start up regressions. If you do not find it useful or
+ * if it's too noisy, you can consider removing it.
+ *
+ * Each layout inflation is suspected of having overhead (e.g. accessing each layout resource from
+ * disk) so suspect inflating more layouts may slow down start up. Ideally, layouts would be merged
+ * such that there is one inflation that includes all of the views needed on start up.
+ */
+private val EXPECTED_NUMBER_OF_INFLATION =
+    13..14 // The messaging framework is not deterministic and could add a +1 to the count
+
+private val failureMsgStrictMode = getErrorMessage("StrictMode suppression")
+private val failureMsgRunBlocking = getErrorMessage("runBlockingIncrement")
+private val failureMsgRecyclerViewConstraintLayoutChildren = getErrorMessage(
+    "ConstraintLayout being a common direct descendant of a RecyclerView",
+)
+private val failureMsgNumberOfInflation = getErrorMessage("start up inflation")
+
+/**
+ * A performance test that attempts to minimize start up performance regressions using heuristics
+ * rather than benchmarking. These heuristics measure occurrences of known performance anti-patterns
+ * and fails when the occurrence count changes. If the change indicates a regression, we should
+ * re-evaluate the PR to see if we can avoid the potential regression and, if not, change the
+ * expected value. If it indicates an improvement, we can change the expected value. The expected
+ * values can be updated without consulting the performance team.
+ *
+ * See `EXPECTED_*` above for explanations of the heuristics this test currently supports.
+ *
+ * The benefits of a heuristics-based performance test are that it is uses less CI time to get
+ * results so we can run it more often (e.g. for each PR) and it is less noisy than a benchmark.
+ * However, the downsides of this style of test is that if a heuristic value increases, it may not
+ * represent a real, significant performance regression.
  */
 class StartupExcessiveResourceUseTest {
     @get:Rule
@@ -90,37 +113,25 @@ class StartupExcessiveResourceUseTest {
         // causing this number to fluctuate depending on device speed. We'll deal with it if it occurs.
         val actualSuppresionCount = activityTestRule.activity.components.strictMode.suppressionCount.get().toInt()
         val actualRunBlocking = RunBlockingCounter.count.get()
-        val actualComponentInitCount = ComponentInitCount.count.get()
-
-        val rootView = activityTestRule.activity.rootContainer
-        val actualViewHierarchyDepth = countAndLogViewHierarchyDepth(rootView, 1)
-        val actualRecyclerViewConstraintLayoutChildren = countRecyclerViewConstraintLayoutChildren(rootView, null)
-
-        val actualNumberOfInflations = InflationCounter.inflationCount.get()
 
         assertEquals(failureMsgStrictMode, EXPECTED_SUPPRESSION_COUNT, actualSuppresionCount)
-        assertEquals(failureMsgRunBlocking, EXPECTED_RUNBLOCKING_COUNT, actualRunBlocking)
-        assertEquals(failureMsgComponentInit, EXPECTED_COMPONENT_INIT_COUNT, actualComponentInitCount)
-        assertEquals(failureMsgViewHierarchyDepth, EXPECTED_VIEW_HIERARCHY_DEPTH, actualViewHierarchyDepth)
-        assertEquals(
-            failureMsgRecyclerViewConstraintLayoutChildren,
-            EXPECTED_RECYCLER_VIEW_CONSTRAINT_LAYOUT_CHILDREN,
-            actualRecyclerViewConstraintLayoutChildren
-        )
-        assertEquals(failureMsgNumberOfInflation, EXPECTED_NUMBER_OF_INFLATION, actualNumberOfInflations)
-    }
-}
+        assertTrue(failureMsgRunBlocking + "actual: $actualRunBlocking", actualRunBlocking in EXPECTED_RUNBLOCKING_RANGE)
 
-private fun countAndLogViewHierarchyDepth(view: View, level: Int): Int {
-    // Log for debugging purposes: not sure if this is actually helpful.
-    val indent = "| ".repeat(level - 1)
-    Log.d("Startup...Test", "${indent}$view")
-
-    return if (view !is ViewGroup) {
-        level
-    } else {
-        val maxDepth = view.children.map { countAndLogViewHierarchyDepth(it, level + 1) }.maxOrNull()
-        maxDepth ?: level
+        // This below asserts fail in Firebase with different values for
+        // "actualRecyclerViewConstraintLayoutChildren" or "actualNumberOfInflations"
+        // See https://github.com/mozilla-mobile/fenix/pull/26512 and https://github.com/mozilla-mobile/fenix/issues/25142
+        //
+        // val rootView = activityTestRule.activity.findViewById<LinearLayout>(R.id.rootContainer)
+        // val actualRecyclerViewConstraintLayoutChildren = countRecyclerViewConstraintLayoutChildren(rootView, null)
+        // assertTrue(
+        //     failureMsgRecyclerViewConstraintLayoutChildren + "actual: $actualRecyclerViewConstraintLayoutChildren",
+        //     actualRecyclerViewConstraintLayoutChildren in EXPECTED_RECYCLER_VIEW_CONSTRAINT_LAYOUT_CHILDREN,
+        // )
+        // val actualNumberOfInflations = InflationCounter.inflationCount.get()
+        // assertTrue(
+        //     failureMsgNumberOfInflation + "actual: $actualNumberOfInflations",
+        //     actualNumberOfInflations in EXPECTED_NUMBER_OF_INFLATION,
+        // )
     }
 }
 
@@ -134,18 +145,15 @@ private fun countRecyclerViewConstraintLayoutChildren(view: View, parent: View?)
     return if (view !is ViewGroup) {
         viewValue
     } else {
-        viewValue + view.children.sumBy { countRecyclerViewConstraintLayoutChildren(it, view) }
+        viewValue + view.children.sumOf { countRecyclerViewConstraintLayoutChildren(it, view) }
     }
 }
 
-private fun getErrorMessage(shortName: String, implications: String) = """$shortName count does not match expected count.
+private fun getErrorMessage(shortName: String) = """$shortName count does not match expected count.
 
-    If this PR removed a $shortName call, great! Please decrease the count.
-
-    Did this PR add or call code that increases the $shortName count?
-    Did you know that $implications
-    Please do your best to implement a solution without adding $shortName calls.
-    Please consult the perf team if you have questions or believe that having this call
-    is the optimal solution.
+    This heuristic-based performance test is expected measure the number of occurrences of known
+    performance anti-patterns and fail when that count changes. Please read the class documentation
+    for more details about this test and an explanation of what the failed heuristic is expected to
+    measure. Please consult the performance team if you have questions.
 
 """

app/src/androidTest/java/org/mozilla/fenix/screenshots/DefaultHomeScreenTest.kt

@@ -2,27 +2,39 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+@file:Suppress("DEPRECATION")
+
 package org.mozilla.fenix.screenshots
 
 import android.os.SystemClock
+import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.ActivityTestRule
+import androidx.test.uiautomator.UiDevice
 import org.junit.After
+import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.mozilla.fenix.helpers.HomeActivityTestRule
 import org.mozilla.fenix.HomeActivity
+import org.mozilla.fenix.helpers.HomeActivityTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.ui.robots.homeScreen
-import org.mozilla.fenix.ui.robots.mDevice
 import tools.fastlane.screengrab.Screengrab
 import tools.fastlane.screengrab.locale.LocaleTestRule
 
 class DefaultHomeScreenTest : ScreenshotTest() {
+    private lateinit var mDevice: UiDevice
+
     @Rule @JvmField
     val localeTestRule = LocaleTestRule()
+
     @get:Rule
     var mActivityTestRule: ActivityTestRule<HomeActivity> = HomeActivityTestRule()
 
+    @Before
+    fun setUp() {
+        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+    }
+
     @After
     fun tearDown() {
         mActivityTestRule.getActivity().finishAndRemoveTask()
@@ -32,7 +44,6 @@ class DefaultHomeScreenTest : ScreenshotTest() {
     fun showDefaultHomeScreen() {
         homeScreen {
             verifyAccountsSignInButton()
-            swipeToBottom()
             Screengrab.screenshot("HomeScreenRobot_home-screen-scroll")
             TestAssetHelper.waitingTime
         }

app/src/androidTest/java/org/mozilla/fenix/screenshots/MenuScreenShotTest.kt

@@ -2,46 +2,51 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+@file:Suppress("DEPRECATION")
+
 package org.mozilla.fenix.screenshots
 
 import android.os.SystemClock
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
-import androidx.test.rule.ActivityTestRule
+import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.By
+import androidx.test.uiautomator.UiDevice
 import androidx.test.uiautomator.Until
-import tools.fastlane.screengrab.Screengrab
-import tools.fastlane.screengrab.locale.LocaleTestRule
 import okhttp3.mockwebserver.MockWebServer
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
+import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.click
 import org.mozilla.fenix.helpers.ext.waitNotNull
-import org.mozilla.fenix.ui.robots.homeScreen
 import org.mozilla.fenix.ui.robots.bookmarksMenu
-import org.mozilla.fenix.ui.robots.mDevice
+import org.mozilla.fenix.ui.robots.homeScreen
 import org.mozilla.fenix.ui.robots.navigationToolbar
 import org.mozilla.fenix.ui.robots.swipeToBottom
+import tools.fastlane.screengrab.Screengrab
+import tools.fastlane.screengrab.locale.LocaleTestRule
 
 class MenuScreenShotTest : ScreenshotTest() {
     private lateinit var mockWebServer: MockWebServer
+    private lateinit var mDevice: UiDevice
+
     @Rule
     @JvmField
     val localeTestRule = LocaleTestRule()
 
     @get:Rule
-    var mActivityTestRule: ActivityTestRule<HomeActivity> = HomeActivityTestRule()
+    var mActivityTestRule = HomeActivityTestRule.withDefaultSettingsOverrides()
 
     @Before
     fun setUp() {
+        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
         mockWebServer = MockWebServer().apply {
             dispatcher = AndroidAssetDispatcher()
             start()
@@ -68,47 +73,38 @@ class MenuScreenShotTest : ScreenshotTest() {
         }.openThreeDotMenu {
         }.openSettings {
             Screengrab.screenshot("SettingsRobot_settings-menu")
-            settingsAccountPreferences()
+        }.openTurnOnSyncMenu {
             Screengrab.screenshot("AccountSettingsRobot_settings-account")
-            mDevice.pressBack()
-
-            settingsSearch()
+        }.goBack {
+        }.openSearchSubMenu {
             Screengrab.screenshot("SettingsSubMenuSearchRobot_settings-search")
-            mDevice.pressBack()
-
-            settingsTheme()
+        }.goBack {
+        }.openCustomizeSubMenu {
             Screengrab.screenshot("SettingsSubMenuThemeRobot_settings-theme")
-            mDevice.pressBack()
-
-            settingsAccessibility()
+        }.goBack {
+        }.openAccessibilitySubMenu {
             Screengrab.screenshot("SettingsSubMenuAccessibilityRobot_settings-accessibility")
-            mDevice.pressBack()
-
-            settingsLanguage()
+        }.goBack {
+        }.openLanguageSubMenu {
             Screengrab.screenshot("SettingsSubMenuAccessibilityRobot_settings-language")
-            mDevice.pressBack()
-
-            settingDefaultBrowser()
+        }.goBack {
+            // From about here we need to scroll up to ensure all settings options are visible.
+        }.openSetDefaultBrowserSubMenu {
             Screengrab.screenshot("SettingsSubMenuDefaultBrowserRobot_settings-default-browser")
-            mDevice.pressBack()
-
+        }.goBack {
             // Disabled for Pixel 2
-            // settingsTP()
-            // Screengrab.screenshot("settings-enhanced-tp")
-            // mDevice.pressBack()
-
-            loginsAndPassword()
+            // }.openEnhancedTrackingProtectionSubMenu {
+            //     Screengrab.screenshot("settings-enhanced-tp")
+            // }.goBack {
+        }.openLoginsAndPasswordSubMenu {
             Screengrab.screenshot("SettingsSubMenuLoginsAndPasswords-settings-logins-passwords")
-            mDevice.pressBack()
-
+        }.goBack {
             swipeToBottom()
             Screengrab.screenshot("SettingsRobot_settings-scroll-to-bottom")
-
-            settingsTelemetry()
+        }.openSettingsSubMenuDataCollection {
             Screengrab.screenshot("settings-telemetry")
-            mDevice.pressBack()
-
-            addOns()
+        }.goBack {
+        }.openAddonsManagerMenu {
             Screengrab.screenshot("settings-addons")
         }
     }
@@ -142,8 +138,8 @@ class MenuScreenShotTest : ScreenshotTest() {
         editBookmarkFolder()
         Screengrab.screenshot("ThreeDotMenuBookmarksRobot_edit-bookmark-folder-menu")
         // It may be needed to wait here to have the screenshot
-        mDevice.pressBack()
         bookmarksMenu {
+            navigateUp()
         }.openThreeDotMenu("test") {
             deleteBookmarkFolder()
             Screengrab.screenshot("ThreeDotMenuBookmarksRobot_delete-bookmark-folder-menu")
@@ -185,7 +181,7 @@ class MenuScreenShotTest : ScreenshotTest() {
     @Test
     fun saveLoginPromptTest() {
         val saveLoginTest =
-                TestAssetHelper.getSaveLoginAsset(mockWebServer)
+            TestAssetHelper.getSaveLoginAsset(mockWebServer)
         navigationToolbar {
         }.enterURLAndEnterToBrowser(saveLoginTest.url) {
             verifySaveLoginPromptIsShownNotSave()
@@ -203,11 +199,9 @@ fun editBookmarkFolder() = onView(withText(R.string.bookmark_menu_edit_button)).
 
 fun deleteBookmarkFolder() = onView(withText(R.string.bookmark_menu_delete_button)).click()
 
-fun saveToCollectionButton() = onView(withId(R.id.save_tab_group_button)).click()
-
 fun tapOnTabCounter() = onView(withId(R.id.counter_text)).click()
 
-fun settingsAccountPreferences() = onView(withText(R.string.preferences_sync)).click()
+fun settingsAccountPreferences() = onView(withText(R.string.preferences_sync_2)).click()
 
 fun settingsSearch() = onView(withText(R.string.preferences_search)).click()
 

app/src/androidTest/java/org/mozilla/fenix/syncintegration/Pipfile

@@ -19,4 +19,4 @@ requests = "*"
 [dev-packages]
 
 [requires]
-python_version = "2.7"
+python_version = "3.10"

app/src/androidTest/java/org/mozilla/fenix/syncintegration/Pipfile.lock

@@ -1,11 +1,11 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "112a12fa2e9e8117b399b60a49b4c8799a614ef655992640c95149bf95f33e8b"
+            "sha256": "cf743d605ee37525af06865c7961ee99f1720fa9d6352eedc4bbfa5fa78f75ef"
         },
         "pipfile-spec": 6,
         "requires": {
-            "python_version": "2.7"
+            "python_version": "3.10"
         },
         "sources": [
             {
@@ -16,27 +16,21 @@
         ]
     },
     "default": {
-        "atomicwrites": {
+        "async-generator": {
             "hashes": [
-                "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197",
-                "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"
+                "sha256:01c7bf666359b4967d2cda0000cc2e4af16a0ae098cbffcb8472fb9e8ad6585b",
+                "sha256:6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144"
             ],
-            "version": "==1.4.0"
+            "markers": "python_version >= '3.5'",
+            "version": "==1.10"
         },
         "attrs": {
             "hashes": [
-                "sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6",
-                "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"
+                "sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6",
+                "sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c"
             ],
-            "version": "==20.3.0"
-        },
-        "backports.functools-lru-cache": {
-            "hashes": [
-                "sha256:0bada4c2f8a43d533e4ecb7a12214d9420e66eb206d54bf2d682581ca4b80848",
-                "sha256:8fde5f188da2d593bd5bc0be98d9abc46c95bb8a9dde93429570192ee6cc2d4a"
-            ],
-            "markers": "python_version < '3.2'",
-            "version": "==1.6.1"
+            "markers": "python_version >= '3.5'",
+            "version": "==22.1.0"
         },
         "blessings": {
             "hashes": [
@@ -44,130 +38,127 @@
                 "sha256:b1fdd7e7a675295630f9ae71527a8ebc10bfefa236b3d6aa4932ee4462c17ba3",
                 "sha256:caad5211e7ba5afe04367cdd4cfc68fa886e2e08f6f35e76b7387d2109ccea6e"
             ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==1.7"
         },
         "certifi": {
             "hashes": [
-                "sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c",
-                "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"
+                "sha256:84c85a9078b11105f04f3036a9482ae10e4621616db313fe045dd24743a0820d",
+                "sha256:fe86415d55e84719d75f8b69414f6438ac3547d2078ab91b67e779ef69378412"
             ],
-            "version": "==2020.12.5"
+            "version": "==2022.6.15"
         },
         "cffi": {
             "hashes": [
-                "sha256:00a1ba5e2e95684448de9b89888ccd02c98d512064b4cb987d48f4b40aa0421e",
-                "sha256:00e28066507bfc3fe865a31f325c8391a1ac2916219340f87dfad602c3e48e5d",
-                "sha256:045d792900a75e8b1e1b0ab6787dd733a8190ffcf80e8c8ceb2fb10a29ff238a",
-                "sha256:0638c3ae1a0edfb77c6765d487fee624d2b1ee1bdfeffc1f0b58c64d149e7eec",
-                "sha256:105abaf8a6075dc96c1fe5ae7aae073f4696f2905fde6aeada4c9d2926752362",
-                "sha256:155136b51fd733fa94e1c2ea5211dcd4c8879869008fc811648f16541bf99668",
-                "sha256:1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c",
-                "sha256:1d2c4994f515e5b485fd6d3a73d05526aa0fcf248eb135996b088d25dfa1865b",
-                "sha256:2c24d61263f511551f740d1a065eb0212db1dbbbbd241db758f5244281590c06",
-                "sha256:51a8b381b16ddd370178a65360ebe15fbc1c71cf6f584613a7ea08bfad946698",
-                "sha256:594234691ac0e9b770aee9fcdb8fa02c22e43e5c619456efd0d6c2bf276f3eb2",
-                "sha256:5cf4be6c304ad0b6602f5c4e90e2f59b47653ac1ed9c662ed379fe48a8f26b0c",
-                "sha256:64081b3f8f6f3c3de6191ec89d7dc6c86a8a43911f7ecb422c60e90c70be41c7",
-                "sha256:6bc25fc545a6b3d57b5f8618e59fc13d3a3a68431e8ca5fd4c13241cd70d0009",
-                "sha256:798caa2a2384b1cbe8a2a139d80734c9db54f9cc155c99d7cc92441a23871c03",
-                "sha256:7c6b1dece89874d9541fc974917b631406233ea0440d0bdfbb8e03bf39a49b3b",
-                "sha256:840793c68105fe031f34d6a086eaea153a0cd5c491cde82a74b420edd0a2b909",
-                "sha256:8d6603078baf4e11edc4168a514c5ce5b3ba6e3e9c374298cb88437957960a53",
-                "sha256:9cc46bc107224ff5b6d04369e7c595acb700c3613ad7bcf2e2012f62ece80c35",
-                "sha256:9f7a31251289b2ab6d4012f6e83e58bc3b96bd151f5b5262467f4bb6b34a7c26",
-                "sha256:9ffb888f19d54a4d4dfd4b3f29bc2c16aa4972f1c2ab9c4ab09b8ab8685b9c2b",
-                "sha256:a5ed8c05548b54b998b9498753fb9cadbfd92ee88e884641377d8a8b291bcc01",
-                "sha256:a7711edca4dcef1a75257b50a2fbfe92a65187c47dab5a0f1b9b332c5919a3fb",
-                "sha256:af5c59122a011049aad5dd87424b8e65a80e4a6477419c0c1015f73fb5ea0293",
-                "sha256:b18e0a9ef57d2b41f5c68beefa32317d286c3d6ac0484efd10d6e07491bb95dd",
-                "sha256:b4e248d1087abf9f4c10f3c398896c87ce82a9856494a7155823eb45a892395d",
-                "sha256:ba4e9e0ae13fc41c6b23299545e5ef73055213e466bd107953e4a013a5ddd7e3",
-                "sha256:c6332685306b6417a91b1ff9fae889b3ba65c2292d64bd9245c093b1b284809d",
-                "sha256:d5ff0621c88ce83a28a10d2ce719b2ee85635e85c515f12bac99a95306da4b2e",
-                "sha256:d9efd8b7a3ef378dd61a1e77367f1924375befc2eba06168b6ebfa903a5e59ca",
-                "sha256:df5169c4396adc04f9b0a05f13c074df878b6052430e03f50e68adf3a57aa28d",
-                "sha256:ebb253464a5d0482b191274f1c8bf00e33f7e0b9c66405fbffc61ed2c839c775",
-                "sha256:ec80dc47f54e6e9a78181ce05feb71a0353854cc26999db963695f950b5fb375",
-                "sha256:f032b34669220030f905152045dfa27741ce1a6db3324a5bc0b96b6c7420c87b",
-                "sha256:f60567825f791c6f8a592f3c6e3bd93dd2934e3f9dac189308426bd76b00ef3b",
-                "sha256:f803eaa94c2fcda012c047e62bc7a51b0bdabda1cad7a92a522694ea2d76e49f"
+                "sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5",
+                "sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef",
+                "sha256:04ed324bda3cda42b9b695d51bb7d54b680b9719cfab04227cdd1e04e5de3104",
+                "sha256:0e2642fe3142e4cc4af0799748233ad6da94c62a8bec3a6648bf8ee68b1c7426",
+                "sha256:173379135477dc8cac4bc58f45db08ab45d228b3363adb7af79436135d028405",
+                "sha256:198caafb44239b60e252492445da556afafc7d1e3ab7a1fb3f0584ef6d742375",
+                "sha256:1e74c6b51a9ed6589199c787bf5f9875612ca4a8a0785fb2d4a84429badaf22a",
+                "sha256:2012c72d854c2d03e45d06ae57f40d78e5770d252f195b93f581acf3ba44496e",
+                "sha256:21157295583fe8943475029ed5abdcf71eb3911894724e360acff1d61c1d54bc",
+                "sha256:2470043b93ff09bf8fb1d46d1cb756ce6132c54826661a32d4e4d132e1977adf",
+                "sha256:285d29981935eb726a4399badae8f0ffdff4f5050eaa6d0cfc3f64b857b77185",
+                "sha256:30d78fbc8ebf9c92c9b7823ee18eb92f2e6ef79b45ac84db507f52fbe3ec4497",
+                "sha256:320dab6e7cb2eacdf0e658569d2575c4dad258c0fcc794f46215e1e39f90f2c3",
+                "sha256:33ab79603146aace82c2427da5ca6e58f2b3f2fb5da893ceac0c42218a40be35",
+                "sha256:3548db281cd7d2561c9ad9984681c95f7b0e38881201e157833a2342c30d5e8c",
+                "sha256:3799aecf2e17cf585d977b780ce79ff0dc9b78d799fc694221ce814c2c19db83",
+                "sha256:39d39875251ca8f612b6f33e6b1195af86d1b3e60086068be9cc053aa4376e21",
+                "sha256:3b926aa83d1edb5aa5b427b4053dc420ec295a08e40911296b9eb1b6170f6cca",
+                "sha256:3bcde07039e586f91b45c88f8583ea7cf7a0770df3a1649627bf598332cb6984",
+                "sha256:3d08afd128ddaa624a48cf2b859afef385b720bb4b43df214f85616922e6a5ac",
+                "sha256:3eb6971dcff08619f8d91607cfc726518b6fa2a9eba42856be181c6d0d9515fd",
+                "sha256:40f4774f5a9d4f5e344f31a32b5096977b5d48560c5592e2f3d2c4374bd543ee",
+                "sha256:4289fc34b2f5316fbb762d75362931e351941fa95fa18789191b33fc4cf9504a",
+                "sha256:470c103ae716238bbe698d67ad020e1db9d9dba34fa5a899b5e21577e6d52ed2",
+                "sha256:4f2c9f67e9821cad2e5f480bc8d83b8742896f1242dba247911072d4fa94c192",
+                "sha256:50a74364d85fd319352182ef59c5c790484a336f6db772c1a9231f1c3ed0cbd7",
+                "sha256:54a2db7b78338edd780e7ef7f9f6c442500fb0d41a5a4ea24fff1c929d5af585",
+                "sha256:5635bd9cb9731e6d4a1132a498dd34f764034a8ce60cef4f5319c0541159392f",
+                "sha256:59c0b02d0a6c384d453fece7566d1c7e6b7bae4fc5874ef2ef46d56776d61c9e",
+                "sha256:5d598b938678ebf3c67377cdd45e09d431369c3b1a5b331058c338e201f12b27",
+                "sha256:5df2768244d19ab7f60546d0c7c63ce1581f7af8b5de3eb3004b9b6fc8a9f84b",
+                "sha256:5ef34d190326c3b1f822a5b7a45f6c4535e2f47ed06fec77d3d799c450b2651e",
+                "sha256:6975a3fac6bc83c4a65c9f9fcab9e47019a11d3d2cf7f3c0d03431bf145a941e",
+                "sha256:6c9a799e985904922a4d207a94eae35c78ebae90e128f0c4e521ce339396be9d",
+                "sha256:70df4e3b545a17496c9b3f41f5115e69a4f2e77e94e1d2a8e1070bc0c38c8a3c",
+                "sha256:7473e861101c9e72452f9bf8acb984947aa1661a7704553a9f6e4baa5ba64415",
+                "sha256:8102eaf27e1e448db915d08afa8b41d6c7ca7a04b7d73af6514df10a3e74bd82",
+                "sha256:87c450779d0914f2861b8526e035c5e6da0a3199d8f1add1a665e1cbc6fc6d02",
+                "sha256:8b7ee99e510d7b66cdb6c593f21c043c248537a32e0bedf02e01e9553a172314",
+                "sha256:91fc98adde3d7881af9b59ed0294046f3806221863722ba7d8d120c575314325",
+                "sha256:94411f22c3985acaec6f83c6df553f2dbe17b698cc7f8ae751ff2237d96b9e3c",
+                "sha256:98d85c6a2bef81588d9227dde12db8a7f47f639f4a17c9ae08e773aa9c697bf3",
+                "sha256:9ad5db27f9cabae298d151c85cf2bad1d359a1b9c686a275df03385758e2f914",
+                "sha256:a0b71b1b8fbf2b96e41c4d990244165e2c9be83d54962a9a1d118fd8657d2045",
+                "sha256:a0f100c8912c114ff53e1202d0078b425bee3649ae34d7b070e9697f93c5d52d",
+                "sha256:a591fe9e525846e4d154205572a029f653ada1a78b93697f3b5a8f1f2bc055b9",
+                "sha256:a5c84c68147988265e60416b57fc83425a78058853509c1b0629c180094904a5",
+                "sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2",
+                "sha256:a8c4917bd7ad33e8eb21e9a5bbba979b49d9a97acb3a803092cbc1133e20343c",
+                "sha256:b3bbeb01c2b273cca1e1e0c5df57f12dce9a4dd331b4fa1635b8bec26350bde3",
+                "sha256:cba9d6b9a7d64d4bd46167096fc9d2f835e25d7e4c121fb2ddfc6528fb0413b2",
+                "sha256:cc4d65aeeaa04136a12677d3dd0b1c0c94dc43abac5860ab33cceb42b801c1e8",
+                "sha256:ce4bcc037df4fc5e3d184794f27bdaab018943698f4ca31630bc7f84a7b69c6d",
+                "sha256:cec7d9412a9102bdc577382c3929b337320c4c4c4849f2c5cdd14d7368c5562d",
+                "sha256:d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9",
+                "sha256:d61f4695e6c866a23a21acab0509af1cdfd2c013cf256bbf5b6b5e2695827162",
+                "sha256:db0fbb9c62743ce59a9ff687eb5f4afbe77e5e8403d6697f7446e5f609976f76",
+                "sha256:dd86c085fae2efd48ac91dd7ccffcfc0571387fe1193d33b6394db7ef31fe2a4",
+                "sha256:e00b098126fd45523dd056d2efba6c5a63b71ffe9f2bbe1a4fe1716e1d0c331e",
+                "sha256:e229a521186c75c8ad9490854fd8bbdd9a0c9aa3a524326b55be83b54d4e0ad9",
+                "sha256:e263d77ee3dd201c3a142934a086a4450861778baaeeb45db4591ef65550b0a6",
+                "sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b",
+                "sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01",
+                "sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0"
             ],
-            "version": "==1.14.4"
+            "version": "==1.15.1"
         },
-        "chardet": {
+        "charset-normalizer": {
             "hashes": [
-                "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae",
-                "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"
+                "sha256:5189b6f22b01957427f35b6a08d9a0bc45b46d3788ef5a92e978433c7a35f8a5",
+                "sha256:575e708016ff3a5e3681541cb9d79312c416835686d054a23accb873b254f413"
             ],
-            "version": "==3.0.4"
-        },
-        "configparser": {
-            "hashes": [
-                "sha256:254c1d9c79f60c45dfde850850883d5aaa7f19a23f13561243a050d5a7c3fe4c",
-                "sha256:c7d282687a5308319bf3d2e7706e575c635b0a470342641c93bea0ea3b5331df"
-            ],
-            "markers": "python_version < '3'",
-            "version": "==4.0.2"
-        },
-        "contextlib2": {
-            "hashes": [
-                "sha256:01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e",
-                "sha256:3355078a159fbb44ee60ea80abd0d87b80b78c248643b49aa6d94673b413609b"
-            ],
-            "markers": "python_version < '3.4'",
-            "version": "==0.6.0.post1"
+            "markers": "python_version >= '3.6'",
+            "version": "==2.1.0"
         },
         "cryptography": {
             "hashes": [
-                "sha256:22f8251f68953553af4f9c11ec5f191198bc96cff9f0ac5dd5ff94daede0ee6d",
-                "sha256:284e275e3c099a80831f9898fb5c9559120d27675c3521278faba54e584a7832",
-                "sha256:3e17d02941c0f169c5b877597ca8be895fca0e5e3eb882526a74aa4804380a98",
-                "sha256:52a47e60953679eea0b4d490ca3c241fb1b166a7b161847ef4667dfd49e7699d",
-                "sha256:57b8c1ed13b8aa386cabbfde3be175d7b155682470b0e259fecfe53850967f8a",
-                "sha256:6a8f64ed096d13f92d1f601a92d9fd1f1025dc73a2ca1ced46dcf5e0d4930943",
-                "sha256:6e8a3c7c45101a7eeee93102500e1b08f2307c717ff553fcb3c1127efc9b6917",
-                "sha256:7ef41304bf978f33cfb6f43ca13bb0faac0c99cda33693aa20ad4f5e34e8cb8f",
-                "sha256:87c2fffd61e934bc0e2c927c3764c20b22d7f5f7f812ee1a477de4c89b044ca6",
-                "sha256:88069392cd9a1e68d2cfd5c3a2b0d72a44ef3b24b8977a4f7956e9e3c4c9477a",
-                "sha256:8a0866891326d3badb17c5fd3e02c926b635e8923fa271b4813cd4d972a57ff3",
-                "sha256:8f0fd8b0751d75c4483c534b209e39e918f0d14232c0d8a2a76e687f64ced831",
-                "sha256:9a07e6d255053674506091d63ab4270a119e9fc83462c7ab1dbcb495b76307af",
-                "sha256:9a8580c9afcdcddabbd064c0a74f337af74ff4529cdf3a12fa2e9782d677a2e5",
-                "sha256:bd80bc156d3729b38cb227a5a76532aef693b7ac9e395eea8063ee50ceed46a5",
-                "sha256:d1cbc3426e6150583b22b517ef3720036d7e3152d428c864ff0f3fcad2b97591",
-                "sha256:e15ac84dcdb89f92424cbaca4b0b34e211e7ce3ee7b0ec0e4f3c55cee65fae5a",
-                "sha256:e4789b84f8dedf190148441f7c5bfe7244782d9cbb194a36e17b91e7d3e1cca9",
-                "sha256:f01c9116bfb3ad2831e125a73dcd957d173d6ddca7701528eff1e7d97972872c",
-                "sha256:f0e3986f6cce007216b23c490f093f35ce2068f3c244051e559f647f6731b7ae",
-                "sha256:f2aa3f8ba9e2e3fd49bd3de743b976ab192fbf0eb0348cebde5d2a9de0090a9f",
-                "sha256:fb70a4cedd69dc52396ee114416a3656e011fb0311fca55eb55c7be6ed9c8aef"
+                "sha256:190f82f3e87033821828f60787cfa42bff98404483577b591429ed99bed39d59",
+                "sha256:2be53f9f5505673eeda5f2736bea736c40f051a739bfae2f92d18aed1eb54596",
+                "sha256:30788e070800fec9bbcf9faa71ea6d8068f5136f60029759fd8c3efec3c9dcb3",
+                "sha256:3d41b965b3380f10e4611dbae366f6dc3cefc7c9ac4e8842a806b9672ae9add5",
+                "sha256:4c590ec31550a724ef893c50f9a97a0c14e9c851c85621c5650d699a7b88f7ab",
+                "sha256:549153378611c0cca1042f20fd9c5030d37a72f634c9326e225c9f666d472884",
+                "sha256:63f9c17c0e2474ccbebc9302ce2f07b55b3b3fcb211ded18a42d5764f5c10a82",
+                "sha256:6bc95ed67b6741b2607298f9ea4932ff157e570ef456ef7ff0ef4884a134cc4b",
+                "sha256:7099a8d55cd49b737ffc99c17de504f2257e3787e02abe6d1a6d136574873441",
+                "sha256:75976c217f10d48a8b5a8de3d70c454c249e4b91851f6838a4e48b8f41eb71aa",
+                "sha256:7bc997818309f56c0038a33b8da5c0bfbb3f1f067f315f9abd6fc07ad359398d",
+                "sha256:80f49023dd13ba35f7c34072fa17f604d2f19bf0989f292cedf7ab5770b87a0b",
+                "sha256:91ce48d35f4e3d3f1d83e29ef4a9267246e6a3be51864a5b7d2247d5086fa99a",
+                "sha256:a958c52505c8adf0d3822703078580d2c0456dd1d27fabfb6f76fe63d2971cd6",
+                "sha256:b62439d7cd1222f3da897e9a9fe53bbf5c104fff4d60893ad1355d4c14a24157",
+                "sha256:b7f8dd0d4c1f21759695c05a5ec8536c12f31611541f8904083f3dc582604280",
+                "sha256:d204833f3c8a33bbe11eda63a54b1aad7aa7456ed769a982f21ec599ba5fa282",
+                "sha256:e007f052ed10cc316df59bc90fbb7ff7950d7e2919c9757fd42a2b8ecf8a5f67",
+                "sha256:f2dcb0b3b63afb6df7fd94ec6fbddac81b5492513f7b0436210d390c14d46ee8",
+                "sha256:f721d1885ecae9078c3f6bbe8a88bc0786b6e749bf32ccec1ef2b18929a05046",
+                "sha256:f7a6de3e98771e183645181b3627e2563dcde3ce94a9e42a3f427d2255190327",
+                "sha256:f8c0a6e9e1dd3eb0414ba320f85da6b0dcbd543126e30fcc546e7372a7fbf3b9"
             ],
-            "index": "pypi",
-            "version": "==3.2"
+            "version": "==37.0.4"
         },
         "distro": {
             "hashes": [
-                "sha256:0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92",
-                "sha256:df74eed763e18d10d0da624258524ae80486432cd17392d9c3d96f5e83cd2799"
+                "sha256:151aeccf60c216402932b52e40ee477a939f8d58898927378a02abbe852c1c39",
+                "sha256:d596311d707e692c2160c37807f83e3820c5d539d5a83e87cfb6babd8ba3a06b"
             ],
-            "version": "==1.5.0"
-        },
-        "enum34": {
-            "hashes": [
-                "sha256:a98a201d6de3f2ab3db284e70a33b0f896fbf35f8086594e8c9e74b909058d53",
-                "sha256:c3858660960c984d6ab0ebad691265180da2b43f07e061c0f8dca9ef3cffd328",
-                "sha256:cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248"
-            ],
-            "markers": "python_version < '3'",
-            "version": "==1.1.10"
-        },
-        "funcsigs": {
-            "hashes": [
-                "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca",
-                "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50"
-            ],
-            "markers": "python_version < '3.0'",
-            "version": "==1.0.2"
+            "markers": "python_version >= '3.6'",
+            "version": "==1.7.0"
         },
         "fxapom": {
             "hashes": [
@@ -177,6 +168,14 @@
             "index": "pypi",
             "version": "==1.10.2"
         },
+        "h11": {
+            "hashes": [
+                "sha256:70813c1135087a248a4d38cc0e1a0181ffab2188141a93eaf567940c3957ff06",
+                "sha256:8ddd78563b633ca55346c8cd41ec0af27d3c79931828beffb46ce70a379e7442"
+            ],
+            "markers": "python_version >= '3.6'",
+            "version": "==0.13.0"
+        },
         "hawkauthlib": {
             "hashes": [
                 "sha256:935878d3a75832aa76f78ddee13491f1466cbd69a8e7e4248902763cf9953ba9",
@@ -186,35 +185,17 @@
         },
         "idna": {
             "hashes": [
-                "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6",
-                "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"
+                "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff",
+                "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"
             ],
-            "version": "==2.10"
+            "version": "==3.3"
         },
-        "importlib-metadata": {
+        "iniconfig": {
             "hashes": [
-                "sha256:b8de9eff2b35fb037368f28a7df1df4e6436f578fa74423505b6c6a778d5b5dd",
-                "sha256:c2d6341ff566f609e89a2acb2db190e5e1d23d5409d6cc8d2fe34d72443876d4"
+                "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3",
+                "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"
             ],
-            "markers": "python_version < '3.8'",
-            "version": "==2.1.1"
-        },
-        "ipaddress": {
-            "hashes": [
-                "sha256:6e0f4a39e66cb5bb9a137b00276a2eff74f93b71dcbdad6f10ff7df9d3557fcc",
-                "sha256:b7f8e0369580bb4a24d5ba1d7cc29660a4a6987763faf1d8a8046830e020e7e2"
-            ],
-            "markers": "python_version < '3'",
-            "version": "==1.0.23"
-        },
-        "more-itertools": {
-            "hashes": [
-                "sha256:38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4",
-                "sha256:c0a5785b1109a6bd7fac76d6837fd1feca158e54e521ccd2ae8bfe393cc9d4fc",
-                "sha256:fe7a7cae1ccb57d33952113ff4fa1bc5f879963600ed74918f1236e212ee50b9"
-            ],
-            "markers": "python_version <= '2.7'",
-            "version": "==5.0.0"
+            "version": "==1.1.1"
         },
         "mozdevice": {
             "hashes": [
@@ -245,25 +226,24 @@
         },
         "mozinstall": {
             "hashes": [
-                "sha256:219ba7c51308433487b4f30a2615cb9b3ecd40a76b9faf41cf1b1b005bb5dda7",
-                "sha256:bbc31a18ee8a1fbec74b67b99c6c0289ffc7daf39eb5b5ff7dc99f1be687eb08"
+                "sha256:0b14000a88d6a45c37b877eedf897655f665e89410ca629dd500415406ed465e",
+                "sha256:ec364cfefd3435fb155edd48be9e71819834e4dcacc6c3294c7f2452e200095b"
             ],
             "index": "pypi",
-            "version": "==2.0.0"
+            "version": "==2.0.1"
         },
         "mozlog": {
             "hashes": [
-                "sha256:4719d3d00bf1a0b77285d306eb3180f9c1311fffae9640a423fad9d80170e43d",
-                "sha256:d035f722c15d700e4a7b48b90bdda0a6ad83e25482760949d1abd73468bad07f"
+                "sha256:54b9a1e781ce31fc10079dc8aec509fff7feca83714edeae6c981e279ceb796f"
             ],
-            "version": "==7.0.1"
+            "version": "==7.1.0"
         },
         "mozprocess": {
             "hashes": [
-                "sha256:08e1036b53819fd144331f6dfbbb17fc8ca782bbed2e28b4aa771b8b91f7dffb",
-                "sha256:54dc59e7f5a9c2c2930bffb7935f36dddd1d94c9fc6ed179e893d2dff353995a"
+                "sha256:e64591d02899f6fd50fe391f5635236c5c604d8faae08ab4aafed9c3a66e3966",
+                "sha256:e8093fe990bafd4ff3e2e49641b182c8085ea9cee2a28c7bdf9fabc2ff9f618f"
             ],
-            "version": "==1.2.1"
+            "version": "==1.3.0"
         },
         "mozprofile": {
             "hashes": [
@@ -275,11 +255,11 @@
         },
         "mozrunner": {
             "hashes": [
-                "sha256:5e1bdf1709b4b8cb86b3daf3dbc9352d2abfc8428e26cc75a68ce87a565f4f25",
-                "sha256:f223e9ca7f0acd3f93d4c30760f8d976d41da81edf686cd5063d2973ebbebcfb"
+                "sha256:35a7d2cf3abee1d8651e92f870f75159605810ba8ea442defae41a5eec462c29",
+                "sha256:4ee4d44123c1daa7f3648e8b3b0e3a8c1712b3e1ea254d9a4bf80295ea795d41"
             ],
             "index": "pypi",
-            "version": "==7.8.0"
+            "version": "==8.2.1"
         },
         "mozterm": {
             "hashes": [
@@ -296,41 +276,45 @@
             "index": "pypi",
             "version": "==2.3.0"
         },
+        "outcome": {
+            "hashes": [
+                "sha256:6f82bd3de45da303cf1f771ecafa1633750a358436a8bb60e06a1ceb745d2672",
+                "sha256:c4ab89a56575d6d38a05aa16daeaa333109c1f96167aba8901ab18b6b5e0f7f5"
+            ],
+            "markers": "python_version >= '3.7'",
+            "version": "==1.2.0"
+        },
         "packaging": {
             "hashes": [
-                "sha256:05af3bb85d320377db281cf254ab050e1a7ebcbf5410685a9a407e18a1f81236",
-                "sha256:eb41423378682dadb7166144a4926e443093863024de508ca5c9737d6bc08376"
+                "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb",
+                "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"
             ],
-            "version": "==20.7"
-        },
-        "pathlib2": {
-            "hashes": [
-                "sha256:0ec8205a157c80d7acc301c0b18fbd5d44fe655968f5d947b6ecef5290fc35db",
-                "sha256:6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868"
-            ],
-            "markers": "python_version < '3.6'",
-            "version": "==2.3.5"
+            "markers": "python_version >= '3.6'",
+            "version": "==21.3"
         },
         "pluggy": {
             "hashes": [
-                "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0",
-                "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"
+                "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159",
+                "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"
             ],
-            "version": "==0.13.1"
+            "markers": "python_version >= '3.6'",
+            "version": "==1.0.0"
         },
         "progressbar2": {
             "hashes": [
-                "sha256:ef72be284e7f2b61ac0894b44165926f13f5d995b2bf3cd8a8dedc6224b255a7",
-                "sha256:fe2738e7ecb7df52ad76307fe610c460c52b50f5335fd26c3ab80ff7655ba1e0"
+                "sha256:14d3165a1781d053ffaa117daf27cc706128d2ec1d2977fdb05b6bb079888013",
+                "sha256:2562ba3e554433f08e81fb7b786208b19de135f3ca1c5da1787d9b05558e6247"
             ],
-            "version": "==3.53.1"
+            "markers": "python_version >= '3.7'",
+            "version": "==4.0.0"
         },
         "py": {
             "hashes": [
-                "sha256:366389d1db726cd2fcfc79732e75410e5fe4d31db13692115529d34069a043c2",
-                "sha256:9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342"
+                "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719",
+                "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"
             ],
-            "version": "==1.9.0"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==1.11.0"
         },
         "pybrowserid": {
             "hashes": [
@@ -341,10 +325,10 @@
         },
         "pycparser": {
             "hashes": [
-                "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0",
-                "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"
+                "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9",
+                "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"
             ],
-            "version": "==2.20"
+            "version": "==2.21"
         },
         "pyfxa": {
             "hashes": [
@@ -354,32 +338,49 @@
         },
         "pyjwt": {
             "hashes": [
-                "sha256:5c6eca3c2940464d106b99ba83b00c6add741c9becaec087fb7ccdefea71350e",
-                "sha256:8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96"
+                "sha256:72d1d253f32dbd4f5c88eaf1fdc62f3a19f676ccbadb9dbc5d07e951b2b26daf",
+                "sha256:d42908208c699b3b973cbeb01a969ba6a96c821eefb1c5bfe4c390c01d67abba"
             ],
-            "version": "==1.7.1"
+            "markers": "python_version >= '3.6'",
+            "version": "==2.4.0"
+        },
+        "pyopenssl": {
+            "hashes": [
+                "sha256:660b1b1425aac4a1bea1d94168a85d99f0b3144c869dd4390d27629d0087f1bf",
+                "sha256:ea252b38c87425b64116f808355e8da644ef9b07e429398bfece610f893ee2e0"
+            ],
+            "version": "==22.0.0"
         },
         "pyparsing": {
             "hashes": [
-                "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1",
-                "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"
+                "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb",
+                "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc"
             ],
-            "version": "==2.4.7"
+            "markers": "python_full_version >= '3.6.8'",
+            "version": "==3.0.9"
         },
         "pypom": {
             "hashes": [
-                "sha256:4bdd57fceb72d7e6a3645cf6c9322f490d9cfb5d777eac2c851a3b658b813939",
-                "sha256:6772ec99f0a21a5bdc8c092007a8c813ed18359e67ed70258bbb233df5e28829"
+                "sha256:6f56888d25c1faf8fa0d53ef8a4ba1d7dc828e57212f7fe04e8cd21b5eaa924e",
+                "sha256:a65297125c498c4e9cee99de9b2ddf5b908d0041ee1fc1e90956d3750483fa3d"
             ],
-            "version": "==2.2.0"
+            "version": "==2.2.3"
+        },
+        "pysocks": {
+            "hashes": [
+                "sha256:08e69f092cc6dbe92a0fdd16eeb9b9ffbc13cadfe5ca4c7bd92ffb078b293299",
+                "sha256:2725bd0a9925919b9b51739eea5f9e2bae91e83288108a9ad338b2e3a4435ee5",
+                "sha256:3f8804571ebe159c380ac6de37643bb4685970655d3bba243530d6558b799aa0"
+            ],
+            "version": "==1.7.1"
         },
         "pytest": {
             "hashes": [
-                "sha256:19e8f75eac01dd3f211edd465b39efbcbdc8fc5f7866d7dd49fedb30d8adf339",
-                "sha256:c77a5f30a90e0ce24db9eaa14ddfd38d4afb5ea159309bdd2dae55b931bc9324"
+                "sha256:13d0e3ccfc2b6e26be000cb6568c832ba67ba32e719443bfe725814d3c42433c",
+                "sha256:a06a0425453864a270bc45e71f783330a7428defb4230fb5e6a731fde06ecd45"
             ],
             "index": "pypi",
-            "version": "==4.6.9"
+            "version": "==7.1.2"
         },
         "pytest-fxa": {
             "hashes": [
@@ -391,26 +392,27 @@
         },
         "pytest-html": {
             "hashes": [
-                "sha256:06e7e13131649b4fe522cf04054efb7b4749ff2c7160755e4acfd8e89a7e5955",
-                "sha256:f0fae6de71f02f62f9460f628d0c5f70b0cdc86bb393239860c7dec70fd2973d"
+                "sha256:3ee1cf319c913d19fe53aeb0bc400e7b0bc2dbeb477553733db1dad12eb75ee3",
+                "sha256:b7f82f123936a3f4d2950bc993c2c1ca09ce262c9ae12f9ac763a2401380b455"
             ],
             "index": "pypi",
-            "version": "==1.22.1"
+            "version": "==3.1.1"
         },
         "pytest-metadata": {
             "hashes": [
-                "sha256:2071a59285de40d7541fde1eb9f1ddea1c9db165882df82781367471238b66ba",
-                "sha256:c29a1fb470424926c63154c1b632c02585f2ba4282932058a71d35295ff8c96d"
+                "sha256:39261ee0086f17649b180baf2a8633e1922a4c4b6fcc28a2de7d8127a82541bf",
+                "sha256:fcd2f416f15be295943527b3c8ba16a44ae5a7141939c90c3dc5ce9d167cf2a5"
             ],
             "index": "pypi",
-            "version": "==1.8.0"
+            "version": "==2.0.2"
         },
         "python-utils": {
             "hashes": [
-                "sha256:ebaadab29d0cb9dca0a82eab9c405f5be5125dbbff35b8f32cc433fa498dbaa7",
-                "sha256:f21fc09ff58ea5ebd1fd2e8ef7f63e39d456336900f26bdc9334a03a3f7d8089"
+                "sha256:3b1c8b706e40e91280eec5fa72ea730880a166cee99afa5555b863d55664478d",
+                "sha256:5cb9cf295018202fb4d6abdd694a33a7f08bc0ce1bf1eab8cce80ab2cde35c07"
             ],
-            "version": "==2.4.0"
+            "markers": "python_version >= '3.7'",
+            "version": "==3.3.3"
         },
         "redo": {
             "hashes": [
@@ -421,42 +423,49 @@
         },
         "requests": {
             "hashes": [
-                "sha256:43999036bfa82904b6af1d99e4882b560e5e2c68e5c4b0aa03b655f3d7d73fee",
-                "sha256:b3f43d496c6daba4493e7c431722aeb7dbc6288f52a6e04e7b6023b0247817e6"
+                "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983",
+                "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"
             ],
             "index": "pypi",
-            "version": "==2.23.0"
-        },
-        "scandir": {
-            "hashes": [
-                "sha256:2586c94e907d99617887daed6c1d102b5ca28f1085f90446554abf1faf73123e",
-                "sha256:2ae41f43797ca0c11591c0c35f2f5875fa99f8797cb1a1fd440497ec0ae4b022",
-                "sha256:2b8e3888b11abb2217a32af0766bc06b65cc4a928d8727828ee68af5a967fa6f",
-                "sha256:2c712840c2e2ee8dfaf36034080108d30060d759c7b73a01a52251cc8989f11f",
-                "sha256:4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae",
-                "sha256:67f15b6f83e6507fdc6fca22fedf6ef8b334b399ca27c6b568cbfaa82a364173",
-                "sha256:7d2d7a06a252764061a020407b997dd036f7bd6a175a5ba2b345f0a357f0b3f4",
-                "sha256:8c5922863e44ffc00c5c693190648daa6d15e7c1207ed02d6f46a8dcc2869d32",
-                "sha256:92c85ac42f41ffdc35b6da57ed991575bdbe69db895507af88b9f499b701c188",
-                "sha256:b24086f2375c4a094a6b51e78b4cf7ca16c721dcee2eddd7aa6494b42d6d519d",
-                "sha256:cb925555f43060a1745d0a321cca94bcea927c50114b623d73179189a4e100ac"
-            ],
-            "markers": "python_version < '3.5'",
-            "version": "==1.10.0"
+            "version": "==2.28.1"
         },
         "selenium": {
             "hashes": [
-                "sha256:2d7131d7bc5a5b99a2d9b04aaf2612c411b03b8ca1b1ee8d3de5845a9be2cb3c",
-                "sha256:deaf32b60ad91a4611b98d8002757f29e6f2c2d5fcaf202e1c9ad06d6772300d"
+                "sha256:61c8b02788b66f08f2e61d5295afc956991e394815e33573072e68402ed4e8d5"
             ],
-            "version": "==3.141.0"
+            "markers": "python_version ~= '3.7'",
+            "version": "==4.4.0"
         },
         "six": {
             "hashes": [
-                "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259",
-                "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"
+                "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
+                "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"
             ],
-            "version": "==1.15.0"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==1.16.0"
+        },
+        "sniffio": {
+            "hashes": [
+                "sha256:471b71698eac1c2112a40ce2752bb2f4a4814c22a54a3eed3676bc0f5ca9f663",
+                "sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"
+            ],
+            "markers": "python_version >= '3.5'",
+            "version": "==1.2.0"
+        },
+        "sortedcontainers": {
+            "hashes": [
+                "sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88",
+                "sha256:a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0"
+            ],
+            "version": "==2.4.0"
+        },
+        "tomli": {
+            "hashes": [
+                "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc",
+                "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"
+            ],
+            "markers": "python_version >= '3.7'",
+            "version": "==2.0.1"
         },
         "treeherder-client": {
             "hashes": [
@@ -465,54 +474,57 @@
             ],
             "version": "==5.0.0"
         },
-        "urllib3": {
+        "trio": {
             "hashes": [
-                "sha256:8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2",
-                "sha256:f5321fbe4bf3fefa0efd0bfe7fb14e90909eb62a48ccda331726b4319897dd5e"
+                "sha256:4dc0bf9d5cc78767fc4516325b6d80cc0968705a31d0eec2ecd7cdda466265b0",
+                "sha256:523f39b7b69eef73501cebfe1aafd400a9aad5b03543a0eded52952488ff1c13"
             ],
-            "version": "==1.25.11"
+            "markers": "python_version >= '3.7'",
+            "version": "==0.21.0"
         },
-        "wcwidth": {
+        "trio-websocket": {
             "hashes": [
-                "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784",
-                "sha256:c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83"
+                "sha256:5b558f6e83cc20a37c3b61202476c5295d1addf57bd65543364e0337e37ed2bc",
+                "sha256:a3d34de8fac26023eee701ed1e7bf4da9a8326b61a62934ec9e53b64970fd8fe"
             ],
-            "version": "==0.2.5"
+            "markers": "python_version >= '3.5'",
+            "version": "==0.9.2"
+        },
+        "urllib3": {
+            "extras": [
+                "secure",
+                "socks"
+            ],
+            "hashes": [
+                "sha256:c33ccba33c819596124764c23a97d25f32b28433ba0dedeb77d873a38722c9bc",
+                "sha256:ea6e8fb210b19d950fab93b60c9009226c63a28808bc8386e05301e25883ac0a"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' and python_version < '4.0'",
+            "version": "==1.26.11"
         },
         "webob": {
             "hashes": [
-                "sha256:a3c89a8e9ba0aeb17382836cdb73c516d0ecf6630ec40ec28288f3ed459ce87b",
-                "sha256:aa3a917ed752ba3e0b242234b2a373f9c4e2a75d35291dcbe977649bd21fd108"
+                "sha256:73aae30359291c14fa3b956f8b5ca31960e420c28c1bec002547fb04928cf89b",
+                "sha256:b64ef5141be559cfade448f044fa45c2260351edcb6a8ef6b7e00c7dcef0c323"
             ],
-            "version": "==1.8.6"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==1.8.7"
         },
-        "zipp": {
+        "wsproto": {
             "hashes": [
-                "sha256:c70410551488251b0fee67b460fb9a536af8d6f9f008ad10ac51f615b6a521b1",
-                "sha256:e0d9e63797e483a30d27e09fffd308c59a700d365ec34e93cc100844168bf921"
+                "sha256:2218cb57952d90b9fca325c0dcfb08c3bda93e8fd8070b0a17f048e2e47a521b",
+                "sha256:a2e56bfd5c7cd83c1369d83b5feccd6d37798b74872866e62616e0ecf111bda8"
             ],
-            "version": "==1.2.0"
+            "markers": "python_version >= '3.7'",
+            "version": "==1.1.0"
         },
         "zope.component": {
             "hashes": [
-                "sha256:607628e4c84f7887a69a958542b5c304663e726b73aba0882e3a3f059bff14f3",
-                "sha256:91628918218b3e6f6323de2a7b845e09ddc5cae131c034896c051b084bba3c92"
+                "sha256:32cbe426ba8fa7b62ce5b211f80f0718a0c749cc7ff09e3f4b43a57f7ccdf5e5",
+                "sha256:e955eb9f1e55d30e2d8097c8baa9ee012c356887eef3b0d43e6bfcd4868221e5"
             ],
-            "version": "==4.6.2"
-        },
-        "zope.deferredimport": {
-            "hashes": [
-                "sha256:57b2345e7b5eef47efcd4f634ff16c93e4265de3dcf325afc7315ade48d909e1",
-                "sha256:9a0c211df44aa95f1c4e6d2626f90b400f56989180d3ef96032d708da3d23e0a"
-            ],
-            "version": "==4.3.1"
-        },
-        "zope.deprecation": {
-            "hashes": [
-                "sha256:0d453338f04bacf91bbfba545d8bcdf529aa829e67b705eac8c1a7fdce66e2df",
-                "sha256:f1480b74995958b24ce37b0ef04d3663d2683e5d6debc96726eff18acf4ea113"
-            ],
-            "version": "==4.4.0"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==5.0.1"
         },
         "zope.event": {
             "hashes": [
@@ -523,150 +535,96 @@
         },
         "zope.hookable": {
             "hashes": [
-                "sha256:0194b9b9e7f614abba60c90b231908861036578297515d3d6508eb10190f266d",
-                "sha256:0c2977473918bdefc6fa8dfb311f154e7f13c6133957fe649704deca79b92093",
-                "sha256:17b8bdb3b77e03a152ca0d5ca185a7ae0156f5e5a2dbddf538676633a1f7380f",
-                "sha256:29d07681a78042cdd15b268ae9decffed9ace68a53eebeb61d65ae931d158841",
-                "sha256:36fb1b35d1150267cb0543a1ddd950c0bc2c75ed0e6e92e3aaa6ac2e29416cb7",
-                "sha256:3aed60c2bb5e812bbf9295c70f25b17ac37c233f30447a96c67913ba5073642f",
-                "sha256:3cac1565cc768911e72ca9ec4ddf5c5109e1fef0104f19f06649cf1874943b60",
-                "sha256:3d4bc0cc4a37c3cd3081063142eeb2125511db3c13f6dc932d899c512690378e",
-                "sha256:3f73096f27b8c28be53ffb6604f7b570fbbb82f273c6febe5f58119009b59898",
-                "sha256:522d1153d93f2d48aa0bd9fb778d8d4500be2e4dcf86c3150768f0e3adbbc4ef",
-                "sha256:523d2928fb7377bbdbc9af9c0b14ad73e6eaf226349f105733bdae27efd15b5a",
-                "sha256:5848309d4fc5c02150a45e8f8d2227e5bfda386a508bbd3160fed7c633c5a2fa",
-                "sha256:6781f86e6d54a110980a76e761eb54590630fd2af2a17d7edf02a079d2646c1d",
-                "sha256:6fd27921ebf3aaa945fa25d790f1f2046204f24dba4946f82f5f0a442577c3e9",
-                "sha256:70d581862863f6bf9e175e85c9d70c2d7155f53fb04dcdb2f73cf288ca559a53",
-                "sha256:81867c23b0dc66c8366f351d00923f2bc5902820a24c2534dfd7bf01a5879963",
-                "sha256:81db29edadcbb740cd2716c95a297893a546ed89db1bfe9110168732d7f0afdd",
-                "sha256:86bd12624068cea60860a0759af5e2c3adc89c12aef6f71cf12f577e28deefe3",
-                "sha256:9c184d8f9f7a76e1ced99855ccf390ffdd0ec3765e5cbf7b9cada600accc0a1e",
-                "sha256:acc789e8c29c13555e43fe4bf9fcd15a65512c9645e97bbaa5602e3201252b02",
-                "sha256:afaa740206b7660d4cc3b8f120426c85761f51379af7a5b05451f624ad12b0af",
-                "sha256:b5f5fa323f878bb16eae68ea1ba7f6c0419d4695d0248bed4b18f51d7ce5ab85",
-                "sha256:bd89e0e2c67bf4ac3aca2a19702b1a37269fb1923827f68324ac2e7afd6e3406",
-                "sha256:c212de743283ec0735db24ec6ad913758df3af1b7217550ff270038062afd6ae",
-                "sha256:ca553f524293a0bdea05e7f44c3e685e4b7b022cb37d87bc4a3efa0f86587a8d",
-                "sha256:cab67065a3db92f636128d3157cc5424a145f82d96fb47159c539132833a6d36",
-                "sha256:d3b3b3eedfdbf6b02898216e85aa6baf50207f4378a2a6803d6d47650cd37031",
-                "sha256:d9f4a5a72f40256b686d31c5c0b1fde503172307beb12c1568296e76118e402c",
-                "sha256:df5067d87aaa111ed5d050e1ee853ba284969497f91806efd42425f5348f1c06",
-                "sha256:e2587644812c6138f05b8a41594a8337c6790e3baf9a01915e52438c13fc6bef",
-                "sha256:e27fd877662db94f897f3fd532ef211ca4901eb1a70ba456f15c0866a985464a",
-                "sha256:e427ebbdd223c72e06ba94c004bb04e996c84dec8a0fa84e837556ae145c439e",
-                "sha256:e583ad4309c203ef75a09d43434cf9c2b4fa247997ecb0dcad769982c39411c7",
-                "sha256:e760b2bc8ece9200804f0c2b64d10147ecaf18455a2a90827fbec4c9d84f3ad5",
-                "sha256:ea9a9cc8bcc70e18023f30fa2f53d11ae069572a162791224e60cd65df55fb69",
-                "sha256:ecb3f17dce4803c1099bd21742cd126b59817a4e76a6544d31d2cca6e30dbffd",
-                "sha256:ed794e3b3de42486d30444fb60b5561e724ee8a2d1b17b0c2e0f81e3ddaf7a87",
-                "sha256:ee885d347279e38226d0a437b6a932f207f691c502ee565aba27a7022f1285df",
-                "sha256:fd5e7bc5f24f7e3d490698f7b854659a9851da2187414617cd5ed360af7efd63",
-                "sha256:fe45f6870f7588ac7b2763ff1ce98cce59369717afe70cc353ec5218bc854bcc"
+                "sha256:031e7672540685dc9d07565f2b968c6e21c7899c9391da58a23e63f229a8fdcd",
+                "sha256:14bac9afd00e9577227749b37dfc3b9fe4f4fb855923262fc016be47baa42712",
+                "sha256:16c0748438f716894cb61f3ed00adaa65359a5abe7a12bb44d7133d4b0cd3453",
+                "sha256:1da8d3386238983e97302b2cbdb510e126968e65e3cb8a8745da9744655001fc",
+                "sha256:24e4489ccf0dbd4c0e9d2d8b845b46994debb30cc22f96da76e973f9cb582799",
+                "sha256:3111fbc3ddae5d98655691ff81b1c71bd7ad0c3bcf2c2ef659fdc8e66f664603",
+                "sha256:34a84e15f2e6a3b2e372a67f7d845a372e3f0438319f26dfe9b7cb66ab75be44",
+                "sha256:35320d283a364c42dbf91694066bc1e7f07628bbd5ec87c1ae08143036e1de49",
+                "sha256:43855fbab9fb949fa14b5bbcf4c471e4d359428c2196061efe0d82fe3b387101",
+                "sha256:4711443b964bf7ace58780a3473f520151de8d441e57583b8d8cd8a231fb7656",
+                "sha256:49427208d9f65e5aa7df5c1be4dc818c51da34e261f4e52fe944a695ae90e3b3",
+                "sha256:4dbdfe522741effbb507d55354664c93c81db6db66ca124c981d1e3a41e5a31b",
+                "sha256:4dc9693fa28a238f063ba169110ef4199e0f86f9f976b57824c1d742eb21ad2e",
+                "sha256:64337672794b01d039e2380d11dd895ab17043530f27b5e3e0709a11fbe5b532",
+                "sha256:7067a450b15c8d41d00060890573ddc06f3414e62173dac55b38f6683920c20e",
+                "sha256:7091df7b4d6d897dd00e8717f0fa62b020e28aabe54a92005df22130ed204f6f",
+                "sha256:7b63de104e531109f606d4e3765b82fa3364e387d63b71a02460d321e24b33c8",
+                "sha256:7ef3128b5bcb97029c19df95126f57638afe6d2aca0ffede989149fa0bbd744a",
+                "sha256:800f93479202b05e46ba7696a2dd5411cfdd9d87c47a7d2b6fcda5394a5f9042",
+                "sha256:84dfb4f5189c8a3b70dfdf0d268840d5dce69048d4767120910f4665fa5ee2f3",
+                "sha256:8cf9982d43f6a732d041cf68b08fa969e5bcf090212ab519a637c8a393015eda",
+                "sha256:8fc3e6cd0486c6af48e3317c299def719b57538332a194e0b3bc6a772f4faa0e",
+                "sha256:a766186b97e493928dfac4a4b6c7508e47411e78c6f3be9846e8981eb91542d4",
+                "sha256:bfd1b1107a51ddfbd628c1ff884c6a67e92519b23012563b6082d438dbd16b9d",
+                "sha256:cbcbf6d31092caafb40ab26d07c065bf4f60f3ba7925d23d51a4e19469034544",
+                "sha256:cf27270212fa51005162d75cae83bb943c84ece7c7f8d30d68efebfad2f469d9",
+                "sha256:cf7f1f973aeced06ab1a245faa71e867cec6a053b807c2aad4c1728964aac071",
+                "sha256:de77a946ef020d08643647e417713ed753a2eed1f4495259c38a241c8eb31dbf",
+                "sha256:e3b01e7cf16b4a3257ee05e4c354737a4f64af302846826c46a296a7944b8da9",
+                "sha256:ff08276e555f2ef262fd03d872cca130e7ee376b87d7651a5595aae2fa5b2425"
             ],
-            "version": "==5.0.1"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==5.1.0"
         },
         "zope.interface": {
             "hashes": [
-                "sha256:05a97ba92c1c7c26f25c9f671aa1ef85ffead6cdad13770e5b689cf983adc7e1",
-                "sha256:07d61722dd7d85547b7c6b0f5486b4338001fab349f2ac5cabc0b7182eb3425d",
-                "sha256:0a990dcc97806e5980bbb54b2e46b9cde9e48932d8e6984daf71ef1745516123",
-                "sha256:150e8bcb7253a34a4535aeea3de36c0bb3b1a6a47a183a95d65a194b3e07f232",
-                "sha256:1743bcfe45af8846b775086471c28258f4c6e9ee8ef37484de4495f15a98b549",
-                "sha256:1b5f6c8fff4ed32aa2dd43e84061bc8346f32d3ba6ad6e58f088fe109608f102",
-                "sha256:21e49123f375703cf824214939d39df0af62c47d122d955b2a8d9153ea08cfd5",
-                "sha256:21f579134a47083ffb5ddd1307f0405c91aa8b61ad4be6fd5af0171474fe0c45",
-                "sha256:27c267dc38a0f0079e96a2945ee65786d38ef111e413c702fbaaacbab6361d00",
-                "sha256:299bde0ab9e5c4a92f01a152b7fbabb460f31343f1416f9b7b983167ab1e33bc",
-                "sha256:2ab88d8f228f803fcb8cb7d222c579d13dab2d3622c51e8cf321280da01102a7",
-                "sha256:2ced4c35061eea623bc84c7711eedce8ecc3c2c51cd9c6afa6290df3bae9e104",
-                "sha256:2dcab01c660983ba5e5a612e0c935141ccbee67d2e2e14b833e01c2354bd8034",
-                "sha256:32546af61a9a9b141ca38d971aa6eb9800450fa6620ce6323cc30eec447861f3",
-                "sha256:32b40a4c46d199827d79c86bb8cb88b1bbb764f127876f2cb6f3a47f63dbada3",
-                "sha256:3cc94c69f6bd48ed86e8e24f358cb75095c8129827df1298518ab860115269a4",
-                "sha256:42b278ac0989d6f5cf58d7e0828ea6b5951464e3cf2ff229dd09a96cb6ba0c86",
-                "sha256:495b63fd0302f282ee6c1e6ea0f1c12cb3d1a49c8292d27287f01845ff252a96",
-                "sha256:4af87cdc0d4b14e600e6d3d09793dce3b7171348a094ba818e2a68ae7ee67546",
-                "sha256:4b94df9f2fdde7b9314321bab8448e6ad5a23b80542dcab53e329527d4099dcb",
-                "sha256:4c48ddb63e2b20fba4c6a2bf81b4d49e99b6d4587fb67a6cd33a2c1f003af3e3",
-                "sha256:4df9afd17bd5477e9f8c8b6bb8507e18dd0f8b4efe73bb99729ff203279e9e3b",
-                "sha256:518950fe6a5d56f94ba125107895f938a4f34f704c658986eae8255edb41163b",
-                "sha256:538298e4e113ccb8b41658d5a4b605bebe75e46a30ceca22a5a289cf02c80bec",
-                "sha256:55465121e72e208a7b69b53de791402affe6165083b2ea71b892728bd19ba9ae",
-                "sha256:588384d70a0f19b47409cfdb10e0c27c20e4293b74fc891df3d8eb47782b8b3e",
-                "sha256:6278c080d4afffc9016e14325f8734456831124e8c12caa754fd544435c08386",
-                "sha256:64ea6c221aeee4796860405e1aedec63424cda4202a7ad27a5066876db5b0fd2",
-                "sha256:681dbb33e2b40262b33fd383bae63c36d33fd79fa1a8e4092945430744ffd34a",
-                "sha256:6936aa9da390402d646a32a6a38d5409c2d2afb2950f045a7d02ab25a4e7d08d",
-                "sha256:778d0ec38bbd288b150a3ae363c8ffd88d2207a756842495e9bffd8a8afbc89a",
-                "sha256:8251f06a77985a2729a8bdbefbae79ee78567dddc3acbd499b87e705ca59fe24",
-                "sha256:83b4aa5344cce005a9cff5d0321b2e318e871cc1dfc793b66c32dd4f59e9770d",
-                "sha256:844fad925ac5c2ad4faaceb3b2520ad016b5280105c6e16e79838cf951903a7b",
-                "sha256:8ceb3667dd13b8133f2e4d637b5b00f240f066448e2aa89a41f4c2d78a26ce50",
-                "sha256:92dc0fb79675882d0b6138be4bf0cec7ea7c7eede60aaca78303d8e8dbdaa523",
-                "sha256:9789bd945e9f5bd026ed3f5b453d640befb8b1fc33a779c1fe8d3eb21fe3fb4a",
-                "sha256:a2b6d6eb693bc2fc6c484f2e5d93bd0b0da803fa77bf974f160533e555e4d095",
-                "sha256:aab9f1e34d810feb00bf841993552b8fcc6ae71d473c505381627143d0018a6a",
-                "sha256:abb61afd84f23099ac6099d804cdba9bd3b902aaaded3ffff47e490b0a495520",
-                "sha256:adf9ee115ae8ff8b6da4b854b4152f253b390ba64407a22d75456fe07dcbda65",
-                "sha256:aedc6c672b351afe6dfe17ff83ee5e7eb6ed44718f879a9328a68bdb20b57e11",
-                "sha256:b7a00ecb1434f8183395fac5366a21ee73d14900082ca37cf74993cf46baa56c",
-                "sha256:ba32f4a91c1cb7314c429b03afbf87b1fff4fb1c8db32260e7310104bd77f0c7",
-                "sha256:cbd0f2cbd8689861209cd89141371d3a22a11613304d1f0736492590aa0ab332",
-                "sha256:e4bc372b953bf6cec65a8d48482ba574f6e051621d157cf224227dbb55486b1e",
-                "sha256:eccac3d9aadc68e994b6d228cb0c8919fc47a5350d85a1b4d3d81d1e98baf40c",
-                "sha256:efd550b3da28195746bb43bd1d815058181a7ca6d9d6aa89dd37f5eefe2cacb7",
-                "sha256:efef581c8ba4d990770875e1a2218e856849d32ada2680e53aebc5d154a17e20",
-                "sha256:f057897711a630a0b7a6a03f1acf379b6ba25d37dc5dc217a97191984ba7f2fc",
-                "sha256:f37d45fab14ffef9d33a0dc3bc59ce0c5313e2253323312d47739192da94f5fd",
-                "sha256:f44906f70205d456d503105023041f1e63aece7623b31c390a0103db4de17537"
+                "sha256:08f9636e99a9d5410181ba0729e0408d3d8748026ea938f3b970a0249daa8192",
+                "sha256:0b465ae0962d49c68aa9733ba92a001b2a0933c317780435f00be7ecb959c702",
+                "sha256:0cba8477e300d64a11a9789ed40ee8932b59f9ee05f85276dbb4b59acee5dd09",
+                "sha256:0cee5187b60ed26d56eb2960136288ce91bcf61e2a9405660d271d1f122a69a4",
+                "sha256:0ea1d73b7c9dcbc5080bb8aaffb776f1c68e807767069b9ccdd06f27a161914a",
+                "sha256:0f91b5b948686659a8e28b728ff5e74b1be6bf40cb04704453617e5f1e945ef3",
+                "sha256:15e7d1f7a6ee16572e21e3576d2012b2778cbacf75eb4b7400be37455f5ca8bf",
+                "sha256:17776ecd3a1fdd2b2cd5373e5ef8b307162f581c693575ec62e7c5399d80794c",
+                "sha256:194d0bcb1374ac3e1e023961610dc8f2c78a0f5f634d0c737691e215569e640d",
+                "sha256:1c0e316c9add0db48a5b703833881351444398b04111188069a26a61cfb4df78",
+                "sha256:205e40ccde0f37496904572035deea747390a8b7dc65146d30b96e2dd1359a83",
+                "sha256:273f158fabc5ea33cbc936da0ab3d4ba80ede5351babc4f577d768e057651531",
+                "sha256:2876246527c91e101184f63ccd1d716ec9c46519cc5f3d5375a3351c46467c46",
+                "sha256:2c98384b254b37ce50eddd55db8d381a5c53b4c10ee66e1e7fe749824f894021",
+                "sha256:2e5a26f16503be6c826abca904e45f1a44ff275fdb7e9d1b75c10671c26f8b94",
+                "sha256:334701327f37c47fa628fc8b8d28c7d7730ce7daaf4bda1efb741679c2b087fc",
+                "sha256:3748fac0d0f6a304e674955ab1365d515993b3a0a865e16a11ec9d86fb307f63",
+                "sha256:3c02411a3b62668200910090a0dff17c0b25aaa36145082a5a6adf08fa281e54",
+                "sha256:3dd4952748521205697bc2802e4afac5ed4b02909bb799ba1fe239f77fd4e117",
+                "sha256:3f24df7124c323fceb53ff6168da70dbfbae1442b4f3da439cd441681f54fe25",
+                "sha256:469e2407e0fe9880ac690a3666f03eb4c3c444411a5a5fddfdabc5d184a79f05",
+                "sha256:4de4bc9b6d35c5af65b454d3e9bc98c50eb3960d5a3762c9438df57427134b8e",
+                "sha256:5208ebd5152e040640518a77827bdfcc73773a15a33d6644015b763b9c9febc1",
+                "sha256:52de7fc6c21b419078008f697fd4103dbc763288b1406b4562554bd47514c004",
+                "sha256:5bb3489b4558e49ad2c5118137cfeaf59434f9737fa9c5deefc72d22c23822e2",
+                "sha256:5dba5f530fec3f0988d83b78cc591b58c0b6eb8431a85edd1569a0539a8a5a0e",
+                "sha256:5dd9ca406499444f4c8299f803d4a14edf7890ecc595c8b1c7115c2342cadc5f",
+                "sha256:5f931a1c21dfa7a9c573ec1f50a31135ccce84e32507c54e1ea404894c5eb96f",
+                "sha256:63b82bb63de7c821428d513607e84c6d97d58afd1fe2eb645030bdc185440120",
+                "sha256:66c0061c91b3b9cf542131148ef7ecbecb2690d48d1612ec386de9d36766058f",
+                "sha256:6f0c02cbb9691b7c91d5009108f975f8ffeab5dff8f26d62e21c493060eff2a1",
+                "sha256:71aace0c42d53abe6fc7f726c5d3b60d90f3c5c055a447950ad6ea9cec2e37d9",
+                "sha256:7d97a4306898b05404a0dcdc32d9709b7d8832c0c542b861d9a826301719794e",
+                "sha256:7df1e1c05304f26faa49fa752a8c690126cf98b40b91d54e6e9cc3b7d6ffe8b7",
+                "sha256:8270252effc60b9642b423189a2fe90eb6b59e87cbee54549db3f5562ff8d1b8",
+                "sha256:867a5ad16892bf20e6c4ea2aab1971f45645ff3102ad29bd84c86027fa99997b",
+                "sha256:877473e675fdcc113c138813a5dd440da0769a2d81f4d86614e5d62b69497155",
+                "sha256:8892f89999ffd992208754851e5a052f6b5db70a1e3f7d54b17c5211e37a98c7",
+                "sha256:9a9845c4c6bb56e508651f005c4aeb0404e518c6f000d5a1123ab077ab769f5c",
+                "sha256:a1e6e96217a0f72e2b8629e271e1b280c6fa3fe6e59fa8f6701bec14e3354325",
+                "sha256:a8156e6a7f5e2a0ff0c5b21d6bcb45145efece1909efcbbbf48c56f8da68221d",
+                "sha256:a9506a7e80bcf6eacfff7f804c0ad5350c8c95b9010e4356a4b36f5322f09abb",
+                "sha256:af310ec8335016b5e52cae60cda4a4f2a60a788cbb949a4fbea13d441aa5a09e",
+                "sha256:b0297b1e05fd128d26cc2460c810d42e205d16d76799526dfa8c8ccd50e74959",
+                "sha256:bf68f4b2b6683e52bec69273562df15af352e5ed25d1b6641e7efddc5951d1a7",
+                "sha256:d0c1bc2fa9a7285719e5678584f6b92572a5b639d0e471bb8d4b650a1a910920",
+                "sha256:d4d9d6c1a455d4babd320203b918ccc7fcbefe308615c521062bc2ba1aa4d26e",
+                "sha256:db1fa631737dab9fa0b37f3979d8d2631e348c3b4e8325d6873c2541d0ae5a48",
+                "sha256:dd93ea5c0c7f3e25335ab7d22a507b1dc43976e1345508f845efc573d3d779d8",
+                "sha256:f44e517131a98f7a76696a7b21b164bcb85291cee106a23beccce454e1f433a4",
+                "sha256:f7ee479e96f7ee350db1cf24afa5685a5899e2b34992fb99e1f7c1b0b758d263"
             ],
-            "version": "==5.2.0"
-        },
-        "zope.proxy": {
-            "hashes": [
-                "sha256:00573dfa755d0703ab84bb23cb6ecf97bb683c34b340d4df76651f97b0bab068",
-                "sha256:092049280f2848d2ba1b57b71fe04881762a220a97b65288bcb0968bb199ec30",
-                "sha256:0cbd27b4d3718b5ec74fc65ffa53c78d34c65c6fd9411b8352d2a4f855220cf1",
-                "sha256:17fc7e16d0c81f833a138818a30f366696653d521febc8e892858041c4d88785",
-                "sha256:19577dfeb70e8a67249ba92c8ad20589a1a2d86a8d693647fa8385408a4c17b0",
-                "sha256:207aa914576b1181597a1516e1b90599dc690c095343ae281b0772e44945e6a4",
-                "sha256:219a7db5ed53e523eb4a4769f13105118b6d5b04ed169a283c9775af221e231f",
-                "sha256:2b50ea79849e46b5f4f2b0247a3687505d32d161eeb16a75f6f7e6cd81936e43",
-                "sha256:5903d38362b6c716e66bbe470f190579c530a5baf03dbc8500e5c2357aa569a5",
-                "sha256:5c24903675e271bd688c6e9e7df5775ac6b168feb87dbe0e4bcc90805f21b28f",
-                "sha256:5ef6bc5ed98139e084f4e91100f2b098a0cd3493d4e76f9d6b3f7b95d7ad0f06",
-                "sha256:61b55ae3c23a126a788b33ffb18f37d6668e79a05e756588d9e4d4be7246ab1c",
-                "sha256:63ddb992931a5e616c87d3d89f5a58db086e617548005c7f9059fac68c03a5cc",
-                "sha256:6943da9c09870490dcfd50c4909c0cc19f434fa6948f61282dc9cb07bcf08160",
-                "sha256:6ad40f85c1207803d581d5d75e9ea25327cd524925699a83dfc03bf8e4ba72b7",
-                "sha256:6b44433a79bdd7af0e3337bd7bbcf53dd1f9b0fa66bf21bcb756060ce32a96c1",
-                "sha256:6bbaa245015d933a4172395baad7874373f162955d73612f0b66b6c2c33b6366",
-                "sha256:7007227f4ea85b40a2f5e5a244479f6a6dfcf906db9b55e812a814a8f0e2c28d",
-                "sha256:74884a0aec1f1609190ec8b34b5d58fb3b5353cf22b96161e13e0e835f13518f",
-                "sha256:7d25fe5571ddb16369054f54cdd883f23de9941476d97f2b92eb6d7d83afe22d",
-                "sha256:7e162bdc5e3baad26b2262240be7d2bab36991d85a6a556e48b9dfb402370261",
-                "sha256:814d62678dc3a30f4aa081982d830b7c342cf230ffc9d030b020cb154eeebf9e",
-                "sha256:8878a34c5313ee52e20aa50b03138af8d472bae465710fb954d133a9bfd3c38d",
-                "sha256:a66a0d94e5b081d5d695e66d6667e91e74d79e273eee95c1747717ba9cb70792",
-                "sha256:a69f5cbf4addcfdf03dda564a671040127a6b7c34cf9fe4973582e68441b63fa",
-                "sha256:b00f9f0c334d07709d3f73a7cb8ae63c6ca1a90c790a63b5e7effa666ef96021",
-                "sha256:b6ed71e4a7b4690447b626f499d978aa13197a0e592950e5d7020308f6054698",
-                "sha256:bdf5041e5851526e885af579d2f455348dba68d74f14a32781933569a327fddf",
-                "sha256:be034360dd34e62608419f86e799c97d389c10a0e677a25f236a971b2f40dac9",
-                "sha256:cc8f590a5eed30b314ae6b0232d925519ade433f663de79cc3783e4b10d662ba",
-                "sha256:cd7a318a15fe6cc4584bf3c4426f092ed08c0fd012cf2a9173114234fe193e11",
-                "sha256:cf19b5f63a59c20306e034e691402b02055c8f4e38bf6792c23cad489162a642",
-                "sha256:cfc781ce442ec407c841e9aa51d0e1024f72b6ec34caa8fdb6ef9576d549acf2",
-                "sha256:dea9f6f8633571e18bc20cad83603072e697103a567f4b0738d52dd0211b4527",
-                "sha256:e4a86a1d5eb2cce83c5972b3930c7c1eac81ab3508464345e2b8e54f119d5505",
-                "sha256:e7106374d4a74ed9ff00c46cc00f0a9f06a0775f8868e423f85d4464d2333679",
-                "sha256:e98a8a585b5668aa9e34d10f7785abf9545fe72663b4bfc16c99a115185ae6a5",
-                "sha256:f64840e68483316eb58d82c376ad3585ca995e69e33b230436de0cdddf7363f9",
-                "sha256:f8f4b0a9e6683e43889852130595c8854d8ae237f2324a053cdd884de936aa9b",
-                "sha256:fc45a53219ed30a7f670a6d8c98527af0020e6fd4ee4c0a8fb59f147f06d816c"
-            ],
-            "version": "==4.3.5"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==5.4.0"
         }
     },
     "develop": {}

app/src/androidTest/java/org/mozilla/fenix/syncintegration/SyncIntegrationTest.kt

@@ -28,14 +28,13 @@ import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.ext.toUri
 import org.mozilla.fenix.helpers.ext.waitNotNull
 import org.mozilla.fenix.ui.robots.accountSettings
-import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.homeScreen
 import org.mozilla.fenix.ui.robots.navigationToolbar
 import org.mozilla.fenix.ui.robots.settingsSubMenuLoginsAndPassword
 
 @Suppress("RECEIVER_NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
 class SyncIntegrationTest {
-    val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+    private lateinit var mDevice: UiDevice
     private lateinit var mockWebServer: MockWebServer
 
     @get:Rule
@@ -43,6 +42,7 @@ class SyncIntegrationTest {
 
     @Before
     fun setUp() {
+        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
         mockWebServer = MockWebServer().apply {
             dispatcher = AndroidAssetDispatcher()
             start()
@@ -141,10 +141,7 @@ class SyncIntegrationTest {
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage) {
         }.openThreeDotMenu {
-            verifyAddBookmarkButton()
-            clickAddBookmarkButton()
-        }
-        browserScreen {
+        }.bookmarkPage {
         }.openThreeDotMenu {
         }.openSettings {
         }.openTurnOnSyncMenu {
@@ -177,9 +174,11 @@ class SyncIntegrationTest {
 
     // Useful functions for the tests
     fun typeEmail() {
-        val emailInput = mDevice.findObject(UiSelector()
+        val emailInput = mDevice.findObject(
+            UiSelector()
                 .instance(0)
-                .className(EditText::class.java))
+                .className(EditText::class.java),
+        )
         emailInput.waitForExists(TestAssetHelper.waitingTime)
 
         val emailAddress = javaClass.classLoader!!.getResource("email.txt").readText()
@@ -192,9 +191,11 @@ class SyncIntegrationTest {
     }
 
     fun typePassword() {
-        val passwordInput = mDevice.findObject(UiSelector()
+        val passwordInput = mDevice.findObject(
+            UiSelector()
                 .instance(0)
-                .className(EditText::class.java))
+                .className(EditText::class.java),
+        )
 
         val passwordValue = javaClass.classLoader!!.getResource("password.txt").readText()
         passwordInput.setText(passwordValue)

app/src/androidTest/java/org/mozilla/fenix/syncintegration/conftest.py

@@ -11,8 +11,8 @@ import mozversion
 import pytest
 import requests
 
-from tps import TPS
-from gradlewbuild import GradlewBuild
+from .tps import TPS
+from .gradlewbuild import GradlewBuild
 
 here = os.path.dirname(__file__)
 

app/src/androidTest/java/org/mozilla/fenix/syncintegration/gradlewbuild.py

@@ -2,7 +2,7 @@ import logging
 import os
 import subprocess
 
-from adbrun import ADBrun
+from .adbrun import ADBrun
 
 here = os.path.dirname(__file__)
 logging.getLogger(__name__).addHandler(logging.NullHandler())
@@ -21,7 +21,7 @@ class GradlewBuild(object):
 
         # Change path accordingly to go to root folder to run gradlew
         os.chdir('../../../../../../../..')
-        cmd = './gradlew ' + 'app:connectedGeckoNightlyDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=org.mozilla.fenix.syncintegration.SyncIntegrationTest#{}'.format(identifier)
+        cmd = './gradlew ' + 'app:connectedDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=org.mozilla.fenix.syncintegration.SyncIntegrationTest#{}'.format(identifier)
 
         self.logger.info('Running cmd: {}'.format(cmd))
 
@@ -40,4 +40,4 @@ class GradlewBuild(object):
             os.chdir(testsPath)
 
             with open(self.log, 'w') as f:
-                f.write(out)
+                f.write(str(out))

app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt

@@ -5,50 +5,57 @@
 package org.mozilla.fenix.ui
 
 import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
-import androidx.test.espresso.IdlingRegistry
+import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
+import androidx.test.uiautomator.UiDevice
 import kotlinx.coroutines.runBlocking
 import mozilla.appservices.places.BookmarkRoot
 import okhttp3.mockwebserver.MockWebServer
 import org.junit.After
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.R
+import org.mozilla.fenix.customannotations.SmokeTest
 import org.mozilla.fenix.ext.bookmarkStorage
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityTestRule
 import org.mozilla.fenix.helpers.RecyclerViewIdlingResource
+import org.mozilla.fenix.helpers.RetryTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
+import org.mozilla.fenix.helpers.TestHelper
 import org.mozilla.fenix.helpers.TestHelper.longTapSelectItem
+import org.mozilla.fenix.helpers.TestHelper.registerAndCleanupIdlingResources
 import org.mozilla.fenix.ui.robots.bookmarksMenu
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.homeScreen
-import org.mozilla.fenix.ui.robots.mDevice
 import org.mozilla.fenix.ui.robots.multipleSelectionToolbar
 import org.mozilla.fenix.ui.robots.navigationToolbar
 
 /**
  *  Tests for verifying basic functionality of bookmarks
  */
-@Ignore("To be re-implemented in https://github.com/mozilla-mobile/fenix/issues/17979")
 class BookmarksTest {
     /* ktlint-disable no-blank-line-before-rbrace */ // This imposes unreadable grouping.
 
     private lateinit var mockWebServer: MockWebServer
+    private lateinit var mDevice: UiDevice
     private val bookmarksFolderName = "New Folder"
     private val testBookmark = object {
         var title: String = "Bookmark title"
         var url: String = "https://www.test.com"
     }
-    private var bookmarksListIdlingResource: RecyclerViewIdlingResource? = null
 
     @get:Rule
-    val activityTestRule = HomeActivityTestRule()
+    val activityTestRule = HomeActivityTestRule.withDefaultSettingsOverrides()
+
+    @Rule
+    @JvmField
+    val retryTestRule = RetryTestRule(3)
 
     @Before
     fun setUp() {
+        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
         mockWebServer = MockWebServer().apply {
             dispatcher = AndroidAssetDispatcher()
             start()
@@ -64,9 +71,21 @@ class BookmarksTest {
             val bookmarks = bookmarksStorage?.getTree(BookmarkRoot.Mobile.id)?.children
             bookmarks?.forEach { bookmarksStorage.deleteNode(it.guid) }
         }
+    }
 
-        if (bookmarksListIdlingResource != null) {
-            IdlingRegistry.getInstance().unregister(bookmarksListIdlingResource!!)
+    @Test
+    fun verifyEmptyBookmarksMenuTest() {
+        homeScreen {
+        }.openThreeDotMenu {
+        }.openBookmarks {
+            registerAndCleanupIdlingResources(
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1),
+            ) {
+                verifyBookmarksMenuView()
+                verifyAddFolderButton()
+                verifyCloseButton()
+                verifyBookmarkTitle("Desktop Bookmarks")
+            }
         }
     }
 
@@ -75,15 +94,15 @@ class BookmarksTest {
         homeScreen {
         }.openThreeDotMenu {
         }.openBookmarks {
-            bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1)
-            IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
-
-            selectFolder("Desktop Bookmarks")
-            verifyFolderTitle("Bookmarks Menu")
-            verifyFolderTitle("Bookmarks Toolbar")
-            verifyFolderTitle("Other Bookmarks")
-            verifySignInToSyncButton()
+            registerAndCleanupIdlingResources(
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1),
+            ) {
+                selectFolder("Desktop Bookmarks")
+                verifyFolderTitle("Bookmarks Menu")
+                verifyFolderTitle("Bookmarks Toolbar")
+                verifyFolderTitle("Other Bookmarks")
+                verifySyncSignInButton()
+            }
         }.clickSingInToSyncButton {
             verifyTurnOnSyncToolbarTitle()
         }
@@ -96,10 +115,7 @@ class BookmarksTest {
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
         }.openThreeDotMenu {
-            verifyAddBookmarkButton()
-            clickAddBookmarkButton()
-        }
-        browserScreen {
+        }.bookmarkPage {
         }.openThreeDotMenu {
             verifyEditBookmarkButton()
         }
@@ -113,12 +129,12 @@ class BookmarksTest {
             createBookmark(defaultWebPage.url)
         }.openThreeDotMenu {
         }.openBookmarks {
-            bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
-            IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
-
-            verifyBookmarkedURL(defaultWebPage.url.toString())
-            verifyBookmarkFavicon(defaultWebPage.url)
+            registerAndCleanupIdlingResources(
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
+            ) {
+                verifyBookmarkedURL(defaultWebPage.url.toString())
+                verifyBookmarkFavicon(defaultWebPage.url)
+            }
         }
     }
 
@@ -127,16 +143,16 @@ class BookmarksTest {
         homeScreen {
         }.openThreeDotMenu {
         }.openBookmarks {
-            bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1)
-            IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
-
-            clickAddFolderButton()
-            verifyKeyboardVisible()
-            addNewFolderName(bookmarksFolderName)
-            saveNewFolder()
-            verifyFolderTitle(bookmarksFolderName)
-            verifyKeyboardHidden()
+            registerAndCleanupIdlingResources(
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1),
+            ) {
+                clickAddFolderButton()
+                verifyKeyboardVisible()
+                addNewFolderName(bookmarksFolderName)
+                saveNewFolder()
+                verifyFolderTitle(bookmarksFolderName)
+                verifyKeyboardHidden()
+            }
         }
     }
 
@@ -149,9 +165,11 @@ class BookmarksTest {
             addNewFolderName(bookmarksFolderName)
             navigateUp()
             verifyKeyboardHidden()
+            verifyBookmarkFolderIsNotCreated(bookmarksFolderName)
         }
     }
 
+    @SmokeTest
     @Test
     fun editBookmarkTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -160,9 +178,9 @@ class BookmarksTest {
             createBookmark(defaultWebPage.url)
         }.openThreeDotMenu {
         }.openBookmarks {
-            bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
-            IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
+            registerAndCleanupIdlingResources(
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
+            ) {}
         }.openThreeDotMenu(defaultWebPage.url) {
         }.clickEdit {
             verifyEditBookmarksView()
@@ -186,12 +204,21 @@ class BookmarksTest {
             createBookmark(defaultWebPage.url)
         }.openThreeDotMenu {
         }.openBookmarks {
-            bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
-            IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
+            registerAndCleanupIdlingResources(
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
+            ) {}
         }.openThreeDotMenu(defaultWebPage.url) {
         }.clickCopy {
             verifyCopySnackBarText()
+            navigateUp()
+        }
+
+        navigationToolbar {
+        }.clickUrlbar {
+            clickClearButton()
+            longClickToolbar()
+            clickPasteText()
+            verifyTypedToolbarText(defaultWebPage.url.toString())
         }
     }
 
@@ -203,9 +230,9 @@ class BookmarksTest {
             createBookmark(defaultWebPage.url)
         }.openThreeDotMenu {
         }.openBookmarks {
-            bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
-            IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
+            registerAndCleanupIdlingResources(
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
+            ) {}
         }.openThreeDotMenu(defaultWebPage.url) {
         }.clickShare {
             verifyShareOverlay()
@@ -223,17 +250,93 @@ class BookmarksTest {
             createBookmark(defaultWebPage.url)
         }.openThreeDotMenu {
         }.openBookmarks {
-            bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
-            IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
+            registerAndCleanupIdlingResources(
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
+            ) {}
         }.openThreeDotMenu(defaultWebPage.url) {
         }.clickOpenInNewTab {
-            verifyUrl(defaultWebPage.url.toString())
-        }.openTabDrawer {
+            verifyTabTrayIsOpened()
             verifyNormalModeSelected()
         }
     }
 
+    @Test
+    fun openAllInTabsTest() {
+        val webPages = listOf(
+            TestAssetHelper.getGenericAsset(mockWebServer, 1),
+            TestAssetHelper.getGenericAsset(mockWebServer, 2),
+            TestAssetHelper.getGenericAsset(mockWebServer, 3),
+            TestAssetHelper.getGenericAsset(mockWebServer, 4),
+        )
+
+        homeScreen {
+        }.openThreeDotMenu {
+        }.openBookmarks {
+            createFolder("root")
+            createFolder("sub", "root")
+            createFolder("empty", "root")
+        }.closeMenu {
+        }
+
+        browserScreen {
+            createBookmark(webPages[0].url)
+            createBookmark(webPages[1].url, "root")
+            createBookmark(webPages[2].url, "root")
+            createBookmark(webPages[3].url, "sub")
+        }.openTabDrawer {
+            closeTab()
+        }
+
+        browserScreen {
+        }.openThreeDotMenu {
+        }.openBookmarks {
+        }.openThreeDotMenu("root") {
+        }.clickOpenAllInTabs {
+            verifyTabTrayIsOpened()
+            verifyNormalModeSelected()
+
+            verifyExistingOpenTabs("Test_Page_2", "Test_Page_3", "Test_Page_4")
+
+            // Bookmark that is not under the root folder should not be opened
+            verifyNoExistingOpenTabs("Test_Page_1")
+        }
+    }
+
+    @Test
+    fun openAllInPrivateTabsTest() {
+        val webPages = listOf(
+            TestAssetHelper.getGenericAsset(mockWebServer, 1),
+            TestAssetHelper.getGenericAsset(mockWebServer, 2),
+        )
+
+        homeScreen {
+        }.openThreeDotMenu {
+        }.openBookmarks {
+            createFolder("root")
+            createFolder("sub", "root")
+            createFolder("empty", "root")
+        }.closeMenu {
+        }
+
+        browserScreen {
+            createBookmark(webPages[0].url, "root")
+            createBookmark(webPages[1].url, "sub")
+        }.openTabDrawer {
+            closeTab()
+        }
+
+        browserScreen {
+        }.openThreeDotMenu {
+        }.openBookmarks {
+        }.openThreeDotMenu("root") {
+        }.clickOpenAllInPrivateTabs {
+            verifyTabTrayIsOpened()
+            verifyPrivateModeSelected()
+
+            verifyExistingOpenTabs("Test_Page_1", "Test_Page_2")
+        }
+    }
+
     @Test
     fun openBookmarkInPrivateTabTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -242,17 +345,17 @@ class BookmarksTest {
             createBookmark(defaultWebPage.url)
         }.openThreeDotMenu {
         }.openBookmarks {
-            bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
-            IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
+            registerAndCleanupIdlingResources(
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
+            ) {}
         }.openThreeDotMenu(defaultWebPage.url) {
         }.clickOpenInPrivateTab {
-            verifyUrl(defaultWebPage.url.toString())
-        }.openTabDrawer {
+            verifyTabTrayIsOpened()
             verifyPrivateModeSelected()
         }
     }
 
+    @SmokeTest
     @Test
     fun deleteBookmarkTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -261,17 +364,17 @@ class BookmarksTest {
             createBookmark(defaultWebPage.url)
         }.openThreeDotMenu {
         }.openBookmarks {
-            bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
-            IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
+            registerAndCleanupIdlingResources(
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
+            ) {}
         }.openThreeDotMenu(defaultWebPage.url) {
-            IdlingRegistry.getInstance().unregister(bookmarksListIdlingResource!!)
         }.clickDelete {
             verifyDeleteSnackBarText()
             verifyUndoDeleteSnackBarButton()
         }
     }
 
+    @SmokeTest
     @Test
     fun undoDeleteBookmarkTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -280,35 +383,36 @@ class BookmarksTest {
             createBookmark(defaultWebPage.url)
         }.openThreeDotMenu {
         }.openBookmarks {
-            bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
-            IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
+            registerAndCleanupIdlingResources(
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
+            ) {}
         }.openThreeDotMenu(defaultWebPage.url) {
-            IdlingRegistry.getInstance().unregister(bookmarksListIdlingResource!!)
         }.clickDelete {
             verifyUndoDeleteSnackBarButton()
             clickUndoDeleteButton()
             verifySnackBarHidden()
-            bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
-            IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
-            verifyBookmarkedURL(defaultWebPage.url.toString())
+            registerAndCleanupIdlingResources(
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
+            ) {
+                verifyBookmarkedURL(defaultWebPage.url.toString())
+            }
         }
     }
 
+    @SmokeTest
     @Test
-    fun multiSelectionToolbarItemsTest() {
+    fun bookmarksMultiSelectionToolbarItemsTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         browserScreen {
             createBookmark(defaultWebPage.url)
         }.openThreeDotMenu {
         }.openBookmarks {
-            bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
-            IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
-
-            longTapSelectItem(defaultWebPage.url)
+            registerAndCleanupIdlingResources(
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
+            ) {
+                longTapSelectItem(defaultWebPage.url)
+            }
         }
 
         multipleSelectionToolbar {
@@ -321,6 +425,7 @@ class BookmarksTest {
         }
     }
 
+    @SmokeTest
     @Test
     fun openSelectionInNewTabTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -334,12 +439,12 @@ class BookmarksTest {
         homeScreen {
         }.openThreeDotMenu {
         }.openBookmarks {
-            bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
-            IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
-
-            longTapSelectItem(defaultWebPage.url)
-            openActionBarOverflowOrOptionsMenu(activityTestRule.activity)
+            registerAndCleanupIdlingResources(
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
+            ) {
+                longTapSelectItem(defaultWebPage.url)
+                openActionBarOverflowOrOptionsMenu(activityTestRule.activity)
+            }
         }
 
         multipleSelectionToolbar {
@@ -349,6 +454,7 @@ class BookmarksTest {
         }
     }
 
+    @SmokeTest
     @Test
     fun openSelectionInPrivateTabTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -357,12 +463,12 @@ class BookmarksTest {
             createBookmark(defaultWebPage.url)
         }.openThreeDotMenu {
         }.openBookmarks {
-            bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
-            IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
-
-            longTapSelectItem(defaultWebPage.url)
-            openActionBarOverflowOrOptionsMenu(activityTestRule.activity)
+            registerAndCleanupIdlingResources(
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
+            ) {
+                longTapSelectItem(defaultWebPage.url)
+                openActionBarOverflowOrOptionsMenu(activityTestRule.activity)
+            }
         }
 
         multipleSelectionToolbar {
@@ -372,6 +478,7 @@ class BookmarksTest {
         }
     }
 
+    @SmokeTest
     @Test
     fun deleteMultipleSelectionTest() {
         val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -382,13 +489,12 @@ class BookmarksTest {
             createBookmark(secondWebPage.url)
         }.openThreeDotMenu {
         }.openBookmarks {
-            bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 3)
-            IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
-
-            longTapSelectItem(firstWebPage.url)
-            longTapSelectItem(secondWebPage.url)
-            IdlingRegistry.getInstance().unregister(bookmarksListIdlingResource!!)
+            registerAndCleanupIdlingResources(
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 3),
+            ) {
+                longTapSelectItem(firstWebPage.url)
+                longTapSelectItem(secondWebPage.url)
+            }
             openActionBarOverflowOrOptionsMenu(activityTestRule.activity)
         }
 
@@ -401,6 +507,38 @@ class BookmarksTest {
         }
     }
 
+    @SmokeTest
+    @Test
+    fun undoDeleteMultipleSelectionTest() {
+        val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+        val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
+
+        browserScreen {
+            createBookmark(firstWebPage.url)
+            createBookmark(secondWebPage.url)
+        }.openThreeDotMenu {
+        }.openBookmarks {
+            registerAndCleanupIdlingResources(
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 3),
+            ) {
+                longTapSelectItem(firstWebPage.url)
+                longTapSelectItem(secondWebPage.url)
+            }
+            openActionBarOverflowOrOptionsMenu(activityTestRule.activity)
+        }
+
+        multipleSelectionToolbar {
+            clickMultiSelectionDelete()
+        }
+
+        bookmarksMenu {
+            verifyDeleteMultipleBookmarksSnackBar()
+            clickUndoDeleteButton()
+            verifyBookmarkedURL(firstWebPage.url.toString())
+            verifyBookmarkedURL(secondWebPage.url.toString())
+        }
+    }
+
     @Test
     fun multipleSelectionShareButtonTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -409,11 +547,11 @@ class BookmarksTest {
             createBookmark(defaultWebPage.url)
         }.openThreeDotMenu {
         }.openBookmarks {
-            bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
-            IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
-
-            longTapSelectItem(defaultWebPage.url)
+            registerAndCleanupIdlingResources(
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
+            ) {
+                longTapSelectItem(defaultWebPage.url)
+            }
         }
 
         multipleSelectionToolbar {
@@ -439,14 +577,16 @@ class BookmarksTest {
         }.openThreeDotMenu("1") {
         }.clickDelete {
             verifyDeleteFolderConfirmationMessage()
-            confirmFolderDeletion()
+            confirmDeletion()
             verifyDeleteSnackBarText()
         }.openThreeDotMenu("2") {
         }.clickDelete {
             verifyDeleteFolderConfirmationMessage()
-            confirmFolderDeletion()
+            confirmDeletion()
             verifyDeleteSnackBarText()
             verifyFolderTitle("3")
+            // On some devices we need to wait for the Snackbar to be gone before continuing
+            TestHelper.waitUntilSnackbarGone()
         }.closeMenu {
         }
 
@@ -457,6 +597,7 @@ class BookmarksTest {
         }
     }
 
+    @SmokeTest
     @Test
     fun changeBookmarkParentFolderTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -465,27 +606,19 @@ class BookmarksTest {
             createBookmark(defaultWebPage.url)
         }.openThreeDotMenu {
         }.openBookmarks {
-            bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
-            IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
-
-            createFolder(bookmarksFolderName)
-
-            IdlingRegistry.getInstance().unregister(bookmarksListIdlingResource!!)
-
+            registerAndCleanupIdlingResources(
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
+            ) {
+                createFolder(bookmarksFolderName)
+            }
         }.openThreeDotMenu(defaultWebPage.title) {
         }.clickEdit {
             clickParentFolderSelector()
             selectFolder(bookmarksFolderName)
             navigateUp()
             saveEditBookmark()
-
-            IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
-
             selectFolder(bookmarksFolderName)
             verifyBookmarkedURL(defaultWebPage.url.toString())
-
-            IdlingRegistry.getInstance().unregister(bookmarksListIdlingResource!!)
         }
     }
 
@@ -517,12 +650,12 @@ class BookmarksTest {
         homeScreen {
         }.openThreeDotMenu {
         }.openBookmarks {
-            bookmarksListIdlingResource =
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list))
-            IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
-
-            longTapDesktopFolder("Desktop Bookmarks")
-            verifySelectDefaultFolderSnackBarText()
+            registerAndCleanupIdlingResources(
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list)),
+            ) {
+                longTapDesktopFolder("Desktop Bookmarks")
+                verifySelectDefaultFolderSnackBarText()
+            }
         }
     }
 
@@ -535,4 +668,51 @@ class BookmarksTest {
             verifyHomeScreen()
         }
     }
+
+    @Test
+    fun deleteBookmarkInEditModeTest() {
+        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+
+        browserScreen {
+            createBookmark(defaultWebPage.url)
+        }.openThreeDotMenu {
+        }.openBookmarks {
+            registerAndCleanupIdlingResources(
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
+            ) {}
+        }.openThreeDotMenu(defaultWebPage.url) {
+        }.clickEdit {
+            clickDeleteInEditModeButton()
+            cancelDeletion()
+            clickDeleteInEditModeButton()
+            confirmDeletion()
+            verifyDeleteSnackBarText()
+            verifyBookmarkIsDeleted("Test_Page_1")
+        }
+    }
+
+    @SmokeTest
+    @Test
+    fun undoDeleteBookmarkFolderTest() {
+        browserScreen {
+        }.openThreeDotMenu {
+        }.openBookmarks {
+            registerAndCleanupIdlingResources(
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1),
+            ) {
+                createFolder("My Folder")
+                verifyFolderTitle("My Folder")
+            }
+        }.openThreeDotMenu("My Folder") {
+        }.clickDelete {
+            cancelFolderDeletion()
+            verifyFolderTitle("My Folder")
+        }.openThreeDotMenu("My Folder") {
+        }.clickDelete {
+            confirmDeletion()
+            verifyDeleteSnackBarText()
+            clickUndoDeleteButton()
+            verifyFolderTitle("My Folder")
+        }
+    }
 }

app/src/androidTest/java/org/mozilla/fenix/ui/BrowsingErrorPagesTest.kt

@@ -0,0 +1,77 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.ui
+
+import androidx.core.net.toUri
+import org.junit.Rule
+import org.junit.Test
+import org.mozilla.fenix.R
+import org.mozilla.fenix.customannotations.SmokeTest
+import org.mozilla.fenix.helpers.HomeActivityTestRule
+import org.mozilla.fenix.helpers.RetryTestRule
+import org.mozilla.fenix.helpers.TestHelper.getStringResource
+import org.mozilla.fenix.ui.robots.navigationToolbar
+
+/**
+ * Tests that verify errors encountered while browsing websites: unsafe pages, connection errors, etc
+ */
+class BrowsingErrorPagesTest {
+    private val malwareWarning = getStringResource(R.string.mozac_browser_errorpages_safe_browsing_malware_uri_title)
+    private val phishingWarning = getStringResource(R.string.mozac_browser_errorpages_safe_phishing_uri_title)
+    private val unwantedSoftwareWarning =
+        getStringResource(R.string.mozac_browser_errorpages_safe_browsing_unwanted_uri_title)
+    private val harmfulSiteWarning = getStringResource(R.string.mozac_browser_errorpages_safe_harmful_uri_title)
+
+    @get: Rule
+    val mActivityTestRule = HomeActivityTestRule.withDefaultSettingsOverrides()
+
+    @Rule
+    @JvmField
+    val retryTestRule = RetryTestRule(3)
+
+    @SmokeTest
+    @Test
+    fun blockMalwarePageTest() {
+        val malwareURl = "http://itisatrap.org/firefox/its-an-attack.html"
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(malwareURl.toUri()) {
+            verifyPageContent(malwareWarning)
+        }
+    }
+
+    @SmokeTest
+    @Test
+    fun blockPhishingPageTest() {
+        val phishingURl = "http://itisatrap.org/firefox/its-a-trap.html"
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(phishingURl.toUri()) {
+            verifyPageContent(phishingWarning)
+        }
+    }
+
+    @SmokeTest
+    @Test
+    fun blockUnwantedSoftwarePageTest() {
+        val unwantedURl = "http://itisatrap.org/firefox/unwanted.html"
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(unwantedURl.toUri()) {
+            verifyPageContent(unwantedSoftwareWarning)
+        }
+    }
+
+    @SmokeTest
+    @Test
+    fun blockHarmfulPageTest() {
+        val harmfulURl = "https://itisatrap.org/firefox/harmful.html"
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(harmfulURl.toUri()) {
+            verifyPageContent(harmfulSiteWarning)
+        }
+    }
+}

app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt

@@ -0,0 +1,489 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.ui
+
+import androidx.compose.ui.test.junit4.AndroidComposeTestRule
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.uiautomator.UiDevice
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.After
+import org.junit.Before
+import org.junit.Ignore
+import org.junit.Rule
+import org.junit.Test
+import org.mozilla.fenix.customannotations.SmokeTest
+import org.mozilla.fenix.helpers.AndroidAssetDispatcher
+import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
+import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
+import org.mozilla.fenix.ui.robots.browserScreen
+import org.mozilla.fenix.ui.robots.collectionRobot
+import org.mozilla.fenix.ui.robots.homeScreen
+import org.mozilla.fenix.ui.robots.navigationToolbar
+import org.mozilla.fenix.ui.robots.tabDrawer
+
+/**
+ *  Tests for verifying basic functionality of tab collections
+ *
+ */
+
+class CollectionTest {
+    private lateinit var mDevice: UiDevice
+    private lateinit var mockWebServer: MockWebServer
+    private val firstCollectionName = "testcollection_1"
+    private val secondCollectionName = "testcollection_2"
+    private val collectionName = "First Collection"
+
+    @get:Rule
+    val composeTestRule =
+        AndroidComposeTestRule(
+            HomeActivityIntentTestRule(
+                isHomeOnboardingDialogEnabled = false,
+                isJumpBackInCFREnabled = false,
+                isRecentTabsFeatureEnabled = false,
+                isRecentlyVisitedFeatureEnabled = false,
+                isPocketEnabled = false,
+                isWallpaperOnboardingEnabled = false,
+                isTCPCFREnabled = false,
+            ),
+        ) { it.activity }
+
+    @Before
+    fun setUp() {
+        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+        mockWebServer = MockWebServer().apply {
+            dispatcher = AndroidAssetDispatcher()
+            start()
+        }
+    }
+
+    @After
+    fun tearDown() {
+        mockWebServer.shutdown()
+    }
+
+    @SmokeTest
+    @Test
+    fun createFirstCollectionTest() {
+        val firstWebPage = getGenericAsset(mockWebServer, 1)
+        val secondWebPage = getGenericAsset(mockWebServer, 2)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(firstWebPage.url) {
+            mDevice.waitForIdle()
+        }.openTabDrawer {
+        }.openNewTab {
+        }.submitQuery(secondWebPage.url.toString()) {
+            mDevice.waitForIdle()
+        }.goToHomescreen {
+        }.clickSaveTabsToCollectionButton {
+            longClickTab(firstWebPage.title)
+            selectTab(secondWebPage.title, numOfTabs = 2)
+        }.clickSaveCollection {
+            typeCollectionNameAndSave(collectionName)
+        }
+
+        tabDrawer {
+            verifySnackBarText("Collection saved!")
+            snackBarButtonClick("VIEW")
+        }
+
+        homeScreen {
+            verifyCollectionIsDisplayed(collectionName)
+        }
+    }
+
+    @SmokeTest
+    @Test
+    fun verifyExpandedCollectionItemsTest() {
+        val webPage = getGenericAsset(mockWebServer, 1)
+        val webPageUrl = webPage.url.host.toString()
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(webPage.url) {
+        }.openTabDrawer {
+            createCollection(webPage.title, collectionName = collectionName)
+            snackBarButtonClick("VIEW")
+        }
+
+        homeScreen {
+            verifyCollectionIsDisplayed(collectionName)
+        }.expandCollection(collectionName, composeTestRule) {
+            verifyTabSavedInCollection(webPage.title)
+            verifyCollectionTabUrl(true, webPageUrl)
+            verifyShareCollectionButtonIsVisible(true)
+            verifyCollectionMenuIsVisible(true, composeTestRule)
+            verifyCollectionItemRemoveButtonIsVisible(webPage.title, true)
+        }.collapseCollection(collectionName) {}
+
+        collectionRobot {
+            verifyTabSavedInCollection(webPage.title, false)
+            verifyShareCollectionButtonIsVisible(false)
+            verifyCollectionMenuIsVisible(false, composeTestRule)
+            verifyCollectionTabUrl(false, webPageUrl)
+            verifyCollectionItemRemoveButtonIsVisible(webPage.title, false)
+        }
+
+        homeScreen {
+        }.expandCollection(collectionName, composeTestRule) {
+            verifyTabSavedInCollection(webPage.title)
+            verifyCollectionTabUrl(true, webPageUrl)
+            verifyShareCollectionButtonIsVisible(true)
+            verifyCollectionMenuIsVisible(true, composeTestRule)
+            verifyCollectionItemRemoveButtonIsVisible(webPage.title, true)
+        }.collapseCollection(collectionName) {}
+
+        collectionRobot {
+            verifyTabSavedInCollection(webPage.title, false)
+            verifyShareCollectionButtonIsVisible(false)
+            verifyCollectionMenuIsVisible(false, composeTestRule)
+            verifyCollectionTabUrl(false, webPageUrl)
+            verifyCollectionItemRemoveButtonIsVisible(webPage.title, false)
+        }
+    }
+
+    @SmokeTest
+    @Test
+    fun openAllTabsInCollectionTest() {
+        val firstTestPage = getGenericAsset(mockWebServer, 1)
+        val secondTestPage = getGenericAsset(mockWebServer, 2)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(firstTestPage.url) {
+            waitForPageToLoad()
+        }.openTabDrawer {
+        }.openNewTab {
+        }.submitQuery(secondTestPage.url.toString()) {
+            waitForPageToLoad()
+        }.openTabDrawer {
+            createCollection(
+                firstTestPage.title,
+                secondTestPage.title,
+                collectionName = collectionName,
+            )
+            closeTab()
+        }
+
+        homeScreen {
+        }.expandCollection(collectionName, composeTestRule) {
+            clickCollectionThreeDotButton(composeTestRule)
+            selectOpenTabs(composeTestRule)
+        }
+        tabDrawer {
+            verifyExistingOpenTabs(firstTestPage.title, secondTestPage.title)
+        }
+    }
+
+    @SmokeTest
+    @Test
+    fun shareCollectionTest() {
+        val firstWebsite = getGenericAsset(mockWebServer, 1)
+        val secondWebsite = getGenericAsset(mockWebServer, 2)
+        val sharingApp = "Gmail"
+        val urlString = "${secondWebsite.url}\n\n${firstWebsite.url}"
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(firstWebsite.url) {
+        }.openTabDrawer {
+        }.openNewTab {
+        }.submitQuery(secondWebsite.url.toString()) {
+            waitForPageToLoad()
+        }.openTabDrawer {
+            createCollection(firstWebsite.title, secondWebsite.title, collectionName = collectionName)
+            verifySnackBarText("Collection saved!")
+        }.openTabsListThreeDotMenu {
+        }.closeAllTabs {
+        }.expandCollection(collectionName, composeTestRule) {
+        }.clickShareCollectionButton {
+            verifyShareTabsOverlay(firstWebsite.title, secondWebsite.title)
+            verifySharingWithSelectedApp(sharingApp, urlString, collectionName)
+        }
+    }
+
+    // Test running on beta/release builds in CI:
+    // caution when making changes to it, so they don't block the builds
+    @SmokeTest
+    @Test
+    fun deleteCollectionTest() {
+        val webPage = getGenericAsset(mockWebServer, 1)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(webPage.url) {
+        }.openTabDrawer {
+            createCollection(webPage.title, collectionName = collectionName)
+            snackBarButtonClick("VIEW")
+        }
+
+        homeScreen {
+        }.expandCollection(collectionName, composeTestRule) {
+            clickCollectionThreeDotButton(composeTestRule)
+            selectDeleteCollection(composeTestRule)
+        }
+
+        homeScreen {
+            verifySnackBarText("Collection deleted")
+            verifyNoCollectionsText()
+        }
+    }
+
+    // open a webpage, and add currently opened tab to existing collection
+    @Test
+    fun mainMenuSaveToExistingCollection() {
+        val firstWebPage = getGenericAsset(mockWebServer, 1)
+        val secondWebPage = getGenericAsset(mockWebServer, 2)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(firstWebPage.url) {
+        }.openTabDrawer {
+            createCollection(firstWebPage.title, collectionName = collectionName)
+            verifySnackBarText("Collection saved!")
+        }.closeTabDrawer {}
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(secondWebPage.url) {
+            verifyPageContent(secondWebPage.content)
+        }.openThreeDotMenu {
+        }.openSaveToCollection {
+        }.selectExistingCollection(collectionName) {
+            verifySnackBarText("Tab saved!")
+        }.goToHomescreen {
+        }.expandCollection(collectionName, composeTestRule) {
+            verifyTabSavedInCollection(firstWebPage.title)
+            verifyTabSavedInCollection(secondWebPage.title)
+        }
+    }
+
+    @Test
+    fun verifyAddTabButtonOfCollectionMenu() {
+        val firstWebPage = getGenericAsset(mockWebServer, 1)
+        val secondWebPage = getGenericAsset(mockWebServer, 2)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(firstWebPage.url) {
+        }.openTabDrawer {
+            createCollection(firstWebPage.title, collectionName = collectionName)
+            verifySnackBarText("Collection saved!")
+            closeTab()
+        }
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(secondWebPage.url) {
+        }.goToHomescreen {
+        }.expandCollection(collectionName, composeTestRule) {
+            clickCollectionThreeDotButton(composeTestRule)
+            selectAddTabToCollection(composeTestRule)
+            verifyTabsSelectedCounterText(1)
+            saveTabsSelectedForCollection()
+            verifySnackBarText("Tab saved!")
+            verifyTabSavedInCollection(secondWebPage.title)
+        }
+    }
+
+    @Test
+    fun renameCollectionTest() {
+        val webPage = getGenericAsset(mockWebServer, 1)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(webPage.url) {
+        }.openTabDrawer {
+            createCollection(webPage.title, collectionName = firstCollectionName)
+            verifySnackBarText("Collection saved!")
+        }.closeTabDrawer {
+        }.goToHomescreen {
+        }.expandCollection(firstCollectionName, composeTestRule) {
+            clickCollectionThreeDotButton(composeTestRule)
+            selectRenameCollection(composeTestRule)
+        }.typeCollectionNameAndSave(secondCollectionName) {}
+        homeScreen {
+            verifyCollectionIsDisplayed(secondCollectionName)
+        }
+    }
+
+    @Test
+    fun createSecondCollectionTest() {
+        val webPage = getGenericAsset(mockWebServer, 1)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(webPage.url) {
+        }.openTabDrawer {
+            createCollection(webPage.title, collectionName = firstCollectionName)
+            verifySnackBarText("Collection saved!")
+            createCollection(
+                webPage.title,
+                collectionName = secondCollectionName,
+                firstCollection = false,
+            )
+            verifySnackBarText("Collection saved!")
+        }.closeTabDrawer {
+        }.goToHomescreen {
+            verifyCollectionIsDisplayed(firstCollectionName)
+            verifyCollectionIsDisplayed(secondCollectionName)
+        }
+    }
+
+    @Test
+    fun removeTabFromCollectionTest() {
+        val webPage = getGenericAsset(mockWebServer, 1)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(webPage.url) {
+        }.openTabDrawer {
+            createCollection(webPage.title, collectionName = collectionName)
+            closeTab()
+        }
+
+        homeScreen {
+        }.expandCollection(collectionName, composeTestRule) {
+            verifyTabSavedInCollection(webPage.title, true)
+            removeTabFromCollection(webPage.title)
+            verifyTabSavedInCollection(webPage.title, false)
+        }
+        homeScreen {
+            verifyCollectionIsDisplayed(collectionName, false)
+        }
+    }
+
+    @Test
+    fun swipeLeftToRemoveTabFromCollectionTest() {
+        val testPage = getGenericAsset(mockWebServer, 1)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(testPage.url) {
+            waitForPageToLoad()
+        }.openTabDrawer {
+            createCollection(
+                testPage.title,
+                collectionName = collectionName,
+            )
+            closeTab()
+        }
+
+        homeScreen {
+        }.expandCollection(collectionName, composeTestRule) {
+            swipeToBottom()
+            swipeTabLeft(testPage.title, composeTestRule)
+            verifyTabSavedInCollection(testPage.title, false)
+        }
+        homeScreen {
+            verifyCollectionIsDisplayed(collectionName, false)
+        }
+    }
+
+    @Test
+    fun swipeRightToRemoveTabFromCollectionTest() {
+        val testPage = getGenericAsset(mockWebServer, 1)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(testPage.url) {
+            waitForPageToLoad()
+        }.openTabDrawer {
+            createCollection(
+                testPage.title,
+                collectionName = collectionName,
+            )
+            closeTab()
+        }
+
+        homeScreen {
+        }.expandCollection(collectionName, composeTestRule) {
+            swipeToBottom()
+            swipeTabRight(testPage.title, composeTestRule)
+            verifyTabSavedInCollection(testPage.title, false)
+        }
+        homeScreen {
+            verifyCollectionIsDisplayed(collectionName, false)
+        }
+    }
+
+    @Test
+    @Ignore("Failing after compose migration. See: https://github.com/mozilla-mobile/fenix/issues/26087")
+    fun selectTabOnLongTapTest() {
+        val firstWebPage = getGenericAsset(mockWebServer, 1)
+        val secondWebPage = getGenericAsset(mockWebServer, 2)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(firstWebPage.url) {
+            waitForPageToLoad()
+        }.openTabDrawer {
+        }.openNewTab {
+        }.submitQuery(secondWebPage.url.toString()) {
+            waitForPageToLoad()
+        }.openTabDrawer {
+            verifyExistingOpenTabs(firstWebPage.title, secondWebPage.title)
+            longClickTab(firstWebPage.title)
+            verifyTabsMultiSelectionCounter(1)
+            selectTab(secondWebPage.title, numOfTabs = 2)
+        }.clickSaveCollection {
+            typeCollectionNameAndSave(collectionName)
+            verifySnackBarText("Tabs saved!")
+        }
+
+        tabDrawer {
+        }.closeTabDrawer {
+        }.goToHomescreen {
+        }.expandCollection(collectionName, composeTestRule) {
+            verifyTabSavedInCollection(firstWebPage.title)
+            verifyTabSavedInCollection(secondWebPage.title)
+        }
+    }
+
+    @Test
+    @Ignore("Failing after compose migration. See: https://github.com/mozilla-mobile/fenix/issues/26087")
+    fun navigateBackInCollectionFlowTest() {
+        val webPage = getGenericAsset(mockWebServer, 1)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(webPage.url) {
+        }.openTabDrawer {
+            createCollection(webPage.title, collectionName = collectionName)
+            verifySnackBarText("Collection saved!")
+        }.closeTabDrawer {
+        }.openThreeDotMenu {
+        }.openSaveToCollection {
+            verifySelectCollectionScreen()
+            goBackInCollectionFlow()
+        }
+
+        browserScreen {
+        }.openThreeDotMenu {
+        }.openSaveToCollection {
+            verifySelectCollectionScreen()
+            clickAddNewCollection()
+            verifyCollectionNameTextField()
+            goBackInCollectionFlow()
+            verifySelectCollectionScreen()
+            goBackInCollectionFlow()
+        }
+        // verify the browser layout is visible
+        browserScreen {
+            verifyMenuButton()
+        }
+    }
+
+    @SmokeTest
+    @Test
+    @Ignore("Failing after compose migration. See: https://github.com/mozilla-mobile/fenix/issues/26087")
+    fun undoDeleteCollectionTest() {
+        val webPage = getGenericAsset(mockWebServer, 1)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(webPage.url) {
+        }.openTabDrawer {
+            createCollection(webPage.title, collectionName = collectionName)
+            snackBarButtonClick("VIEW")
+        }
+
+        homeScreen {
+        }.expandCollection(collectionName, composeTestRule) {
+            clickCollectionThreeDotButton(composeTestRule)
+            selectDeleteCollection(composeTestRule)
+        }
+
+        homeScreen {
+            verifySnackBarText("Collection deleted")
+            clickUndoSnackBarButton()
+            verifyCollectionIsDisplayed(collectionName, true)
+        }
+    }
+}

app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt.ignore

@@ -1,266 +0,0 @@
-///* This Source Code Form is subject to the terms of the Mozilla Public
-// * License, v. 2.0. If a copy of the MPL was not distributed with this
-// * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-//
-//package org.mozilla.fenix.ui
-//
-//import androidx.test.espresso.NoMatchingViewException
-//import androidx.test.platform.app.InstrumentationRegistry
-//import androidx.test.uiautomator.By
-//import androidx.test.uiautomator.UiDevice
-//import androidx.test.uiautomator.Until
-//import okhttp3.mockwebserver.MockWebServer
-//import org.junit.After
-//import org.junit.Before
-//import org.junit.Ignore
-//import org.junit.Rule
-//import org.junit.Test
-//import org.mozilla.fenix.helpers.AndroidAssetDispatcher
-//import org.mozilla.fenix.helpers.HomeActivityTestRule
-//import org.mozilla.fenix.helpers.TestAssetHelper
-//import org.mozilla.fenix.ui.robots.homeScreen
-//import org.mozilla.fenix.ui.robots.navigationToolbar
-//
-///**
-// *  Tests for verifying basic functionality of tab collection
-// *
-// */
-//
-//class CollectionTest {
-//    /* ktlint-disable no-blank-line-before-rbrace */ // This imposes unreadable grouping.
-//
-//    private val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
-//    private lateinit var mockWebServer: MockWebServer
-//    private val firstCollectionName = "testcollection_1"
-//    private val secondCollectionName = "testcollection_2"
-//
-//    @get:Rule
-//    val activityTestRule = HomeActivityTestRule()
-//
-//    @Before
-//    fun setUp() {
-//        mockWebServer = MockWebServer().apply {
-//            setDispatcher(AndroidAssetDispatcher())
-//            start()
-//        }
-//    }
-//
-//    @After
-//    fun tearDown() {
-//        mockWebServer.shutdown()
-//    }
-//
-//    @Ignore("Intermittent failures, see: https://github.com/mozilla-mobile/fenix/issues/10587")
-//    @Test
-//    // open a webpage, and add currently opened tab to existing collection
-//    fun addTabToExistingCollectionTest() {
-//        val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-//        val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
-//
-//        createCollection(firstCollectionName)
-//
-//        homeScreen {
-////            verifyExistingTabList()
-//            closeTab()
-//        }.openNavigationToolbar {
-//        }.enterURLAndEnterToBrowser(secondWebPage.url) {
-//            verifyPageContent(secondWebPage.content)
-//        }.openThreeDotMenu {
-//            clickBrowserViewSaveCollectionButton()
-//        }.selectExistingCollection(firstCollectionName) {
-//            verifySnackBarText("Tab saved!")
-//        }.openHomeScreen {
-////            verifyExistingTabList()
-//            expandCollection(firstCollectionName)
-//            verifyItemInCollectionExists(firstWebPage.title)
-//            verifyItemInCollectionExists(secondWebPage.title)
-//        }
-//    }
-//
-//    @Ignore("Intermittent failures, see: https://github.com/mozilla-mobile/fenix/issues/10587")
-//    @Test
-//    fun collectionMenuAddTabButtonTest() {
-//        val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
-//
-//        createCollection(firstCollectionName)
-//
-//        homeScreen {
-//            closeTab()
-//        }.openNavigationToolbar {
-//        }.enterURLAndEnterToBrowser(secondWebPage.url) {
-//        }.openHomeScreen {
-//            expandCollection(firstCollectionName)
-//            clickCollectionThreeDotButton()
-//            selectAddTabToCollection()
-//            verifyTabsSelectedCounterText(1)
-//            saveTabsSelectedForCollection()
-//            verifySnackBarText("Tab saved!")
-//            verifyItemInCollectionExists(secondWebPage.title)
-//        }
-//    }
-//
-//    @Ignore("Intermittent failures, see: https://github.com/mozilla-mobile/fenix/issues/10587")
-//    @Test
-//    fun renameCollectionTest() {
-//        createCollection(firstCollectionName)
-//
-//        homeScreen {
-//            // On homeview, tap the 3-dot button to expand, select rename, rename collection
-//            expandCollection(firstCollectionName)
-//            clickCollectionThreeDotButton()
-//            selectRenameCollection()
-//            typeCollectionName("renamed_collection")
-//            verifyCollectionIsDisplayed("renamed_collection")
-//        }
-//    }
-//
-//    @Ignore("Intermittent failures, see: https://github.com/mozilla-mobile/fenix/issues/10587")
-//    @Test
-//    fun createCollectionFromTabTest() {
-//        val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-//
-//        createCollection(firstCollectionName)
-//        homeScreen {
-//        }.openTabDrawer {
-//            verifyExistingOpenTabs(firstWebPage.title)
-//        }.openHomeScreen {
-//            try {
-//                verifyCollectionIsDisplayed(firstCollectionName)
-//            } catch (e: NoMatchingViewException) {
-//                scrollToElementByText(firstCollectionName)
-//            }
-//        }
-//    }
-//
-//    @Ignore("Intermittent failures, see: https://github.com/mozilla-mobile/fenix/issues/10587")
-//    @Test
-//    fun removeTabFromCollectionTest() {
-//        val webPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-//
-//        createCollection(firstCollectionName)
-//        homeScreen {
-//            closeTab()
-//            expandCollection(firstCollectionName)
-//            removeTabFromCollection(webPage.title)
-//            verifyItemInCollectionExists(webPage.title, false)
-//        }
-//
-//        createCollection(firstCollectionName)
-//        homeScreen {
-//            closeTab()
-//            expandCollection(firstCollectionName)
-//            swipeCollectionItemLeft(webPage.title)
-//            verifyItemInCollectionExists(webPage.title, false)
-//        }
-//
-//        createCollection(firstCollectionName)
-//        homeScreen {
-//            closeTab()
-//            expandCollection(firstCollectionName)
-//            swipeCollectionItemRight(webPage.title)
-//            verifyItemInCollectionExists(webPage.title, false)
-//        }
-//    }
-//
-//    @Ignore("Intermittent failures, see: https://github.com/mozilla-mobile/fenix/issues/10587")
-//    @Test
-//    fun selectTabOnLongTapTest() {
-//        val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-//        val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
-//
-//        navigationToolbar {
-//        }.enterURLAndEnterToBrowser(firstWebPage.url) {
-//        }.openHomeScreen {
-//        }.openNavigationToolbar {
-//        }.enterURLAndEnterToBrowser(secondWebPage.url) {
-//        }.openHomeScreen {
-//            longTapSelectTab(firstWebPage.title)
-//            verifySelectTabsView()
-//            verifyTabsSelectedCounterText(1)
-//            selectTabForCollection(secondWebPage.title)
-//            verifyTabsSelectedCounterText(2)
-//            saveTabsSelectedForCollection()
-//            typeCollectionName(firstCollectionName)
-//            verifySnackBarText("Tabs saved!")
-////            closeTabViaXButton(firstWebPage.title)
-////            closeTabViaXButton(secondWebPage.title)
-//            expandCollection(firstCollectionName)
-//            verifyItemInCollectionExists(firstWebPage.title)
-//            verifyItemInCollectionExists(secondWebPage.title)
-//        }
-//    }
-//
-//    @Ignore("Intermittent failures, see: https://github.com/mozilla-mobile/fenix/issues/10587")
-//    @Test
-//    fun tabsOverflowMenuSaveCollectionTest() {
-//        val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-//        val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
-//
-//        navigationToolbar {
-//        }.enterURLAndEnterToBrowser(firstWebPage.url) {
-//        }.openHomeScreen {
-//        }.openNavigationToolbar {
-//        }.enterURLAndEnterToBrowser(secondWebPage.url) {
-//        }.openHomeScreen {
-//        }.openTabsListThreeDotMenu {
-//            verifySaveCollection()
-//        }.clickOpenTabsMenuSaveCollection {
-//            verifySelectTabsView()
-//            verifyTabsSelectedCounterText(0)
-//            selectAllTabsForCollection()
-//            verifyTabsSelectedCounterText(2)
-//            saveTabsSelectedForCollection()
-//            typeCollectionName(firstCollectionName)
-////            closeTabViaXButton(firstWebPage.title)
-////            closeTabViaXButton(secondWebPage.title)
-//            expandCollection(firstCollectionName)
-//            verifyItemInCollectionExists(firstWebPage.title)
-//            verifyItemInCollectionExists(secondWebPage.title)
-//        }
-//    }
-//
-//    @Ignore("Intermittent failures, see: https://github.com/mozilla-mobile/fenix/issues/10587")
-//    @Test
-//    fun navigateBackInCollectionFlowTest() {
-//        val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
-//
-//        createCollection(firstCollectionName)
-//        navigationToolbar {
-//        }.enterURLAndEnterToBrowser(secondWebPage.url) {
-//        }.openHomeScreen {
-//            longTapSelectTab(secondWebPage.title)
-//            verifySelectTabsView()
-//            saveTabsSelectedForCollection()
-//            verifySelectCollectionView()
-//            clickAddNewCollection()
-//            verifyNameCollectionView()
-//            goBackCollectionFlow()
-//            verifySelectCollectionView()
-//            goBackCollectionFlow()
-//            verifySelectTabsView()
-//            goBackCollectionFlow()
-//            verifyHomeComponent()
-//        }
-//    }
-//
-//    private fun createCollection(collectionName: String, firstCollection: Boolean = true) {
-//        val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-//
-//        navigationToolbar {
-//        }.enterURLAndEnterToBrowser(firstWebPage.url) {
-//            verifyPageContent(firstWebPage.content)
-//        }.openThreeDotMenu {
-//            clickBrowserViewSaveCollectionButton()
-//            if (!firstCollection)
-//                clickAddNewCollection()
-//
-//        }.typeCollectionName(collectionName) {
-//            verifySnackBarText("Tab saved!")
-//        }.openHomeScreen {
-//            mDevice.wait(
-//                Until.findObject(By.text(collectionName)),
-//                TestAssetHelper.waitingTime
-//            )
-//        }
-//    }
-//}

app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt

@@ -9,13 +9,16 @@ import androidx.test.uiautomator.UiDevice
 import okhttp3.mockwebserver.MockWebServer
 import org.junit.After
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
+import org.mozilla.fenix.customannotations.SmokeTest
+import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
+import org.mozilla.fenix.helpers.RetryTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.ui.robots.downloadRobot
+import org.mozilla.fenix.ui.robots.homeScreen
 import org.mozilla.fenix.ui.robots.navigationToolbar
 
 /**
@@ -33,14 +36,20 @@ import org.mozilla.fenix.ui.robots.navigationToolbar
  */
 
 class ContextMenusTest {
-    private val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+    private lateinit var mDevice: UiDevice
     private lateinit var mockWebServer: MockWebServer
 
     @get:Rule
-    val activityIntentTestRule = HomeActivityIntentTestRule()
+    val activityIntentTestRule = HomeActivityIntentTestRule.withDefaultSettingsOverrides()
+
+    @Rule
+    @JvmField
+    val retryTestRule = RetryTestRule(3)
 
     @Before
     fun setUp() {
+        activityIntentTestRule.activity.applicationContext.settings().shouldShowJumpBackInCFR = false
+        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
         mockWebServer = MockWebServer().apply {
             dispatcher = AndroidAssetDispatcher()
             start()
@@ -52,6 +61,7 @@ class ContextMenusTest {
         mockWebServer.shutdown()
     }
 
+    @SmokeTest
     @Test
     fun verifyContextOpenLinkNewTab() {
         val pageLinks =
@@ -62,11 +72,11 @@ class ContextMenusTest {
         navigationToolbar {
         }.enterURLAndEnterToBrowser(pageLinks.url) {
             mDevice.waitForIdle()
-            longClickMatchingText("Link 1")
+            longClickLink("Link 1")
             verifyLinkContextMenuItems(genericURL.url)
             clickContextOpenLinkInNewTab()
             verifySnackBarText("New tab opened")
-            snackBarButtonClick("Switch")
+            snackBarButtonClick()
             verifyUrl(genericURL.url.toString())
         }.openTabDrawer {
             verifyNormalModeSelected()
@@ -75,6 +85,7 @@ class ContextMenusTest {
         }
     }
 
+    @SmokeTest
     @Test
     fun verifyContextOpenLinkPrivateTab() {
         val pageLinks =
@@ -85,11 +96,11 @@ class ContextMenusTest {
         navigationToolbar {
         }.enterURLAndEnterToBrowser(pageLinks.url) {
             mDevice.waitForIdle()
-            longClickMatchingText("Link 2")
+            longClickLink("Link 2")
             verifyLinkContextMenuItems(genericURL.url)
             clickContextOpenLinkInPrivateTab()
             verifySnackBarText("New private tab opened")
-            snackBarButtonClick("Switch")
+            snackBarButtonClick()
             verifyUrl(genericURL.url.toString())
         }.openTabDrawer {
             verifyPrivateModeSelected()
@@ -97,7 +108,6 @@ class ContextMenusTest {
         }
     }
 
-    @Ignore("Test failures: https://github.com/mozilla-mobile/fenix/issues/12473")
     @Test
     fun verifyContextCopyLink() {
         val pageLinks =
@@ -108,6 +118,23 @@ class ContextMenusTest {
         navigationToolbar {
         }.enterURLAndEnterToBrowser(pageLinks.url) {
             mDevice.waitForIdle()
+            longClickLink("Link 3")
+            verifyLinkContextMenuItems(genericURL.url)
+            clickContextCopyLink()
+            verifySnackBarText("Link copied to clipboard")
+        }.openNavigationToolbar {
+        }.visitLinkFromClipboard {
+            verifyUrl(genericURL.url.toString())
+        }
+    }
+
+    @Test
+    fun verifyContextCopyLinkNotDisplayedAfterApplied() {
+        val pageLinks = TestAssetHelper.getGenericAsset(mockWebServer, 4)
+        val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 3)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(pageLinks.url) {
             longClickMatchingText("Link 3")
             verifyLinkContextMenuItems(genericURL.url)
             clickContextCopyLink()
@@ -115,6 +142,11 @@ class ContextMenusTest {
         }.openNavigationToolbar {
         }.visitLinkFromClipboard {
             verifyUrl(genericURL.url.toString())
+        }.openTabDrawer {
+        }.openNewTab {
+        }
+        navigationToolbar {
+            verifyClipboardSuggestionsAreDisplayed(shouldBeDisplayed = false)
         }
     }
 
@@ -128,13 +160,12 @@ class ContextMenusTest {
         navigationToolbar {
         }.enterURLAndEnterToBrowser(pageLinks.url) {
             mDevice.waitForIdle()
-            longClickMatchingText("Link 1")
+            longClickLink("Link 1")
             verifyLinkContextMenuItems(genericURL.url)
             clickContextShareLink(genericURL.url) // verify share intent is matched with associated URL
         }
     }
 
-    @Ignore("Intermittent: https://github.com/mozilla-mobile/fenix/issues/12367")
     @Test
     fun verifyContextOpenImageNewTab() {
         val pageLinks =
@@ -145,17 +176,16 @@ class ContextMenusTest {
         navigationToolbar {
         }.enterURLAndEnterToBrowser(pageLinks.url) {
             mDevice.waitForIdle()
-            longClickMatchingText("test_link_image")
+            longClickLink("test_link_image")
             verifyLinkImageContextMenuItems(imageResource.url)
             clickContextOpenImageNewTab()
             verifySnackBarText("New tab opened")
-            snackBarButtonClick("Switch")
+            snackBarButtonClick()
             verifyUrl(imageResource.url.toString())
         }
     }
 
     @Test
-    @Ignore("Disabled – Google Keyboard Clipboard overlay blocks the address bar: https://github.com/mozilla-mobile/fenix/issues/10586")
     fun verifyContextCopyImageLocation() {
         val pageLinks =
             TestAssetHelper.getGenericAsset(mockWebServer, 4)
@@ -165,7 +195,7 @@ class ContextMenusTest {
         navigationToolbar {
         }.enterURLAndEnterToBrowser(pageLinks.url) {
             mDevice.waitForIdle()
-            longClickMatchingText("test_link_image")
+            longClickLink("test_link_image")
             verifyLinkImageContextMenuItems(imageResource.url)
             clickContextCopyImageLocation()
             verifySnackBarText("Link copied to clipboard")
@@ -176,7 +206,6 @@ class ContextMenusTest {
     }
 
     @Test
-    @Ignore("Intermittent: https://github.com/mozilla-mobile/fenix/issues/12309")
     fun verifyContextSaveImage() {
         val pageLinks =
             TestAssetHelper.getGenericAsset(mockWebServer, 4)
@@ -186,13 +215,12 @@ class ContextMenusTest {
         navigationToolbar {
         }.enterURLAndEnterToBrowser(pageLinks.url) {
             mDevice.waitForIdle()
-            longClickMatchingText("test_link_image")
+            longClickLink("test_link_image")
             verifyLinkImageContextMenuItems(imageResource.url)
             clickContextSaveImage()
         }
 
         downloadRobot {
-        }.clickAllowPermission {
             verifyDownloadNotificationPopup()
         }.clickOpen("image/jpeg") {} // verify open intent is matched with associated data type
         downloadRobot {
@@ -201,7 +229,6 @@ class ContextMenusTest {
     }
 
     @Test
-    @Ignore("Intermittent: https://github.com/mozilla-mobile/fenix/issues/12309")
     fun verifyContextMixedVariations() {
         val pageLinks =
             TestAssetHelper.getGenericAsset(mockWebServer, 4)
@@ -213,14 +240,58 @@ class ContextMenusTest {
         navigationToolbar {
         }.enterURLAndEnterToBrowser(pageLinks.url) {
             mDevice.waitForIdle()
-            longClickMatchingText("Link 1")
+            longClickLink("Link 1")
             verifyLinkContextMenuItems(genericURL.url)
             dismissContentContextMenu(genericURL.url)
-            longClickMatchingText("test_link_image")
+            longClickLink("test_link_image")
             verifyLinkImageContextMenuItems(imageResource.url)
             dismissContentContextMenu(imageResource.url)
-            longClickMatchingText("test_no_link_image")
+            longClickLink("test_no_link_image")
             verifyNoLinkImageContextMenuItems(imageResource.url)
         }
     }
+
+    @SmokeTest
+    @Test
+    fun shareSelectedTextTest() {
+        val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(genericURL.url) {
+            longClickLink(genericURL.content)
+        }.clickShareSelectedText {
+            verifyAndroidShareLayout()
+        }
+    }
+
+    @SmokeTest
+    @Test
+    fun selectAndSearchTextTest() {
+        val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(genericURL.url) {
+            longClickAndSearchText("Search", "content")
+            mDevice.waitForIdle()
+            verifyTabCounter("2")
+            verifyUrl("google")
+        }
+    }
+
+    @SmokeTest
+    @Test
+    fun privateSelectAndSearchTextTest() {
+        val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+
+        homeScreen {
+        }.togglePrivateBrowsingMode()
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(genericURL.url) {
+            longClickAndSearchText("Private Search", "content")
+            mDevice.waitForIdle()
+            verifyTabCounter("2")
+            verifyUrl("google")
+        }
+    }
 }

app/src/androidTest/java/org/mozilla/fenix/ui/ContextualHintsTest.kt

@@ -0,0 +1,70 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.ui
+
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.mozilla.fenix.helpers.AndroidAssetDispatcher
+import org.mozilla.fenix.helpers.HomeActivityTestRule
+import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
+import org.mozilla.fenix.helpers.TestHelper.mDevice
+import org.mozilla.fenix.ui.robots.navigationToolbar
+
+/**
+ *  Tests for verifying the new Cookie protection & homescreen feature hints.
+ *  Note: This involves setting the feature flags On for CFRs which are disabled elsewhere.
+ *
+ */
+class ContextualHintsTest {
+    private lateinit var mockWebServer: MockWebServer
+
+    @get:Rule
+    val activityTestRule = HomeActivityTestRule(
+        isJumpBackInCFREnabled = true,
+        isTCPCFREnabled = true,
+        isPocketEnabled = false,
+        isRecentlyVisitedFeatureEnabled = false,
+    )
+
+    @Before
+    fun setUp() {
+        mockWebServer = MockWebServer().apply {
+            dispatcher = AndroidAssetDispatcher()
+            start()
+        }
+    }
+
+    @After
+    fun tearDown() {
+        mockWebServer.shutdown()
+    }
+
+    @Test
+    fun jumpBackInCFRTest() {
+        val genericPage = getGenericAsset(mockWebServer, 1)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(genericPage.url) {
+            verifyCookiesProtectionHint()
+            // One back press to dismiss the TCP hint
+            mDevice.pressBack()
+        }.goToHomescreen {
+            verifyJumpBackInMessage()
+        }
+    }
+
+    @Test
+    fun cookieProtectionHintTest() {
+        val genericPage = getGenericAsset(mockWebServer, 1)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(genericPage.url) {
+            verifyCookiesProtectionHint()
+        }
+    }
+}

app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt

@@ -0,0 +1,137 @@
+package org.mozilla.fenix.ui
+
+import androidx.compose.ui.test.junit4.AndroidComposeTestRule
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.uiautomator.UiDevice
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.After
+import org.junit.Before
+import org.junit.Ignore
+import org.junit.Rule
+import org.junit.Test
+import org.mozilla.fenix.R
+import org.mozilla.fenix.customannotations.SmokeTest
+import org.mozilla.fenix.helpers.AndroidAssetDispatcher
+import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
+import org.mozilla.fenix.helpers.TestAssetHelper
+import org.mozilla.fenix.helpers.TestHelper.getStringResource
+import org.mozilla.fenix.ui.robots.homeScreen
+import org.mozilla.fenix.ui.robots.navigationToolbar
+
+class CrashReportingTest {
+    private lateinit var mDevice: UiDevice
+    private lateinit var mockWebServer: MockWebServer
+    private val tabCrashMessage = getStringResource(R.string.tab_crash_title_2)
+
+    @get:Rule
+    val activityTestRule = AndroidComposeTestRule(
+        HomeActivityIntentTestRule(
+            isPocketEnabled = false,
+            isJumpBackInCFREnabled = false,
+            isWallpaperOnboardingEnabled = false,
+            isTCPCFREnabled = false,
+        ),
+    ) { it.activity }
+
+    @Before
+    fun setUp() {
+        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+        mockWebServer = MockWebServer().apply {
+            dispatcher = AndroidAssetDispatcher()
+            start()
+        }
+    }
+
+    @After
+    fun tearDown() {
+        mockWebServer.shutdown()
+    }
+
+    @Test
+    fun closeTabCrashedReporterTest() {
+        homeScreen {
+        }.openNavigationToolbar {
+        }.openTabCrashReporter {
+        }.clickTabCrashedCloseButton {
+        }.openTabDrawer {
+            verifyNoOpenTabsInNormalBrowsing()
+        }
+    }
+
+    @Ignore("Test failure caused by: https://github.com/mozilla-mobile/fenix/issues/19964")
+    @Test
+    fun restoreTabCrashedReporterTest() {
+        val website = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+
+        homeScreen {
+        }.openNavigationToolbar {
+        }.enterURLAndEnterToBrowser(website.url) {}
+
+        navigationToolbar {
+        }.openTabCrashReporter {
+            clickTabCrashedRestoreButton()
+            verifyPageContent(website.content)
+        }
+    }
+
+    @SmokeTest
+    @Test
+    fun useAppWhileTabIsCrashedTest() {
+        val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+        val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
+
+        homeScreen {
+        }.openNavigationToolbar {
+        }.enterURLAndEnterToBrowser(firstWebPage.url) {
+            mDevice.waitForIdle()
+        }.openTabDrawer {
+        }.openNewTab {
+        }.submitQuery(secondWebPage.url.toString()) {
+            waitForPageToLoad()
+        }
+
+        navigationToolbar {
+        }.openTabCrashReporter {
+            verifyPageContent(tabCrashMessage)
+        }.openTabDrawer {
+            verifyExistingOpenTabs(firstWebPage.title)
+            verifyExistingOpenTabs(secondWebPage.title)
+        }.closeTabDrawer {
+        }.goToHomescreen {
+            verifyExistingTopSitesList()
+        }.openThreeDotMenu {
+            verifySettingsButton()
+        }
+    }
+
+    @SmokeTest
+    @Test
+    fun privateBrowsingUseAppWhileTabIsCrashedTest() {
+        val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+        val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
+
+        homeScreen {
+            togglePrivateBrowsingModeOnOff()
+        }.openNavigationToolbar {
+        }.enterURLAndEnterToBrowser(firstWebPage.url) {
+            mDevice.waitForIdle()
+        }.openTabDrawer {
+        }.openNewTab {
+        }.submitQuery(secondWebPage.url.toString()) {
+            waitForPageToLoad()
+        }
+
+        navigationToolbar {
+        }.openTabCrashReporter {
+            verifyPageContent(tabCrashMessage)
+        }.openTabDrawer {
+            verifyExistingOpenTabs(firstWebPage.title)
+            verifyExistingOpenTabs(secondWebPage.title)
+        }.closeTabDrawer {
+        }.goToHomescreen {
+            verifyPrivateSessionMessage()
+        }.openThreeDotMenu {
+            verifySettingsButton()
+        }
+    }
+}

app/src/androidTest/java/org/mozilla/fenix/ui/CustomTabsTest.kt

@@ -0,0 +1,205 @@
+@file:Suppress("DEPRECATION")
+
+package org.mozilla.fenix.ui
+
+import androidx.core.net.toUri
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.ActivityTestRule
+import androidx.test.uiautomator.UiDevice
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.mozilla.fenix.IntentReceiverActivity
+import org.mozilla.fenix.customannotations.SmokeTest
+import org.mozilla.fenix.helpers.AndroidAssetDispatcher
+import org.mozilla.fenix.helpers.FeatureSettingsHelperDelegate
+import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
+import org.mozilla.fenix.helpers.TestAssetHelper
+import org.mozilla.fenix.helpers.TestHelper.createCustomTabIntent
+import org.mozilla.fenix.helpers.TestHelper.openAppFromExternalLink
+import org.mozilla.fenix.ui.robots.browserScreen
+import org.mozilla.fenix.ui.robots.customTabScreen
+import org.mozilla.fenix.ui.robots.navigationToolbar
+import org.mozilla.fenix.ui.robots.notificationShade
+import org.mozilla.fenix.ui.robots.openEditURLView
+import org.mozilla.fenix.ui.robots.searchScreen
+
+class CustomTabsTest {
+    private lateinit var mDevice: UiDevice
+    private lateinit var mockWebServer: MockWebServer
+    private val customMenuItem = "TestMenuItem"
+
+    /* Updated externalLinks.html to v2.0,
+       changed the hypertext reference to mozilla-mobile.github.io/testapp/downloads for "External link"
+     */
+    private val externalLinksPWAPage = "https://mozilla-mobile.github.io/testapp/v2.0/externalLinks.html"
+    private val loginPage = "https://mozilla-mobile.github.io/testapp/loginForm"
+
+    @get:Rule
+    val activityTestRule = HomeActivityIntentTestRule()
+
+    @get: Rule
+    val intentReceiverActivityTestRule = ActivityTestRule(
+        IntentReceiverActivity::class.java,
+        true,
+        false,
+    )
+
+    private val featureSettingsHelper = FeatureSettingsHelperDelegate()
+
+    @Before
+    fun setUp() {
+        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+        mockWebServer = MockWebServer().apply {
+            dispatcher = AndroidAssetDispatcher()
+            start()
+        }
+
+        featureSettingsHelper.apply {
+            isTCPCFREnabled = false
+        }.applyFlagUpdates()
+    }
+
+    @After
+    fun tearDown() {
+        mockWebServer.shutdown()
+        featureSettingsHelper.resetAllFeatureFlags()
+    }
+
+    @SmokeTest
+    @Test
+    fun customTabsOpenExternalLinkTest() {
+        val externalLinkURL = "https://mozilla-mobile.github.io/testapp/downloads"
+
+        intentReceiverActivityTestRule.launchActivity(
+            createCustomTabIntent(
+                externalLinksPWAPage.toUri().toString(),
+                customMenuItem,
+            ),
+        )
+
+        customTabScreen {
+            waitForPageToLoad()
+            clickLinkMatchingText("External link")
+            waitForPageToLoad()
+            verifyCustomTabToolbarTitle(externalLinkURL)
+        }
+    }
+
+    @SmokeTest
+    @Test
+    fun customTabsSaveLoginTest() {
+        intentReceiverActivityTestRule.launchActivity(
+            createCustomTabIntent(
+                loginPage.toUri().toString(),
+                customMenuItem,
+            ),
+        )
+
+        customTabScreen {
+            waitForPageToLoad()
+            fillAndSubmitLoginCredentials("mozilla", "firefox")
+        }
+
+        browserScreen {
+            verifySaveLoginPromptIsDisplayed()
+            saveLoginFromPrompt("Save")
+        }
+
+        openAppFromExternalLink(loginPage)
+
+        browserScreen {
+        }.openThreeDotMenu {
+        }.openSettings {
+        }.openLoginsAndPasswordSubMenu {
+        }.openSavedLogins {
+            verifySecurityPromptForLogins()
+            tapSetupLater()
+            verifySavedLoginFromPrompt("mozilla")
+        }
+    }
+
+    @SmokeTest
+    @Test
+    fun customTabCopyToolbarUrlTest() {
+        val customTabPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+
+        intentReceiverActivityTestRule.launchActivity(
+            createCustomTabIntent(
+                customTabPage.url.toString(),
+                customMenuItem,
+            ),
+        )
+
+        customTabScreen {
+            longCLickAndCopyToolbarUrl()
+        }
+
+        openAppFromExternalLink(customTabPage.url.toString())
+
+        navigationToolbar {
+            openEditURLView()
+        }
+
+        searchScreen {
+            clickClearButton()
+            longClickToolbar()
+            clickPasteText()
+            verifyTypedToolbarText(customTabPage.url.toString())
+        }
+    }
+
+    @SmokeTest
+    @Test
+    fun customTabShareTextTest() {
+        val customTabPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+
+        intentReceiverActivityTestRule.launchActivity(
+            createCustomTabIntent(
+                customTabPage.url.toString(),
+                customMenuItem,
+            ),
+        )
+
+        customTabScreen {
+            waitForPageToLoad()
+        }
+
+        browserScreen {
+            longClickMatchingText("content")
+        }.clickShareSelectedText {
+            verifyAndroidShareLayout()
+        }
+    }
+
+    @SmokeTest
+    @Test
+    fun customTabDownloadTest() {
+        val customTabPage = "https://storage.googleapis.com/mobile_test_assets/test_app/downloads.html"
+        val downloadFile = "web_icon.png"
+
+        intentReceiverActivityTestRule.launchActivity(
+            createCustomTabIntent(
+                customTabPage.toUri().toString(),
+                customMenuItem,
+            ),
+        )
+
+        customTabScreen {
+            waitForPageToLoad()
+        }
+
+        browserScreen {
+        }.clickDownloadLink(downloadFile) {
+            verifyDownloadPrompt(downloadFile)
+        }.clickDownload {
+            verifyDownloadNotificationPopup()
+        }
+        mDevice.openNotification()
+        notificationShade {
+            verifySystemNotificationExists("Download completed")
+        }
+    }
+}