Routine merge of double branches.

services/sync/modules/trackers.js

@@ -138,7 +138,9 @@ BookmarksTracker.prototype = {
   },
 
   _init: function BMT__init() {
-    super._init();
+    this._log = Log4Moz.Service.getLogger("Service." + this._logName);
+    this._score = 0;
+     
     Cc["@mozilla.org/browser/nav-bookmarks-service;1"].
     getService(Ci.nsINavBookmarksService).
     addObserver(this, false);
@@ -185,7 +187,9 @@ HistoryTracker.prototype = {
   },
 
   _init: function HT__init() {
-    super._init();
+    this._log = Log4Moz.Service.getLogger("Service." + this._logName);
+    this._score = 0;
+     
     Cc["@mozilla.org/browser/nav-history-service;1"].
     getService(Ci.nsINavHistoryService).
     addObserver(this, false);
@@ -234,7 +238,7 @@ FormsTracker.prototype = {
     var count = stmnt.getInt32(0);
     stmnt.reset();
 
-    this._score = abs(this._rowCount - count) * 2;
+    this._score = Math.abs(this._rowCount - count) * 2;
 
     if (this._score >= 100)
       return 100;
@@ -247,12 +251,12 @@ FormsTracker.prototype = {
     stmnt.executeStep();
     this._rowCount = stmnt.getInt32(0);
     stmnt.reset();
-
+    this._score = 0;
-    super.resetScore();
   },
 
   _init: function FormsTracker__init() {
-    super._init();
+    this._log = Log4Moz.Service.getLogger("Service." + this._logName);
+    this._score = 0;
 
     var stmnt = this._formDB.createStatement("SELECT COUNT(fieldname) FROM moz_formhistory");
     stmnt.executeStep();