Revert 2841523002

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

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 4c5a0616f5c1b2985990655be58c4da764986ce3..7452083b6072ff1f2f3383cf4940ed67b3d0cdd4 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
@@ -47,16 +47,7 @@ public class VrShellTest extends ChromeTabbedActivityTestBase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        // We need to run the constructor on the main/UI thread, otherwise the Choreographer
-        // acquired in the constructor is incorrect during e2e tests
-        final AtomicReference<VrShellDelegate> delegate = new AtomicReference<VrShellDelegate>();
-        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
-            @Override
-            public void run() {
-                delegate.set(VrShellDelegate.getInstanceForTesting());
-            }
-        });
-        mDelegate = delegate.get();
+        mDelegate = VrUtils.getVrShellDelegateInstance();
     }
 
     @Override