Bug 1543219 follow-up: Address review comment
authorEhsan Akhgari <ehsan@mozilla.com>
Thu, 02 May 2019 13:02:21 -0400
changeset 531194 99ff61d804b285159cb2473987c114b12bcb0e96
parent 531118 e10505182ad2c7f5955999964a08fb9c2c71a038
child 531195 f630333b81b8c255d8831dc150929a8c6c1eb6ff
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1543219
milestone68.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
Bug 1543219 follow-up: Address review comment
netwerk/cookie/CookieSettings.cpp
--- a/netwerk/cookie/CookieSettings.cpp
+++ b/netwerk/cookie/CookieSettings.cpp
@@ -145,18 +145,16 @@ CookieSettings::CookiePermission(nsIPrin
   rv = NS_URIChainHasFlags(uri, nsIProtocolHandler::URI_FORBIDS_COOKIE_ACCESS,
                            &hasFlags);
   if (NS_FAILED(rv) || hasFlags) {
     *aCookiePermission = nsPermissionManager::DENY_ACTION;
     rv = NS_OK;  // Reset, so it's not caught as a bad status after the `else`.
   } else         // Note the tricky `else` which controls the call below.
 #endif
 
-    // Note that when compiled for Thunderbird/SeaMonkey, the following
-    // statement is controlled by the `else` in the `#ifdef` block above.
     rv = pm->TestPermissionFromPrincipal(
         aPrincipal, NS_LITERAL_CSTRING("cookie"), aCookiePermission);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
 
   // Let's store the permission, also if the result is UNKNOWN in order to avoid
   // race conditions.