fixup! TB3: Tor Browser's official .mozconfigs.

Bug 41668: Port some updater patches to Base Browser

Remove TOR_BROWSER_UPDATE to then add BASE_BROWSER_UPDATE with another
fixup commit.

browser/base/moz.build

@@ -87,9 +87,6 @@ if CONFIG["OS_ARCH"] == "WINNT" and CONFIG["MOZ_DEFAULT_BROWSER_AGENT"]:
     # Impacts `/toolkit/content/license.html`.
     DEFINES["MOZ_DEFAULT_BROWSER_AGENT"] = True
 
-if CONFIG["TOR_BROWSER_UPDATE"]:
-    DEFINES["TOR_BROWSER_UPDATE"] = 1
-
 JAR_MANIFESTS += ["jar.mn"]
 
 GeneratedFile(

browser/config/mozconfigs/tor-browser

@@ -10,6 +10,4 @@ ac_add_options --with-relative-data-dir=TorBrowser/Data/Browser
 # ac_add_options --with-user-appdir=TorProject
 # ac_add_options --with-user-appdir=.torproject
 
-ac_add_options --enable-tor-browser-update
-
 ac_add_options --with-distribution-id=org.torproject

browser/installer/Makefile.in

@@ -82,10 +82,6 @@ endif
 endif
 endif
 
-ifdef TOR_BROWSER_UPDATE
-DEFINES += -DTOR_BROWSER_UPDATE
-endif
-
 ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET)))
 DEFINES += -DMOZ_SHARED_MOZGLUE=1
 endif

moz.configure

@@ -1051,23 +1051,6 @@ set_define("RELATIVE_DATA_DIR", relative_data_dir)
 set_define("TOR_BROWSER", True)
 
 
-option(
-    "--enable-tor-browser-update",
-    help="Enable Tor Browser update"
-)
-
-
-@depends("--enable-tor-browser-update")
-def tor_browser_update(value):
-    if value:
-        return True
-
-
-set_config("TOR_BROWSER_UPDATE", tor_browser_update)
-set_define("TOR_BROWSER_UPDATE", tor_browser_update)
-add_old_configure_assignment("TOR_BROWSER_UPDATE", tor_browser_update)
-
-
 # Please do not add configure checks from here on.
 
 # Fallthrough to autoconf-based configure

mozconfig-linux-x86_64-dev

@@ -12,4 +12,3 @@ ac_add_options --enable-default-toolkit=cairo-gtk3
 ac_add_options --disable-strip
 ac_add_options --disable-install-strip
 
-ac_add_options --disable-tor-browser-update

toolkit/modules/AppConstants.jsm

@@ -460,13 +460,6 @@ this.AppConstants = Object.freeze({
     false,
 #endif
 
-  TOR_BROWSER_UPDATE:
-#ifdef TOR_BROWSER_UPDATE
-    true,
-#else
-    false,
-#endif
-
   // Returns true for CN region build when distibution id set as 'MozillaOnline'
   isChinaRepack() {
     return (

toolkit/modules/moz.build

@@ -303,9 +303,6 @@ for var in (
     if CONFIG[var]:
         DEFINES[var] = True
 
-if CONFIG["TOR_BROWSER_UPDATE"]:
-    DEFINES["TOR_BROWSER_UPDATE"] = 1
-
 JAR_MANIFESTS += ["jar.mn"]
 
 DEFINES["TOPOBJDIR"] = TOPOBJDIR