Bug 621158 - fix typo in advanced.js, actually enable test in e10s, rs=bustage,me
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Mon, 21 Mar 2016 11:52:36 +0000
changeset 313352 7dfa1b5d26078ed68890fa24fb19c4ade88496aa
parent 313351 8279c04272ee46eac5fc60ba52065ed7aefc5b28
child 313353 297bb754e23135fefc9683024bd33b7503427ee8
push id9480
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 17:12:58 +0000
treeherdermozilla-aurora@0d6a91c76a9e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage, me
bugs621158
milestone48.0a1
Bug 621158 - fix typo in advanced.js, actually enable test in e10s, rs=bustage,me MozReview-Commit-ID: JCEoHxw5UPZ
browser/base/content/test/general/browser.ini
browser/components/preferences/in-content/advanced.js
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -345,17 +345,17 @@ skip-if = os == "linux" # Linux: Intermi
 [browser_locationBarExternalLoad.js]
 [browser_menuButtonFitts.js]
 skip-if = os != "win" # The Fitts Law menu button is only supported on Windows (bug 969376)
 [browser_middleMouse_noJSPaste.js]
 [browser_minimize.js]
 [browser_mixedcontent_securityflags.js]
 tags = mcb
 [browser_offlineQuotaNotification.js]
-skip-if = buildapp == 'mulet' || e10s # Bug 1093603 - test breaks with PopupNotifications.panel.firstElementChild is null
+skip-if = buildapp == 'mulet'
 [browser_gZipOfflineChild.js]
 skip-if = buildapp == 'mulet' # Bug 1066070 - I don't think either popup notifications nor addon install stuff works?
 support-files = test_offline_gzip.html gZipOfflineChild.cacheManifest gZipOfflineChild.cacheManifest^headers^ gZipOfflineChild.html gZipOfflineChild.html^headers^
 [browser_openPromptInBackgroundTab.js]
 support-files = openPromptOffTimeout.html
 [browser_overflowScroll.js]
 [browser_pageInfo.js]
 skip-if = buildapp == 'mulet'
--- a/browser/components/preferences/in-content/advanced.js
+++ b/browser/components/preferences/in-content/advanced.js
@@ -513,17 +513,17 @@ var gAdvancedPane = {
         return 0;
       }
     }
 
     let usage = 0;
     for (let group of groups) {
       let uri = Services.io.newURI(group, null, null);
       if (perm.matchesURI(uri, true)) {
-        let cache = cacheService.getActiveCache(groups);
+        let cache = cacheService.getActiveCache(group);
         usage += cache.usage;
       }
     }
 
     return usage;
   },
 
   /**