Merged

services/sync/tests/unit/head_first.js

@@ -3,6 +3,7 @@ version(180);
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cr = Components.results;
+const Cu = Components.utils;
 
 let ds = Cc["@mozilla.org/file/directory_service;1"]
   .getService(Ci.nsIProperties);

services/sync/tests/unit/test_async.js

@@ -1,5 +1,3 @@
-const Cu = Components.utils;
-
 Cu.import("resource://weave/util.js");
 Cu.import("resource://weave/async.js");
 

services/sync/tests/unit/test_async_exceptions.js

@@ -1,5 +1,3 @@
-const Cu = Components.utils;
-
 Cu.import("resource://weave/util.js");
 Cu.import("resource://weave/async.js");
 

services/sync/tests/unit/test_async_missing_yield.js

@@ -1,5 +1,3 @@
-const Cu = Components.utils;
-
 Cu.import("resource://weave/util.js");
 Cu.import("resource://weave/async.js");
 

services/sync/tests/unit/test_sharing.js

@@ -1,5 +1,3 @@
-const Cu = Components.utils;
-
 Cu.import("resource://weave/sharing.js");
 Cu.import("resource://weave/util.js");
 

services/sync/tests/unit/test_xmpp.js

@@ -1,5 +1,3 @@
-var Cu = Components.utils;
-
 Cu.import( "resource://weave/xmpp/xmppClient.js" );
 
 function LOG(aMsg) {