Fix the failing xr browser transition tests.

testNfcFiresVrdisplayactivate() - fixed by adding the automatic consent dialog handling code.
testPresentationPromiseRejectedIfDonCanceled_WebXr() - fixed by specifying
--shared-prefs-file=//chrome/android/shared_preference_files/test/vr_ddview_don_setupcomplete.json

For the second test, the shared-prefs must be updated on the swarm bots to avoid getting
into a regression.

Bug: 969024
Change-Id: Iaf88f9c202746eca32f7d8386c852eec43824757
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1645633
Commit-Queue: Suman Kancherla <sumankancherla@chromium.org>
Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#666586}

chrome/android/javatests/src/org/chromium/chrome/browser/vr/WebXrVrTestFramework.java

@@ -23,6 +23,14 @@ public class WebXrVrTestFramework extends WebXrTestFramework {
         }
     }
 
+    @Override
+    public void enterSessionWithUserGesture() {
+        super.enterSessionWithUserGesture();
+
+        PermissionUtils.waitForConsentPrompt(getRule().getActivity());
+        PermissionUtils.acceptConsentPrompt(getRule().getActivity());
+    }
+
     /**
      * VR-specific implementation of enterSessionWithUserGesture that includes a workaround for
      * receiving broadcasts late.

chrome/android/javatests/src/org/chromium/chrome/browser/vr/WebXrVrTransitionTest.java

@@ -38,7 +38,6 @@ import org.chromium.base.test.params.ParameterAnnotations.UseRunnerDelegate;
 import org.chromium.base.test.params.ParameterSet;
 import org.chromium.base.test.params.ParameterizedRunner;
 import org.chromium.base.test.util.CommandLineFlags;
-import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.MinAndroidSdkLevel;
 import org.chromium.base.test.util.Restriction;
 import org.chromium.base.test.util.UrlUtils;
@@ -207,7 +206,6 @@ public class WebXrVrTransitionTest {
     @LargeTest
     @Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM)
     @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
-    @DisabledTest(message = "https://crbug.com/969024")
     public void testNfcFiresVrdisplayactivate() throws InterruptedException {
         mWebVrTestFramework.loadUrlAndAwaitInitialization(
                 WebVrTestFramework.getFileUrlForHtmlTestFile("test_nfc_fires_vrdisplayactivate"),
@@ -288,7 +286,6 @@ public class WebXrVrTransitionTest {
     @MediumTest
     @Restriction({RESTRICTION_TYPE_DEVICE_DAYDREAM, RESTRICTION_TYPE_VR_SETTINGS_SERVICE})
     @VrSettingsFile(VrSettingsServiceUtils.FILE_DDVIEW_DONENABLED)
-    @DisabledTest(message = "https://crbug.com/969024")
     @CommandLineFlags
             .Remove({"enable-webvr"})
             @CommandLineFlags.Add({"enable-features=WebXR"})