diff --git a/addon-sdk/source/python-lib/cuddlefish/prefs.py b/addon-sdk/source/python-lib/cuddlefish/prefs.py index dd1c24e281f9..02614e7bde7f 100644 --- a/addon-sdk/source/python-lib/cuddlefish/prefs.py +++ b/addon-sdk/source/python-lib/cuddlefish/prefs.py @@ -37,9 +37,6 @@ DEFAULT_COMMON_PREFS = { # shut up some warnings on `about:` page 'app.releaseNotesURL': 'http://localhost/app-dummy/', 'app.vendorURL': 'http://localhost/app-dummy/', - - # Don't prompt about e10s - 'browser.displayedE10SPrompt.1': 5 } DEFAULT_NO_CONNECTIONS_PREFS = { diff --git a/addon-sdk/source/test/preferences/e10s-off.json b/addon-sdk/source/test/preferences/e10s-off.json index 0d91588a697f..269d7a92a887 100644 --- a/addon-sdk/source/test/preferences/e10s-off.json +++ b/addon-sdk/source/test/preferences/e10s-off.json @@ -1,5 +1,4 @@ { - "browser.displayedE10SPrompt.1": 5, "browser.tabs.remote.autostart": false, "browser.tabs.remote.autostart.1": false, "browser.tabs.remote.autostart.2": false diff --git a/browser/base/content/popup-notifications.inc b/browser/base/content/popup-notifications.inc index 1b4e85162ba2..45e3b317bfaf 100644 --- a/browser/base/content/popup-notifications.inc +++ b/browser/base/content/popup-notifications.inc @@ -76,12 +76,6 @@ -#ifdef E10S_TESTING_ONLY - -#endif -