Bug 745065: Backing out removal of Apps sync engine
authorAnant Narayanan <anant@kix.in>
Thu, 26 Apr 2012 11:27:16 -0700
changeset 95733 c019b4bbe9ffc30ba0a1ee72a475fc0bce48d47d
parent 95732 6f83b97a524fec90baa51b6da113d4cb13fee3d5
child 95734 31faeb7325134829e50aaa4f725f04c59b9f725f
push id1439
push userlsblakk@mozilla.com
push dateMon, 04 Jun 2012 20:19:22 +0000
treeherdermozilla-aurora@ea74834dccd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs745065
milestone15.0a1
Bug 745065: Backing out removal of Apps sync engine
browser/installer/removed-files.in
services/sync/modules/constants.js
services/sync/modules/main.js
services/sync/services-sync.js
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -235,17 +235,16 @@ extensions/testpilot@labs.mozilla.com/sk
 extensions/testpilot@labs.mozilla.com/tests/test_data_store.js
 greprefs/all.js
 greprefs/security-prefs.js
 greprefs/xpinstall.js
 install.rdf
 modules/JSON.jsm
 modules/SpatialNavigation.js
 modules/utils.js
-modules/services-sync/engines/apps.js
 mozilla-runtime@BIN_SUFFIX@
 old-homepage-default.properties
 README.txt
 res/arrow.gif
 res/arrowd.gif
 res/broken-image.gif
 res/broken-image.png
 res/charsetData.properties
@@ -1040,17 +1039,16 @@ xpicleanup@BIN_SUFFIX@
   modules/services-common/stringbundle.js
   modules/services-common/utils.js
   modules/services-sync/auth.js
   modules/services-sync/base_records/collection.js
   modules/services-sync/base_records/crypto.js
   modules/services-sync/base_records/keys.js
   modules/services-sync/base_records/wbo.js
   modules/services-sync/constants.js
-  modules/services-sync/engines/apps.js
   modules/services-sync/engines/bookmarks.js
   modules/services-sync/engines/clients.js
   modules/services-sync/engines/forms.js
   modules/services-sync/engines/history.js
   modules/services-sync/engines.js
   modules/services-sync/engines/passwords.js
   modules/services-sync/engines/prefs.js
   modules/services-sync/engines/tabs.js
--- a/services/sync/modules/constants.js
+++ b/services/sync/modules/constants.js
@@ -104,16 +104,17 @@ DEFAULT_GUID_FETCH_BATCH_SIZE:         5
 DEFAULT_MOBILE_GUID_FETCH_BATCH_SIZE:  50,
 
 // Default batch size for applying incoming records.
 DEFAULT_STORE_BATCH_SIZE:              1,
 HISTORY_STORE_BATCH_SIZE:              50,      // same as MOBILE_BATCH_SIZE
 FORMS_STORE_BATCH_SIZE:                50,      // same as MOBILE_BATCH_SIZE
 PASSWORDS_STORE_BATCH_SIZE:            50,      // same as MOBILE_BATCH_SIZE
 ADDONS_STORE_BATCH_SIZE:               1000000, // process all addons at once
+APPS_STORE_BATCH_SIZE:                 50,      // same as MOBILE_BATCH_SIZE
 
 // score thresholds for early syncs
 SINGLE_USER_THRESHOLD:                 1000,
 MULTI_DEVICE_THRESHOLD:                300,
 
 // Other score increment constants
 SCORE_INCREMENT_SMALL:                 1,
 SCORE_INCREMENT_MEDIUM:                10,
--- a/services/sync/modules/main.js
+++ b/services/sync/modules/main.js
@@ -45,16 +45,17 @@ let lazies = {
   "engines/addons.js":    ["AddonsEngine"],
   "engines/bookmarks.js": ['BookmarksEngine', 'BookmarksSharingManager'],
   "engines/clients.js":   ["Clients"],
   "engines/forms.js":     ["FormEngine"],
   "engines/history.js":   ["HistoryEngine"],
   "engines/prefs.js":     ["PrefsEngine"],
   "engines/passwords.js": ["PasswordEngine"],
   "engines/tabs.js":      ["TabEngine"],
+  "engines/apps.js":      ["AppsEngine"],
   "identity.js":          ["Identity"],
   "jpakeclient.js":       ["JPAKEClient"],
   "keys.js":              ["BulkKeyBundle", "SyncKeyBundle"],
   "notifications.js":     ["Notifications", "Notification", "NotificationButton"],
   "policies.js":          ["SyncScheduler", "ErrorHandler",
                            "SendCredentialsController"],
   "resource.js":          ["Resource", "AsyncResource"],
   "service.js":           ["Service"],
--- a/services/sync/services-sync.js
+++ b/services/sync/services-sync.js
@@ -18,16 +18,17 @@ pref("services.sync.scheduler.idleTime",
 pref("services.sync.errorhandler.networkFailureReportTimeout", 604800); // 1 week
 
 pref("services.sync.engine.addons", true);
 pref("services.sync.engine.bookmarks", true);
 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/");
 pref("services.sync.jpake.pollInterval", 1000);
 pref("services.sync.jpake.firstMsgMaxTries", 300); // 5 minutes
 pref("services.sync.jpake.lastMsgMaxTries", 300);  // 5 minutes
 pref("services.sync.jpake.maxTries", 10);
 
@@ -57,9 +58,10 @@ pref("services.sync.log.logger.service.j
 pref("services.sync.log.logger.engine.bookmarks", "Debug");
 pref("services.sync.log.logger.engine.clients", "Debug");
 pref("services.sync.log.logger.engine.forms", "Debug");
 pref("services.sync.log.logger.engine.history", "Debug");
 pref("services.sync.log.logger.engine.passwords", "Debug");
 pref("services.sync.log.logger.engine.prefs", "Debug");
 pref("services.sync.log.logger.engine.tabs", "Debug");
 pref("services.sync.log.logger.engine.addons", "Debug");
+pref("services.sync.log.logger.engine.apps", "Debug");
 pref("services.sync.log.cryptoDebug", false);