Bug 836547 - Remove apps sync engine. r=fabrice

services/sync/Makefile.in

@@ -45,7 +45,6 @@ sync_modules := \
 # copied as-is.
 sync_engine_modules := \
   addons.js \
-  apps.js \
   bookmarks.js \
   clients.js \
   forms.js \

services/sync/modules/engines/apps.js

@@ -1,136 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-this.EXPORTED_SYMBOLS = ['AppsEngine', 'AppRec'];
-
-const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
-
-Cu.import("resource://services-sync/util.js");
-Cu.import("resource://services-sync/record.js");
-Cu.import("resource://services-sync/engines.js");
-Cu.import("resource://services-sync/constants.js");
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Webapps.jsm");
-
-this.AppRec = function AppRec(collection, id) {
-  CryptoWrapper.call(this, collection, id);
-}
-
-AppRec.prototype = {
-  __proto__: CryptoWrapper.prototype,
-  _logName: "Sync.Record.App"
-}
-
-Utils.deferGetSet(AppRec, "cleartext", ["value"]);
-
-function AppStore(name, engine) {
-  Store.call(this, name, engine);
-}
-
-AppStore.prototype = {
-  __proto__: Store.prototype,
-
-  getAllIDs: function getAllIDs() {
-    let apps = DOMApplicationRegistry.getAllIDs();
-    return apps;
-  },
-
-  changeItemID: function changeItemID(oldID, newID) {
-    this._log.trace("AppsStore does not support changeItemID");
-  },
-
-  itemExists: function itemExists(guid) {
-    return DOMApplicationRegistry.itemExists(guid);
-  },
-
-  createRecord: function createRecord(guid, collection) {
-    let record = new AppRec(collection, guid);
-    let app = DOMApplicationRegistry.getAppById(guid);
-    
-    if (app) {
-      app.syncId = guid;
-      let callback = Async.makeSyncCallback();
-      DOMApplicationRegistry.getManifestFor(app.origin, function(aManifest) {
-        app.manifest = aManifest;
-        callback();
-      });
-      Async.waitForSyncCallback(callback);
-      record.value = app;
-    } else {
-      record.deleted = true;
-    }
-
-    return record;
-  },
-
-  applyIncomingBatch: function applyIncomingBatch(aRecords) {
-    let callback = Async.makeSyncCallback();
-    DOMApplicationRegistry.updateApps(aRecords, callback);
-    Async.waitForSyncCallback(callback);
-    return [];
-  },
-
-  wipe: function wipe(record) {
-    let callback = Async.makeSyncCallback();
-    DOMApplicationRegistry.wipe(callback);
-    Async.waitForSyncCallback(callback);
-  }
-}
-
-
-function AppTracker(name, engine) {
-  Tracker.call(this, name, engine);
-  Svc.Obs.add("weave:engine:start-tracking", this);
-  Svc.Obs.add("weave:engine:stop-tracking", this);
-}
-
-AppTracker.prototype = {
-  __proto__: Tracker.prototype,
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
-  
-  _enabled: false,
-
-  observe: function(aSubject, aTopic, aData) {
-    switch (aTopic) {
-      case "webapps-sync-install":
-      case "webapps-sync-uninstall":
-        // ask for immediate sync. not sure if we really need this or
-        // if a lower score increment would be enough
-        let app;
-        this.score += SCORE_INCREMENT_XLARGE;
-        try {
-          app = JSON.parse(aData);
-        } catch (e) {
-          this._log.error("JSON.parse failed in observer " + e);
-          return;
-        }
-        this.addChangedID(app.id);
-        break;
-      case "weave:engine:start-tracking":
-        this._enabled = true;
-        Svc.Obs.add("webapps-sync-install", this);
-        Svc.Obs.add("webapps-sync-uninstall", this);
-        break;
-      case "weave:engine:stop-tracking":
-        this._enabled = false;
-        Svc.Obs.remove("webapps-sync-install", this);
-        Svc.Obs.remove("webapps-sync-uninstall", this);
-        break;
-    }
-  }
-}
-
-this.AppsEngine = function AppsEngine(service) {
-  SyncEngine.call(this, "Apps", service);
-}
-
-AppsEngine.prototype = {
-  __proto__: SyncEngine.prototype,
-  _storeObj: AppStore,
-  _trackerObj: AppTracker,
-  _recordObj: AppRec,
-  applyIncomingBatchSize: APPS_STORE_BATCH_SIZE
-}

services/sync/modules/service.js

@@ -38,7 +38,6 @@ Cu.import("resource://services-sync/util.js");
 
 const ENGINE_MODULES = {
   Addons: "addons.js",
-  Apps: "apps.js",
   Bookmarks: "bookmarks.js",
   Form: "forms.js",
   History: "history.js",

services/sync/services-sync.js

@@ -27,7 +27,6 @@ pref("services.sync.engine.history", true);
 pref("services.sync.engine.passwords", true);
 pref("services.sync.engine.prefs", true);
 pref("services.sync.engine.tabs", true);
-pref("services.sync.engine.apps", false);
 pref("services.sync.engine.tabs.filteredUrls", "^(about:.*|chrome://weave/.*|wyciwyg:.*|file:.*)$");
 
 pref("services.sync.jpake.serverURL", "https://setup.services.mozilla.com/");