Bug 1137870 - Fix mismatching argument counts in permissions.js etc and remove unused treeUtils.js from cookies.xul. r=smacleod

browser/components/preferences/cookies.xul

@@ -19,7 +19,6 @@
         persist="screenX screenY width height"
         onkeypress="gCookiesWindow.onWindowKeyPress(event);">
 
-  <script src="chrome://global/content/treeUtils.js"/>
   <script src="chrome://browser/content/preferences/cookies.js"/>
 
   <stringbundle id="bundlePreferences"

browser/components/preferences/permissions.js

@@ -150,7 +150,7 @@ var gPermissionManager = {
     // Re-do the sort, if the status changed from Block to Allow
     // or vice versa, since if we're sorted on status, we may no
     // longer be in order.
-    if (this._lastPermissionSortColumn.id == "statusCol") {
+    if (this._lastPermissionSortColumn == "statusCol") {
       this._resortPermissions();
     }
     this._tree.treeBoxObject.invalidate();
@@ -168,9 +168,10 @@ var gPermissionManager = {
   _resortPermissions: function()
   {
     gTreeUtils.sort(this._tree, this._view, this._permissions,
+                    this._lastPermissionSortColumn,
                     this._permissionsComparator,
                     this._lastPermissionSortColumn,
-                    this._lastPermissionSortAscending);
+                    !this._lastPermissionSortAscending); // keep sort direction
   },
 
   onHostInput: function (aSiteField)
@@ -377,7 +378,7 @@ var gPermissionManager = {
 
     // sort and display the table
     this._tree.view = this._view;
-    this.onPermissionSort("rawHost", false);
+    this.onPermissionSort("rawHost");
 
     // disable "remove all" button if there are none
     document.getElementById("removeAllPermissions").disabled = this._permissions.length == 0;