Fixed a couple of missing symbol exports that were stopping CookieEngine from being able to be instantiated.

services/sync/modules/engines.js

@@ -34,7 +34,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-const EXPORTED_SYMBOLS = ['Engine', 'BookmarksEngine', 'HistoryEngine'];
+const EXPORTED_SYMBOLS = ['Engine', 'BookmarksEngine', 'HistoryEngine', 'CookieEngine'];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
@@ -917,8 +917,8 @@ HistoryEngine.prototype = {
 HistoryEngine.prototype.__proto__ = new Engine();
 
 // Jono: the following is copy-and-paste code
-function CookieEngine(davCollection, cryptoId) {
-  this._init(davCollection, cryptoId);
+function CookieEngine(davCollection, pbeId) {
+  this._init(davCollection, pbeId);
 }
 CookieEngine.prototype = {
   get name() { return "cookie-engine"; },

services/sync/modules/service.js

@@ -127,6 +127,9 @@ WeaveSvc.prototype = {
 
   __cookieEngine: null,
   get _cookieEngine() {
+	// This gets an error that "CookieEngine" is undefined.  Why?
+        // BookmarksEngine and HistoryEngine are both defined in engines.js
+        // and so is CookieEngine, but...
     if (!this.__cookieEngine)
       this.__cookieEngine = new CookieEngine(DAV, this._cryptoId);
     return this.__cookieEngine;
@@ -503,7 +506,7 @@ WeaveSvc.prototype = {
                    this._syncEngine, this._histEngine).async(this, self.cb);
       yield;
     }
-    if (this._prefs.getBoolPref("cookies")) {
+    if (Utils.prefs.getBoolPref("cookies")) {
 	this._notify(this._cookieEngine.name + ":sync",
                     this._syncEngine, this._cookieEngine).async(this, self.cb);
       yield;

services/sync/modules/stores.js

@@ -35,7 +35,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 const EXPORTED_SYMBOLS = ['Store', 'SnapshotStore', 'BookmarksStore',
-			  'HistoryStore'];
+			  'HistoryStore', 'CookieStore'];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;

services/sync/modules/syncCores.js

@@ -34,7 +34,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-const EXPORTED_SYMBOLS = ['SyncCore', 'BookmarksSyncCore', 'HistorySyncCore'];
+const EXPORTED_SYMBOLS = ['SyncCore', 'BookmarksSyncCore', 'HistorySyncCore', 'CookiesSyncCore'];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;