Clean up various engines to remove Async.sugar and random self/yields.

services/sync/modules/engines/bookmarks.js

@@ -58,7 +58,6 @@ const SERVICE_NOT_SUPPORTED = "Service not supported on this platform";
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://weave/log4moz.js");
 Cu.import("resource://weave/util.js");
-Cu.import("resource://weave/async.js");
 Cu.import("resource://weave/engines.js");
 Cu.import("resource://weave/stores.js");
 Cu.import("resource://weave/trackers.js");
@@ -67,8 +66,6 @@ Cu.import("resource://weave/notifications.js");
 Cu.import("resource://weave/resource.js");
 Cu.import("resource://weave/type_records/bookmark.js");
 
-Function.prototype.async = Async.sugar;
-
 function BookmarksEngine() {
   this._init();
 }

services/sync/modules/engines/clients.js

@@ -48,11 +48,8 @@ Cu.import("resource://weave/util.js");
 Cu.import("resource://weave/engines.js");
 Cu.import("resource://weave/stores.js");
 Cu.import("resource://weave/trackers.js");
-Cu.import("resource://weave/async.js");
 Cu.import("resource://weave/type_records/clientData.js");
 
-Function.prototype.async = Async.sugar;
-
 Utils.lazy(this, 'Clients', ClientEngine);
 
 function ClientEngine() {
@@ -149,7 +146,6 @@ ClientEngine.prototype = {
   },
 
   _resetClient: function ClientEngine__resetClient() {
-    let self = yield;
     this.resetLastSync();
     this._store.wipe();
   }

services/sync/modules/engines/cookies.js

@@ -41,13 +41,10 @@ const Ci = Components.interfaces;
 const Cu = Components.utils;
 
 Cu.import("resource://weave/log4moz.js");
-Cu.import("resource://weave/async.js");
 Cu.import("resource://weave/engines.js");
 Cu.import("resource://weave/stores.js");
 Cu.import("resource://weave/trackers.js");
 
-Function.prototype.async = Async.sugar;
-
 function CookieEngine(pbeId) {
   this._init(pbeId);
 }
@@ -264,7 +261,6 @@ CookieStore.prototype = {
   },
 
   _resetGUIDs: function CookieStore__resetGUIDs() {
-    let self = yield;
     /* called in the case where remote/local sync GUIDs do not
        match.  We do need to override this, but since we're deriving
        GUIDs from the cookie data itself and not generating them,

services/sync/modules/engines/forms.js

@@ -43,15 +43,12 @@ const Cu = Components.utils;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 Cu.import("resource://weave/log4moz.js");
-Cu.import("resource://weave/async.js");
 Cu.import("resource://weave/util.js");
 Cu.import("resource://weave/engines.js");
 Cu.import("resource://weave/stores.js");
 Cu.import("resource://weave/trackers.js");
 Cu.import("resource://weave/type_records/forms.js");
 
-Function.prototype.async = Async.sugar;
-
 function FormEngine() {
   this._init();
 }
@@ -65,16 +62,14 @@ FormEngine.prototype = {
   _recordObj: FormRec,
 
   _syncStartup: function FormEngine__syncStartup() {
-    let self = yield;
     this._store.cacheFormItems();
-    yield SyncEngine.prototype._syncStartup.async(this, self.cb);
+    SyncEngine.prototype._syncStartup();
   },
 
   /* Wipe cache when sync finishes */
   _syncFinish: function FormEngine__syncFinish() {
-    let self = yield;
     this._store.clearFormCache();
-    yield SyncEngine.prototype._syncFinish.async(this, self.cb);
+    SyncEngine.prototype._syncFinish();
   },
   
   _recordLike: function SyncEngine__recordLike(a, b) {

services/sync/modules/engines/history.js

@@ -47,12 +47,9 @@ Cu.import("resource://weave/util.js");
 Cu.import("resource://weave/engines.js");
 Cu.import("resource://weave/stores.js");
 Cu.import("resource://weave/trackers.js");
-Cu.import("resource://weave/async.js");
 Cu.import("resource://weave/base_records/collection.js");
 Cu.import("resource://weave/type_records/history.js");
 
-Function.prototype.async = Async.sugar;
-
 function HistoryEngine() {
   this._init();
 }
@@ -94,7 +91,6 @@ HistoryEngine.prototype = {
   },
 
   _syncFinish: function HistEngine__syncFinish(error) {
-    let self = yield;
     this._log.debug("Finishing up sync");
     this._tracker.resetScore();
 

services/sync/modules/engines/input.js

@@ -41,14 +41,11 @@ const Ci = Components.interfaces;
 const Cu = Components.utils;
 
 Cu.import("resource://weave/log4moz.js");
-Cu.import("resource://weave/async.js");
 Cu.import("resource://weave/util.js");
 Cu.import("resource://weave/engines.js");
 Cu.import("resource://weave/stores.js");
 Cu.import("resource://weave/trackers.js");
 
-Function.prototype.async = Async.sugar;
-
 function InputEngine(pbeId) {
   this._init(pbeId);
 }
@@ -207,7 +204,6 @@ InputStore.prototype = {
   },
 
   _resetGUIDs: function InputStore__resetGUIDs() {
-    let self = yield;
     // Not needed.
   }
 };

services/sync/modules/engines/passwords.js

@@ -46,12 +46,9 @@ Cu.import("resource://weave/util.js");
 Cu.import("resource://weave/engines.js");
 Cu.import("resource://weave/stores.js");
 Cu.import("resource://weave/trackers.js");
-Cu.import("resource://weave/async.js");
 Cu.import("resource://weave/ext/Observers.js");
 Cu.import("resource://weave/type_records/passwords.js");
 
-Function.prototype.async = Async.sugar;
-
 function PasswordEngine() {
   this._init();
 }

services/sync/modules/engines/prefs.js

@@ -46,15 +46,12 @@ const WEAVE_PREFS_GUID = "preferences";
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 Cu.import("resource://weave/log4moz.js");
-Cu.import("resource://weave/async.js");
 Cu.import("resource://weave/util.js");
 Cu.import("resource://weave/engines.js");
 Cu.import("resource://weave/stores.js");
 Cu.import("resource://weave/trackers.js");
 Cu.import("resource://weave/type_records/prefs.js");
 
-Function.prototype.async = Async.sugar;
-
 function PrefsEngine() {
   this._init();
 }

services/sync/modules/engines/tabs.js

@@ -45,7 +45,6 @@ const TAB_TIME_ATTR = "weave.tabEngine.lastUsed.timeStamp";
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://weave/util.js");
-Cu.import("resource://weave/async.js");
 Cu.import("resource://weave/engines.js");
 Cu.import("resource://weave/stores.js");
 Cu.import("resource://weave/trackers.js");
@@ -53,8 +52,6 @@ Cu.import("resource://weave/constants.js");
 Cu.import("resource://weave/type_records/tabs.js");
 Cu.import("resource://weave/engines/clientData.js");
 
-Function.prototype.async = Async.sugar;
-
 function TabEngine() {
   this._init();
 }
@@ -77,7 +74,6 @@ TabEngine.prototype = {
   },
 
   _resetClient: function TabEngine__resetClient() {
-    let self = yield;
     this.resetLastSync();
     this._store.wipe();
   },