[tbb-bugs] #32097 [Applications/Tor Browser]: Fix conflicts in mobile onbarding while rebasing to esr68.2.0

[Tor Bug Tracker & Wiki]

#32097: Fix conflicts in mobile onbarding while rebasing to esr68.2.0
-------------------------------------------------+-------------------------
 Reporter:  gk                                   |          Owner:  tbb-
                                                 |  team
     Type:  defect                               |         Status:
                                                 |  needs_review
 Priority:  Very High                            |      Milestone:
Component:  Applications/Tor Browser             |        Version:
 Severity:  Major                                |     Resolution:
 Keywords:  TorBrowserTeam201910R, tbb-9.0-must  |  Actual Points:
Parent ID:                                       |         Points:  0.5
 Reviewer:                                       |        Sponsor:
-------------------------------------------------+-------------------------
Changes (by sysrqb):

 * status:  needs_information => needs_review


Comment:

 I began with only resolving merge conflicts. That got me most of the way
 to creating a clean build. Then I noticed the new patches added new Sync
 "Sign Up" buttons on the onboarding panels and Activity Stream panel. I
 wrote fixup patches for deleting the button on the onboarding panels and I
 backed out the commit for the Activity Stream. Unfortunately, this
 resulted in a build failure due to undefined variables resulting from the
 backed out patch. At this point I decided I'd try backing out all the
 patches needed for successfully building 68.2.0. This is why I didn't
 backout all commits, like Bug 1586770. The patch for that bug didn't break
 any functionality or introduce conflicting code changes.

 I looked at the patch and we can keep it. I'll look through the other
 Fennec patches for 68.2.0, as well, and confirm we didn't miss anything.

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/32097#comment:7>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online