Bug 1055477 - Part 1. Add CheckPermission. r=smaug

From 3c5b491a6dfeca7cd7e93b596f368f67b40d9632 Mon Sep 17 00:00:00 2001
---
 dom/base/Navigator.cpp   | 3 +--
 dom/webidl/MozNFC.webidl | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

dom/base/Navigator.cpp

@@ -2311,12 +2311,7 @@ Navigator::HasNFCSupport(JSContext* /* unused */, JSObject* aGlobal)
 
   // Do not support NFC if NFC content helper does not exist.
   nsCOMPtr<nsISupports> contentHelper = do_GetService("@mozilla.org/nfc/content-helper;1");
-  if (!contentHelper) {
-    return false;
-  }
-
-  return win && (CheckPermission(win, "nfc-read") ||
-                 CheckPermission(win, "nfc-write"));
+  return !!contentHelper;
 }
 #endif // MOZ_NFC
 

dom/webidl/MozNFC.webidl

@@ -44,7 +44,8 @@ interface MozNFCManager {
 
 [JSImplementation="@mozilla.org/navigatorNfc;1",
  NavigatorProperty="mozNfc",
- Func="Navigator::HasNFCSupport"]
+ Func="Navigator::HasNFCSupport",
+ CheckPermissions="nfc-read nfc-write"]
 interface MozNFC : EventTarget {
    /**
     * Returns MozNFCTag object or null in case of invalid sessionToken