Revert of Make VR screen tap tests more stable

chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.vr_shell;
 
 import android.annotation.SuppressLint;
 import android.graphics.Canvas;
 import android.graphics.Point;
 import android.os.StrictMode;
 import android.view.MotionEvent;
 import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.View;
 import android.view.ViewTreeObserver.OnPreDrawListener;
 import android.widget.FrameLayout;
 import android.widget.FrameLayout.LayoutParams;
 
 import com.google.vr.ndk.base.AndroidCompat;
 import com.google.vr.ndk.base.GvrLayout;
 
 import org.chromium.base.CommandLine;
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
-import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.ChromeVersionInfo;
 import org.chromium.chrome.browser.NativePage;
 import org.chromium.chrome.browser.UrlConstants;
 import org.chromium.chrome.browser.WebContentsFactory;
 import org.chromium.chrome.browser.omnibox.geo.GeolocationHeader;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
@@ skipping 75 matching lines @@
     private boolean mReprojectedRendering;
 
     private TabRedirectHandler mNonVrTabRedirectHandler;
     private TabModelSelector mTabModelSelector;
     private float mLastContentWidth;
     private float mLastContentHeight;
     private float mLastContentDpr;
 
     private MotionEventSynthesizer mMotionEventSynthesizer;
 
-    private OnDispatchTouchEventCallback mOnDispatchTouchEventForTesting;
-
     public VrShellImpl(
             ChromeActivity activity, VrShellDelegate delegate, TabModelSelector tabModelSelector) {
         super(activity);
         mActivity = activity;
         mDelegate = delegate;
         mTabModelSelector = tabModelSelector;
         mUiCVCContainer = new FrameLayout(getContext()) {
             @Override
             public boolean dispatchTouchEvent(MotionEvent event) {
                 return true;
@@ skipping 305 matching lines @@
         if (mSurface != null || mNativePage == null) return;
         mSurface = nativeTakeContentSurface(mNativeVrShell);
         mNativePage.getView().invalidate();
     }
 
     @Override
     public boolean dispatchTouchEvent(MotionEvent event) {
         // Normally, touch event is dispatched to presentation view only if the phone is paired with
         // a Cardboard viewer. This is annoying when we just want to quickly verify a Cardboard
         // behavior. This allows us to trigger cardboard trigger event without pair to a Cardboard.
-        boolean cardboardTriggered = false;
         if (CommandLine.getInstance().hasSwitch(ChromeSwitches.ENABLE_VR_SHELL_DEV)
                 && event.getActionMasked() == MotionEvent.ACTION_DOWN) {
             nativeOnTriggerEvent(mNativeVrShell);
-            cardboardTriggered = true;
         }
-        boolean parentConsumed = super.dispatchTouchEvent(event);
-        if (mOnDispatchTouchEventForTesting != null) {
-            mOnDispatchTouchEventForTesting.onDispatchTouchEvent(
-                    parentConsumed, cardboardTriggered);
-        }
-        return parentConsumed;
+        return super.dispatchTouchEvent(event);
     }
 
     @Override
     public void onResume() {
         super.onResume();
         if (mNativeVrShell != 0) {
             // Refreshing the viewer profile accesses disk, so we need to temporarily allow disk
             // reads. The GVR team promises this will be fixed when they launch.
             StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
             try {
@@ skipping 160 matching lines @@
     public WindowAndroid getWindowAndroid() {
         return mContentVrWindowAndroid;
     }
 
     @Override
     public void addWindowAndroidChangedObserver(WindowAndroidChangedObserver observer) {}
 
     @Override
     public void removeWindowAndroidChangedObserver(WindowAndroidChangedObserver observer) {}
 
-    /**
-     * Sets the runnable that will be run when VrShellImpl's dispatchTouchEvent
-     * is run and the parent consumed the event.
-     * @param runnable The Runnable that will be run
-     */
-    @VisibleForTesting
-    public void setOnDispatchTouchEventForTesting(OnDispatchTouchEventCallback callback) {
-        mOnDispatchTouchEventForTesting = callback;
-    }
-
     private native long nativeInit(WebContents uiWebContents, long nativeContentWindowAndroid,
             long nativeUiWindowAndroid, boolean forWebVR, VrShellDelegate delegate, long gvrApi,
             boolean reprojectedRendering);
     private native void nativeSetSurface(long nativeVrShell, Surface surface);
     private native void nativeSwapContents(
             long nativeVrShell, WebContents webContents, MotionEventSynthesizer eventSynthesizer);
     private native void nativeLoadUIContent(long nativeVrShell);
     private native void nativeDestroy(long nativeVrShell);
     private native void nativeOnTriggerEvent(long nativeVrShell);
     private native void nativeOnPause(long nativeVrShell);
     private native void nativeOnResume(long nativeVrShell);
     private native void nativeOnLoadProgressChanged(long nativeVrShell, double progress);
     private native void nativeContentPhysicalBoundsChanged(long nativeVrShell, int width,
             int height, float dpr);
     private native void nativeUIPhysicalBoundsChanged(long nativeVrShell, int width, int height,
             float dpr);
     private native void nativeSetWebVrMode(long nativeVrShell, boolean enabled);
     private native void nativeOnTabListCreated(long nativeVrShell, Tab[] mainTabs,
             Tab[] incognitoTabs);
     private native void nativeOnTabUpdated(long nativeVrShell, boolean incognito, int id,
             String title);
     private native void nativeOnTabRemoved(long nativeVrShell, boolean incognito, int id);
     private native Surface nativeTakeContentSurface(long nativeVrShell);
     private native void nativeRestoreContentSurface(long nativeVrShell);
     private native void nativeSetHistoryButtonsEnabled(
             long nativeVrShell, boolean canGoBack, boolean canGoForward);
 }