author | Robert Strong <robert.bugzilla@gmail.com> |
Wed, 18 Feb 2015 15:44:16 -0800 | |
changeset 229669 | d48bfd6bc6a102ccf216c54077b6237768060f52 |
parent 229668 | f74ab4efb948bb570861abab90c5fa80d8ae6352 |
child 229670 | b4fa9c896fef4996dda7c4f0ef4c12997ff87772 |
push id | 55787 |
push user | rstrong@mozilla.com |
push date | Wed, 18 Feb 2015 23:44:21 +0000 |
treeherder | mozilla-inbound@d48bfd6bc6a1 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 1134334 |
milestone | 38.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/toolkit/mozapps/update/tests/chrome/utils.js +++ b/toolkit/mozapps/update/tests/chrome/utils.js @@ -145,19 +145,16 @@ const REL_PATH_DATA = "chrome/toolkit/mo const URL_HTTP_UPDATE_XML = URL_HOST + URL_PATH_UPDATE_XML; const URL_HTTPS_UPDATE_XML = "https://example.com" + URL_PATH_UPDATE_XML; const URI_UPDATE_PROMPT_DIALOG = "chrome://mozapps/content/update/updates.xul"; const ADDON_ID_SUFFIX = "@appupdatetest.mozilla.org"; const ADDON_PREP_DIR = "appupdateprep"; - -const PREF_APP_UPDATE_LASTUPDATETIME = "app.update.lastUpdateTime.background-update-timer"; - // Preference for storing add-ons that are disabled by the tests to prevent them // from interefering with the tests. const PREF_DISABLEDADDONS = "app.update.test.disabledAddons"; const PREF_EM_HOTFIX_ID = "extensions.hotfix.id"; const PREF_EM_SILENT = "app.update.silent"; const TEST_ADDONS = [ "appdisabled_1", "appdisabled_2", "compatible_1", "compatible_2", "noupdate_1", "noupdate_2", @@ -875,21 +872,16 @@ function setupFiles() { * present so they can be set back to the original values when the test has * finished. */ function setupPrefs() { if (DEBUG_AUS_TEST) { Services.prefs.setBoolPref(PREF_APP_UPDATE_LOG, true); } - // Prevent nsIUpdateTimerManager from notifying nsIApplicationUpdateService - // to check for updates by setting the last update time to the maximum value - // allowed for an integer preference. - Services.prefs.setIntPref(PREF_APP_UPDATE_LASTUPDATETIME, 2147483647); - if (Services.prefs.prefHasUserValue(PREF_APP_UPDATE_URL_OVERRIDE)) { gAppUpdateURL = Services.prefs.getCharPref(PREF_APP_UPDATE_URL_OVERRIDE); } if (Services.prefs.prefHasUserValue(PREF_APP_UPDATE_ENABLED)) { gAppUpdateEnabled = Services.prefs.getBoolPref(PREF_APP_UPDATE_ENABLED); } Services.prefs.setBoolPref(PREF_APP_UPDATE_ENABLED, true);