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

Bug 41647: Clean up our {TOR,BASE}_BROWSER(_VERSION)? macros

Removed --with-tor-browser-version

Also, prepare the code for the next fixup.

mobile/android/geckoview/build.gradle

@@ -46,7 +46,7 @@ android {
         buildConfigField 'String', "MOZ_APP_DISPLAYNAME", "\"${mozconfig.substs.MOZ_APP_DISPLAYNAME}\"";
         buildConfigField 'String', "MOZ_APP_UA_NAME", "\"${mozconfig.substs.MOZ_APP_UA_NAME}\"";
         buildConfigField 'String', "MOZ_UPDATE_CHANNEL", "\"${mozconfig.substs.MOZ_UPDATE_CHANNEL}\"";
-        buildConfigField 'String', "TOR_BROWSER_VERSION", "\"${mozconfig.substs.TOR_BROWSER_VERSION}\"";
+        buildConfigField 'boolean', "TOR_BROWSER", mozconfig.substs.TOR_BROWSER ? 'true' : 'false';
 
         // MOZILLA_VERSION is oddly quoted from autoconf, but we don't have to handle it specially in Gradle.
         buildConfigField 'String', "MOZILLA_VERSION", "\"${mozconfig.substs.MOZILLA_VERSION}\"";

moz.configure

@@ -1044,69 +1044,6 @@ def relative_data_dir(value, target):
 set_define("RELATIVE_DATA_DIR", relative_data_dir)
 
 
-# Tor additions.
-
-option(
-    "--with-tor-browser-version",
-    nargs=1,
-    help="Set Tor Browser version, e.g., 7.0a1"
-)
-
-
-@depends("--with-tor-browser-version")
-def tor_browser_version(value):
-    if not value:
-        die("--with-tor-browser-version is required for Tor Browser.")
-    return value[0]
-
-
-@depends("--with-tor-browser-version")
-def tor_browser_version_quoted(value):
-    if not value:
-        die("--with-tor-browser-version is required for Tor Browser.")
-    return '"{}"'.format(value[0])
-
-
-set_config("TOR_BROWSER_VERSION", tor_browser_version)
-set_define("TOR_BROWSER_VERSION", tor_browser_version)
-set_define("TOR_BROWSER_VERSION_QUOTED", tor_browser_version_quoted)
-
-
-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)
-
-
-option(
-    "--enable-tor-browser-data-outside-app-dir",
-    help="Enable Tor Browser data outside of app directory"
-)
-
-
-@depends("--enable-tor-browser-data-outside-app-dir")
-def tor_browser_data_outside_app_dir(value):
-    if value:
-        return True
-
-
-set_define(
-    "TOR_BROWSER_DATA_OUTSIDE_APP_DIR", tor_browser_data_outside_app_dir)
-add_old_configure_assignment(
-    "TOR_BROWSER_DATA_OUTSIDE_APP_DIR", tor_browser_data_outside_app_dir)
-
-
 # Please do not add configure checks from here on.
 
 # Fallthrough to autoconf-based configure

mozconfig-linux-x86_64-dev

@@ -13,4 +13,3 @@ ac_add_options --disable-strip
 ac_add_options --disable-install-strip
 
 ac_add_options --disable-tor-browser-update
-ac_add_options --with-tor-browser-version=dev-build

toolkit/modules/AppConstants.jsm

@@ -361,14 +361,6 @@ this.AppConstants = Object.freeze({
   MOZ_WIDGET_TOOLKIT: "@MOZ_WIDGET_TOOLKIT@",
   ANDROID_PACKAGE_NAME: "@ANDROID_PACKAGE_NAME@",
 
-  TOR_BROWSER_VERSION: "@TOR_BROWSER_VERSION@",
-  TOR_BROWSER_DATA_OUTSIDE_APP_DIR:
-#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR
-  true,
-#else
-  false,
-#endif
-
   DEBUG_JS_MODULES: "@DEBUG_JS_MODULES@",
 
   MOZ_BING_API_CLIENTID: "@MOZ_BING_API_CLIENTID@",
@@ -475,13 +467,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 (