Backed out changeset 6a8acb16142d (bug 1283010) for Windows failures in test_native_messaging.js

toolkit/components/extensions/NativeMessaging.jsm

@@ -84,12 +84,11 @@ this.HostManifestManager = {
   },
 
   _winLookup(application, context) {
-    let regPath = `${REGPATH}\\${application}`;
     let path = WindowsRegistry.readRegKey(Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-                                          regPath, "");
+                                          REGPATH, application);
     if (!path) {
       path = WindowsRegistry.readRegKey(Ci.nsIWindowsRegKey.ROOT_KEY_LOCAL_MACHINE,
-                                        regPath, "");
+                                        REGPATH, application);
     }
     if (!path) {
       return null;

toolkit/components/extensions/test/mochitest/test_chrome_ext_native_messaging.html

@@ -186,7 +186,7 @@ add_task(function* setup() {
         yield OS.File.writeAtomic(manifestPath, JSON.stringify(manifest));
 
         registry.setValue(Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-                          `${REGKEY}\\${script.name}`, "", manifestPath);
+                          REGKEY, script.name, manifestPath);
 
         // Create a version of the manifest with a relative path
         let relativeName = `relative.${script.name}`;
@@ -197,7 +197,7 @@ add_task(function* setup() {
         yield OS.File.writeAtomic(manifestPath, JSON.stringify(manifest));
 
         registry.setValue(Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-                          `${REGKEY}\\${relativeName}`, "", manifestPath);
+                          REGKEY, relativeName, manifestPath);
       }
       break;