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

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

Issue 2727873002: Implement lazy initialization for VrShellDelegate (Closed)
Patch Set: Add comments + Fix test file Created 3 years, 10 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 331ef5da2bce0b7d92994a4988f3cd1b98b67a1d..e79aa85581912fd5b151df6b197f7933a33bc58c 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
@@ -46,7 +46,7 @@ public class VrShellTest extends ChromeTabbedActivityTestBase {
@Override
protected void setUp() throws Exception {
super.setUp();
- mDelegate = getActivity().getVrShellDelegate();
+ mDelegate = VrShellDelegate.getInstanceForTesting();
}
@Override
@@ -64,13 +64,13 @@ public class VrShellTest extends ChromeTabbedActivityTestBase {
VrUtils.forceEnterVr(mDelegate);
if (supported) {
VrUtils.waitForVrSupported(mDelegate);
- assertTrue(mDelegate.isInVR());
+ assertTrue(VrShellDelegate.isInVR());
} else {
assertFalse(mockApi.getLaunchInVrCalled());
- assertFalse(mDelegate.isInVR());
+ assertFalse(VrShellDelegate.isInVR());
}
VrUtils.forceExitVr(mDelegate);
- assertFalse(mDelegate.isInVR());
+ assertFalse(VrShellDelegate.isInVR());
}
private void enterExitVrModeImage(boolean supported) throws IOException {
@@ -116,9 +116,9 @@ public class VrShellTest extends ChromeTabbedActivityTestBase {
VrUtils.simNfc(getActivity());
if (supported) {
VrUtils.waitForVrSupported(mDelegate);
- assertTrue(mDelegate.isInVR());
+ assertTrue(VrShellDelegate.isInVR());
} else {
- assertFalse(mDelegate.isInVR());
+ assertFalse(VrShellDelegate.isInVR());
}
VrUtils.forceExitVr(mDelegate);
// TODO(bsheedy): Figure out why NFC tests cause the next test to fail

Powered by Google App Engine
This is Rietveld 408576698