Bug 996426 - Rename emulator command in marionette tests from 'nfc ntf' to 'nfc nci'. r=tzimmermann,vicamo

This change also disables nfc marionette testcases  that talk to the emulator.

dom/nfc/tests/marionette/manifest.ini

@@ -6,4 +6,6 @@ qemu=true
 [test_ndef.js]
 [test_nfc_enabled.js]
 [test_nfc_manager_tech_discovered.js]
+disabled = Bug 996426
 [test_nfc_peer.js]
+disabled = Bug 996426

dom/nfc/tests/marionette/test_nfc_manager_tech_discovered.js

@@ -18,7 +18,7 @@ function handleTechnologyDiscoveredRE0(msg) {
 
 function activateRE(re) {
   let deferred = Promise.defer();
-  let cmd = 'nfc ntf rf_intf_activated ' + re;
+  let cmd = 'nfc nci rf_intf_activated_ntf ' + re;
 
   emulator.run(cmd, function(result) {
     is(result.pop(), 'OK', 'check activation of RE' + re);
@@ -30,7 +30,7 @@ function activateRE(re) {
 
 function notifyDiscoverRE(re, type) {
   let deferred = Promise.defer();
-  let cmd = 'nfc ntf rf_discover ' + re + ' ' + type;
+  let cmd = 'nfc nci rf_discover_ntf ' + re + ' ' + type;
 
   emulator.run(cmd, function(result) {
     is(result.pop(), 'OK', 'check discover of RE' + re);

dom/nfc/tests/marionette/test_nfc_peer.js

@@ -61,7 +61,7 @@ function handleTechnologyDiscoveredRE0ForP2PRegFailure(msg) {
 
 function activateRE(re) {
   let deferred = Promise.defer();
-  let cmd = "nfc ntf rf_intf_activated " + re;
+  let cmd = "nfc nci rf_intf_activated_ntf " + re;
 
   emulator.run(cmd, function(result) {
     is(result.pop(), "OK", "check activation of RE" + re);