chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTest.java - Issue 2899013002: This CL reverts the CL that reverted infobar prompts due to the compile failure

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTest.java

Issue 2899013002: This CL reverts the CL that reverted infobar prompts due to the compile failure (Closed)

Patch Set: Created 3 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrUtils.java ('k') | components/infobars/core/infobar_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTest.java

index 42518f4e9e64f1d1dbf7034ef973fb5fb92a625e..b32352fc0be954908dbe963096dd02759f4b4d05 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTest.java

@@ -199,7 +199,7 @@ public class WebVrTest {

if (checkerReturnValue == VrCoreVersionChecker.VR_READY) {

Assert.assertTrue(displayFound, mVrTestRule.vrDisplayFound(mFirstTabWebContents));

Assert.assertFalse(barPresent,

- VrUtils.isUpdateInstallInfoBarPresent(

+ VrUtils.isInfoBarPresent(

mActivityTestRule.getActivity().getWindow().getDecorView()));

} else if (checkerReturnValue == VrCoreVersionChecker.VR_OUT_OF_DATE

|| checkerReturnValue == VrCoreVersionChecker.VR_NOT_AVAILABLE) {

@@ -218,7 +218,7 @@ public class WebVrTest {

}

Assert.assertFalse(displayFound, mVrTestRule.vrDisplayFound(mFirstTabWebContents));

Assert.assertTrue(barPresent,

- VrUtils.isUpdateInstallInfoBarPresent(

+ VrUtils.isInfoBarPresent(

mActivityTestRule.getActivity().getWindow().getDecorView()));

TextView tempView = (TextView) mActivityTestRule.getActivity()

.getWindow()

@@ -233,7 +233,7 @@ public class WebVrTest {

} else if (checkerReturnValue == VrCoreVersionChecker.VR_NOT_SUPPORTED) {

Assert.assertFalse(displayFound, mVrTestRule.vrDisplayFound(mFirstTabWebContents));

Assert.assertFalse(barPresent,

- VrUtils.isUpdateInstallInfoBarPresent(

+ VrUtils.isInfoBarPresent(

mActivityTestRule.getActivity().getWindow().getDecorView()));

} else {

Assert.fail(