Bug 1308938: skip check for about: pages. r=baku
authorYoshi Huang <allstars.chh@mozilla.com>
Fri, 14 Oct 2016 13:09:37 +0800
changeset 318574 59548efdaa500e0bc1a775e778c03414dde48a6d
parent 318573 6a9aa6f3d7658ec53750a7f5ec4cfea8f117f4ec
child 318575 40a7a506f5bb8774958f692c8a218c9f6a7e6a72
push id20725
push userphilringnalda@gmail.com
push dateThu, 20 Oct 2016 01:36:01 +0000
treeherderfx-team@998ad5a74da8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbaku
bugs1308938
milestone52.0a1
Bug 1308938: skip check for about: pages. r=baku
browser/components/contextualidentity/test/browser/browser.ini
netwerk/base/nsNetUtil.cpp
--- a/browser/components/contextualidentity/test/browser/browser.ini
+++ b/browser/components/contextualidentity/test/browser/browser.ini
@@ -4,17 +4,16 @@ support-files =
   empty_file.html
   file_reflect_cookie_into_title.html
   favicon-normal32.png
   file_set_storages.html
   serviceworker.html
   worker.js
 
 [browser_aboutURLs.js]
-skip-if = debug && os == "linux" # Assertion. See bug 1271182.
 [browser_eme.js]
 [browser_favicon.js]
 [browser_forgetaboutsite.js]
 [browser_forgetAPI_cookie_getCookiesWithOriginAttributes.js]
 [browser_forgetAPI_EME_forgetThisSite.js]
 [browser_forgetAPI_quota_clearStoragesForPrincipal.js]
 [browser_usercontext.js]
 [browser_usercontextid_tabdrop.js]
--- a/netwerk/base/nsNetUtil.cpp
+++ b/netwerk/base/nsNetUtil.cpp
@@ -2370,19 +2370,18 @@ NS_CompareLoadInfoAndLoadContext(nsIChan
   // https:// and blob URLs.
   // about:sync-tabs will fetch icons through moz-icon://.
   bool isAboutPage = false;
   nsINode* node = loadInfo->LoadingNode();
   if (node) {
     nsIDocument* doc = node->OwnerDoc();
     if (doc) {
       nsIURI* uri = doc->GetDocumentURI();
-      nsCString spec = uri->GetSpecOrDefault();
-      isAboutPage = spec.EqualsLiteral("about:newtab") ||
-                    spec.EqualsLiteral("about:sync-tabs");
+      nsresult rv = uri->SchemeIs("about", &isAboutPage);
+      NS_ENSURE_SUCCESS(rv, rv);
     }
   }
 
   if (isAboutPage) {
     return NS_OK;
   }
 
   // We skip the favicon loading here. The favicon loading might be