henry pushed to branch tor-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser

Commits:

2 changed files:

Changes:

  • browser/app/profile/001-base-profile.js
    ... ... @@ -417,6 +417,9 @@ pref("browser.urlbar.dnsResolveSingleWordsAfterSearch", 0);
    417 417
     pref("messaging-system.rsexperimentloader.enabled", false);
    
    418 418
     // true means that you are *not* opting out. See its usage in various file.
    
    419 419
     pref("app.shield.optoutstudies.enabled", false);
    
    420
    +// Disable nimbus rollouts.
    
    421
    +// See bugzilla bug 2003350. See tor-browser#44520.
    
    422
    +pref("nimbus.rollouts.enabled", false);
    
    420 423
     // Disable Normandy/Shield
    
    421 424
     pref("app.normandy.enabled", false);
    
    422 425
     pref("app.normandy.api_url", "");
    

  • toolkit/components/nimbus/ExperimentAPI.sys.mjs
    ... ... @@ -396,10 +396,19 @@ export const ExperimentAPI = new (class {
    396 396
       }
    
    397 397
     
    
    398 398
       get enabled() {
    
    399
    +    if (AppConstants.BASE_BROWSER_VERSION) {
    
    400
    +      // Do not allow ExperimentsAPI (which covers either "labs", "studies" or
    
    401
    +      // "rollouts") in Base Browser.
    
    402
    +      return false;
    
    403
    +    }
    
    399 404
         return this.studiesEnabled || this.labsEnabled;
    
    400 405
       }
    
    401 406
     
    
    402 407
       get labsEnabled() {
    
    408
    +    if (AppConstants.BASE_BROWSER_VERSION) {
    
    409
    +      // Do not allow "Firefox Labs" in Base Browser.
    
    410
    +      return false;
    
    411
    +    }
    
    403 412
         return Services.policies.isAllowed("FirefoxLabs");
    
    404 413
       }
    
    405 414