Bug 946047 - Fix HasNfcSupport in MozNfc.webidl. r=khuey

CLOBBER

@@ -18,7 +18,4 @@
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
-Bug 934646 needs a clobber -- the icon resources previously copied
+Bug 946047 - Windows needs a clobber for webidl changes.
-into $OBJDIR/mobile/android/base/res will conflict with those in
-$BRANDING_DIRECTORY/res.
-

dom/tests/mochitest/general/test_interfaces.html

@@ -385,7 +385,6 @@ var interfaceNamesInGlobalScope =
     "MozMobileMessageThread",
     "MozNamedAttrMap",
     {name: "MozNdefRecord", b2g: true},
-    {name: "MozNfc", b2g: true},
     {name: "MozNFCPeer", b2g: true},
     {name: "MozNFCTag", b2g: true},
     {name: "MozOtaStatusEvent", b2g: true, pref: "dom.mobileconnection.enabled"},

dom/webidl/MozNfc.webidl

@@ -5,7 +5,8 @@
  /* Copyright © 2013 Deutsche Telekom, Inc. */
 
 [JSImplementation="@mozilla.org/navigatorNfc;1",
- NavigatorProperty="mozNfc"]
+ NavigatorProperty="mozNfc",
+ Func="Navigator::HasNfcSupport"]
 interface MozNfc : EventTarget {
    MozNFCTag getNFCTag(DOMString sessionId);
    MozNFCPeer getNFCPeer(DOMString sessionId);