Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(752)

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

Issue 2776243007: Enable WebVR presentation from Chrome Custom Tab (Closed)
Patch Set: rebase + address nit Created 3 years, 8 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
Index: chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellTest.java
index 9f881de22473daca8790475d1174e6674f9be6a1..c95b75f6ffed76f6e0aaf72d8320344f7e634660 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellTest.java
@@ -65,13 +65,13 @@ public class VrShellTest extends ChromeTabbedActivityTestBase {
VrUtils.forceEnterVr();
if (supported) {
VrUtils.waitForVrSupported(POLL_TIMEOUT_LONG_MS);
- assertTrue(VrShellDelegate.isInVR());
+ assertTrue(VrShellDelegate.isInVr());
} else {
assertFalse(mockApi.getLaunchInVrCalled());
- assertFalse(VrShellDelegate.isInVR());
+ assertFalse(VrShellDelegate.isInVr());
}
VrUtils.forceExitVr(mDelegate);
- assertFalse(VrShellDelegate.isInVR());
+ assertFalse(VrShellDelegate.isInVr());
}
private void enterExitVrModeImage(boolean supported) throws IOException {
@@ -117,9 +117,9 @@ public class VrShellTest extends ChromeTabbedActivityTestBase {
VrUtils.simNfc(getActivity());
if (supported) {
VrUtils.waitForVrSupported(POLL_TIMEOUT_LONG_MS);
- assertTrue(VrShellDelegate.isInVR());
+ assertTrue(VrShellDelegate.isInVr());
} else {
- assertFalse(VrShellDelegate.isInVR());
+ assertFalse(VrShellDelegate.isInVr());
}
VrUtils.forceExitVr(mDelegate);
// TODO(bsheedy): Figure out why NFC tests cause the next test to fail
@@ -210,7 +210,7 @@ public class VrShellTest extends ChromeTabbedActivityTestBase {
public void run() {
CompositorViewHolder compositorViewHolder = (CompositorViewHolder)
getActivity().findViewById(R.id.compositor_view_holder);
- selector.set(compositorViewHolder.detachForVR());
+ selector.set(compositorViewHolder.detachForVr());
oldWidth.set(cvc.getViewportWidthPix());
ViewGroup.LayoutParams layoutParams = compositorViewHolder.getLayoutParams();
@@ -236,7 +236,7 @@ public class VrShellTest extends ChromeTabbedActivityTestBase {
public void run() {
CompositorViewHolder compositorViewHolder = (CompositorViewHolder) getActivity()
.findViewById(R.id.compositor_view_holder);
- compositorViewHolder.onExitVR(selector.get());
+ compositorViewHolder.onExitVr(selector.get());
}
});

Powered by Google App Engine
This is Rietveld 408576698