changes for nsUpdateService.js - Bug 1149334 - Remove preprocessing of nsUpdateService.js and use AppConstants.jsm. r=spohl

toolkit/mozapps/update/moz.build

@@ -38,14 +38,11 @@ if CONFIG['MOZ_UPDATER']:
     ]
 
     EXTRA_COMPONENTS += [
+        'nsUpdateService.js',
         'nsUpdateService.manifest',
         'nsUpdateServiceStub.js',
     ]
 
-    EXTRA_PP_COMPONENTS += [
-        'nsUpdateService.js',
-    ]
-
     EXTRA_JS_MODULES += [
         'UpdateTelemetry.jsm',
     ]

toolkit/mozapps/update/tests/data/xpcshellConstantsPP.js

@@ -30,11 +30,6 @@ const IS_WIN = false;
 
 #ifdef XP_MACOSX
 const IS_MACOSX = true;
-#ifdef MOZ_SHARK
-const IS_SHARK = true;
-#else
-const IS_SHARK = false;
-#endif
 #else
 const IS_MACOSX = false;
 #endif

toolkit/mozapps/update/tests/unit_aus_update/canCheckForAndCanApplyUpdates.js

@@ -23,7 +23,7 @@ function run_test() {
     let handle = createMutex(getPerInstallationMutexName());
 
     debugDump("testing that the mutex was successfully created");
-    do_check_neq(handle, null);
+    do_check_true(!!handle);
 
     // Check if available updates cannot be checked for when there is a mutex
     // for this installation.

toolkit/mozapps/update/tests/unit_aus_update/urlConstruction.js

@@ -111,11 +111,6 @@ function check_test_pt4() {
     if (macutils.isUniversalBinary) {
       abi += "-u-" + macutils.architecturesInBinary;
     }
-    if (IS_SHARK) {
-      // Disambiguate optimised and shark nightlies
-      abi += "-shark"
-    }
-
   }
 
   do_check_eq(getResult(gRequestURL), gAppInfo.OS + "_" + abi);