The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/d897e6fe3204fdf0dc674a194ca85435155b60b1

commit d897e6fe3204fdf0dc674a194ca85435155b60b1
Author: bsheedy <bsheedy@chromium.org>
Date: Sat Jun 24 00:16:43 2017

Retry VR NFC tests on failure

VR end-to-end tests that use NFC will occasionally fail due to VrCore
thinking that it's still in VR from the previous test. This appears
to be a VrCore issue, so retry the tests on failure until it's fixed
so the flakiness doesn't impact bots.

Bug: 736527
Change-Id: I90c0204cfdf0de75c58cefb92b32f179326383c2
Reviewed-on: https://chromium-review.googlesource.com/547215
Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#482086}
[modify] https://crrev.com/d897e6fe3204fdf0dc674a194ca85435155b60b1/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellTransitionTest.java
[modify] https://crrev.com/d897e6fe3204fdf0dc674a194ca85435155b60b1/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTransitionTest.java

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/2b1109ab0cd74dabb255f79029326f1ddbae6349

commit 2b1109ab0cd74dabb255f79029326f1ddbae6349
Author: bsheedy <bsheedy@chromium.org>
Date: Fri Feb 16 17:37:35 2018

Reduce VR NFC flakiness

Adds simNfcScanUntilVrEntered, which in most cases, replaces simNfcScan.
This is to deal with flakiness that stems from VrCore thinking that it's
still in VR from a previous test and nooping when it receives an NFC
scan in a following test.

Bug: 736527, 812306
Change-Id: If7b135b99df03c463f5b393bfbe6290e06d0ee4e
Reviewed-on: https://chromium-review.googlesource.com/923099
Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537342}
[modify] https://crrev.com/2b1109ab0cd74dabb255f79029326f1ddbae6349/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellTransitionTest.java
[modify] https://crrev.com/2b1109ab0cd74dabb255f79029326f1ddbae6349/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTransitionTest.java
[modify] https://crrev.com/2b1109ab0cd74dabb255f79029326f1ddbae6349/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/util/NfcSimUtils.java
[modify] https://crrev.com/2b1109ab0cd74dabb255f79029326f1ddbae6349/chrome/test/data/vr/e2e_test_files/html/test_nfc_fires_vrdisplayactivate.html

Removing Internals>VR component and remapping to Internals>XR