[WebNFC] Raise InvalidStateError in non top-level browsing context

This CL replaces NotAllowedError with InvalidStateError DOMException
when Web NFC interfaces are used in a non top-level browsing context.

Spec: https://github.com/w3c/web-nfc/pull/610
Bug: 520391
Change-Id: I1aba5440d34664f65b321f8425609cc7e74488f4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2560267
Commit-Queue: François Beaufort <beaufort.francois@gmail.com>
Reviewed-by: Reilly Grant <reillyg@chromium.org>
Reviewed-by: Rijubrata Bhaumik <rijubrata.bhaumik@intel.com>
Cr-Commit-Position: refs/heads/master@{#832288}

third_party/blink/renderer/modules/nfc/ndef_reader.cc

@@ -38,7 +38,10 @@ using mojom::blink::PermissionStatus;
 namespace {
 
 constexpr char kNotSupportedOrPermissionDenied[] =
-    "WebNFC feature is unavailable or permission denied.";
+    "Web NFC is unavailable or permission denied.";
+
+constexpr char kChildFrameErrorMessage[] =
+    "Web NFC can only be accessed in a top-level browsing context.";
 
 constexpr char kInvalidStateErrorMessage[] = "A scan() operation is ongoing.";
 }  // namespace
@@ -77,15 +80,11 @@ bool NDEFReader::HasPendingActivity() const {
 ScriptPromise NDEFReader::scan(ScriptState* script_state,
                                const NDEFScanOptions* options,
                                ExceptionState& exception_state) {
-  LocalFrame* frame = script_state->ContextIsValid()
-                          ? LocalDOMWindow::From(script_state)->GetFrame()
-                          : nullptr;
   // https://w3c.github.io/web-nfc/#security-policies
   // WebNFC API must be only accessible from top level browsing context.
-  if (!frame || !frame->IsMainFrame()) {
-    exception_state.ThrowDOMException(DOMExceptionCode::kNotAllowedError,
-                                      "NFC interfaces are only available "
-                                      "in a top-level browsing context");
+  if (!DomWindow() || !DomWindow()->GetFrame()->IsMainFrame()) {
+    exception_state.ThrowDOMException(DOMExceptionCode::kInvalidStateError,
+                                      kChildFrameErrorMessage);
     return ScriptPromise();
   }
 
@@ -122,7 +121,7 @@ ScriptPromise NDEFReader::scan(ScriptState* script_state,
 
   GetPermissionService()->RequestPermission(
       CreatePermissionDescriptor(PermissionName::NFC),
-      LocalFrame::HasTransientUserActivation(frame),
+      LocalFrame::HasTransientUserActivation(DomWindow()->GetFrame()),
       WTF::Bind(&NDEFReader::ReadOnRequestPermission, WrapPersistent(this),
                 WrapPersistent(options)));
   return scan_resolver_->Promise();
@@ -211,15 +210,11 @@ ScriptPromise NDEFReader::write(ScriptState* script_state,
                                 const NDEFMessageSource& write_message,
                                 const NDEFWriteOptions* options,
                                 ExceptionState& exception_state) {
-  LocalDOMWindow* window = script_state->ContextIsValid()
-                               ? LocalDOMWindow::From(script_state)
-                               : nullptr;
   // https://w3c.github.io/web-nfc/#security-policies
   // WebNFC API must be only accessible from top level browsing context.
-  if (!window || !window->GetFrame()->IsMainFrame()) {
-    exception_state.ThrowDOMException(DOMExceptionCode::kNotAllowedError,
-                                      "NFC interfaces are only available "
-                                      "in a top-level browsing context");
+  if (!DomWindow() || !DomWindow()->GetFrame()->IsMainFrame()) {
+    exception_state.ThrowDOMException(DOMExceptionCode::kInvalidStateError,
+                                      kChildFrameErrorMessage);
     return ScriptPromise();
   }
 
@@ -234,7 +229,7 @@ ScriptPromise NDEFReader::write(ScriptState* script_state,
   // Step 11.2: Run "create NDEF message", if this throws an exception,
   // reject p with that exception and abort these steps.
   NDEFMessage* ndef_message =
-      NDEFMessage::Create(window, write_message, exception_state);
+      NDEFMessage::Create(DomWindow(), write_message, exception_state);
   if (exception_state.HadException()) {
     return ScriptPromise();
   }
@@ -251,7 +246,7 @@ ScriptPromise NDEFReader::write(ScriptState* script_state,
 
   GetPermissionService()->RequestPermission(
       CreatePermissionDescriptor(PermissionName::NFC),
-      LocalFrame::HasTransientUserActivation(window->GetFrame()),
+      LocalFrame::HasTransientUserActivation(DomWindow()->GetFrame()),
       WTF::Bind(&NDEFReader::WriteOnRequestPermission, WrapPersistent(this),
                 WrapPersistent(resolver), WrapPersistent(options),
                 std::move(message)));
@@ -318,8 +313,8 @@ void NDEFReader::WriteAbort(ScriptPromiseResolver* resolver) {
 }
 
 NFCProxy* NDEFReader::GetNfcProxy() const {
-  DCHECK(GetExecutionContext());
-  return NFCProxy::From(*To<LocalDOMWindow>(GetExecutionContext()));
+  DCHECK(DomWindow());
+  return NFCProxy::From(*DomWindow());
 }
 
 void NDEFReader::Trace(Visitor* visitor) const {

third_party/blink/web_tests/external/wpt/web-nfc/NDEFReader_scan.https.html

@@ -72,7 +72,7 @@ nfc_test(async () => {
                             await ndef.scan();
                             parent.postMessage("Failure", "*");
                           } catch (error) {
-                            if (error.name == "NotAllowedError") {
+                            if (error.name == "InvalidStateError") {
                               parent.postMessage("Success", "*");
                             } else {
                               parent.postMessage("Failure", "*");

third_party/blink/web_tests/external/wpt/web-nfc/NDEFReader_write.https.html

@@ -236,7 +236,7 @@ nfc_test(async () => {
                             await ndef.write("Test");
                             parent.postMessage("Failure", "*");
                           } catch (error) {
-                            if (error.name == "NotAllowedError") {
+                            if (error.name == "InvalidStateError") {
                               parent.postMessage("Success", "*");
                             } else {
                               parent.postMessage("Failure", "*");