Fix failing tests.

--HG--
branch : groups

4 files changed, 11 insertions, 14 deletions

diff --git a/common/content/buffer.js b/common/content/buffer.js
index 5388e226..88c94528 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -306,15 +306,10 @@ var Buffer = Module("buffer", {
             statusline.updateUrl(message);
         }),
         onProgressChange: util.wrapCallback(function onProgressChange(webProgress, request, curSelfProgress, maxSelfProgress, curTotalProgress, maxTotalProgress) {
-            try {
-                onProgressChange.superapply(this, arguments);
-                if (webProgress && webProgress.DOMWindow)
-                    webProgress.DOMWindow.dactylProgress = curTotalProgress / maxTotalProgress;
-                statusline.progress = curTotalProgress / maxTotalProgress;
-            }
-            catch (e) {
-                util.reportError(e);
-            }
+            onProgressChange.superapply(this, arguments);
+            if (webProgress && webProgress.DOMWindow)
+                webProgress.DOMWindow.dactylProgress = curTotalProgress / maxTotalProgress;
+            statusline.progress = curTotalProgress / maxTotalProgress;
         }),
         // happens when the users switches tabs
         onLocationChange: util.wrapCallback(function onLocationChange(webProgress, request, uri) {
diff --git a/common/content/contexts.js b/common/content/contexts.js
index 2b81fd02..61be2411 100644
--- a/common/content/contexts.js
+++ b/common/content/contexts.js
@@ -18,7 +18,7 @@ var Group = Class("Group", {
 
     get toStringParams() [this.name],
 
-    get builtin() dactyl.builtinGroups.indexOf(this) >= 0,
+    get builtin() contexts.builtinGroups.indexOf(this) >= 0,
 
     subGroups: {}
 
@@ -58,8 +58,10 @@ var Contexts = Module("contexts", {
         this.groupList = [];
         this.groupMap = {};
         this.subGroupProto = {};
-        this.builtinGroups = [this.addGroup("builtin", "Builtin items"),
-                              this.addGroup("user", "User-defined items", null, true)];
+
+        this.system = this.addGroup("builtin", "Builtin items");
+        this.user = this.addGroup("user", "User-defined items", null, true);
+        this.builtinGroups = [this.system, this.user];
     },
 
     context: null,
diff --git a/common/content/history.js b/common/content/history.js
index 980dccb1..b768a02c 100644
--- a/common/content/history.js
+++ b/common/content/history.js
@@ -250,7 +250,7 @@ var History = Module("history", {
             context.generate = function () [
                 Array.slice(row.rev_host).reverse().join("").slice(1)
                 for (row in iter(services.history.DBConnection
-                                         .createStatement("SELECT DISTINCT rev_host FROM moz_places;")))
+                                         .createStatement("SELECT DISTINCT rev_host FROM moz_places WHERE rev_host IS NOT NULL;")))
             ].slice(2);
         };
 
diff --git a/common/modules/sanitizer.jsm b/common/modules/sanitizer.jsm
index 5b6be968..4fe875f9 100644
--- a/common/modules/sanitizer.jsm
+++ b/common/modules/sanitizer.jsm
@@ -434,7 +434,7 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef
                 bang: true,
                 completer: function (context) {
                     context.title = ["Privacy Item", "Description"];
-                    context.completions = modules.options.get("sanitizeitems").completer();
+                    context.completions = modules.options.get("sanitizeitems").values;
                 },
                 domains: function (args) args["-host"] || [],
                 options: [