Backout changeset aa20a6097d0b (bug 830983) for causing mochitest-other orange in test_app_cleardata_permissions.html.
authorL. David Baron <dbaron@dbaron.org>
Fri, 18 Jan 2013 11:00:19 +0000
changeset 119248 3702b7ead05e6ab153f9c63cf6ecc802ed15cf47
parent 119247 3657968244936545c96954dda2046219d99f6d30
child 119249 4b8c19604f1276d9618b55b11eb36239ceacb7f9
push id24195
push userMs2ger@gmail.com
push dateSat, 19 Jan 2013 16:10:11 +0000
treeherdermozilla-central@02e12a80aef9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs830983
milestone21.0a1
backs outaa20a6097d0b4e274fd1999bedd13e18f2a513fc
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
Backout changeset aa20a6097d0b (bug 830983) for causing mochitest-other orange in test_app_cleardata_permissions.html.
extensions/cookie/nsPermissionManager.cpp
--- a/extensions/cookie/nsPermissionManager.cpp
+++ b/extensions/cookie/nsPermissionManager.cpp
@@ -1226,19 +1226,16 @@ nsPermissionManager::RemovePermissionsFo
     nsAutoCString host;
     bool isInBrowserElement;
     nsAutoCString type;
 
     data.permissions[i]->GetHost(host);
     data.permissions[i]->GetIsInBrowserElement(&isInBrowserElement);
     data.permissions[i]->GetType(type);
 
-    if (aBrowserOnly && !isInBrowserElement)
-      continue;
-
     nsCOMPtr<nsIPrincipal> principal;
     if (NS_FAILED(GetPrincipal(host, aAppId, isInBrowserElement,
                                getter_AddRefs(principal)))) {
       NS_ERROR("GetPrincipal() failed!");
       continue;
     }
 
     AddInternal(principal,