Ensure touch handler state on Android is accurate after preload

content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

Index: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
index 5bd4ed79fe778231d725e699352fe3364bdfc25d..1929348c61fc64c30e3e92b774e3d0ec4bd69e8d 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
@@ -780,6 +780,19 @@ public class ContentViewCore
             viewAndroidNativePointer = mViewAndroid.getNativePointer();
         }
 
+        // Note ContentViewGestureHandler initialization must occur before nativeInit
+        // because nativeInit may callback into hasTouchEventHandlers.
+        mZoomManager = new ZoomManager(mContext, this);
+        mContentViewGestureHandler = new ContentViewGestureHandler(mContext, this, mZoomManager);
+        mZoomControlsDelegate = new ZoomControlsDelegate() {
+            @Override
+            public void invokeZoomPicker() {}
+            @Override
+            public void dismissZoomPicker() {}
+            @Override
+            public void updateZoomControls() {}
+        };
+
         mNativeContentViewCore = nativeInit(mHardwareAccelerated,
                 nativeWebContents, viewAndroidNativePointer, windowNativePointer);
         mWebContents = nativeGetWebContentsAndroid(mNativeContentViewCore);
@@ -835,17 +848,6 @@ public class ContentViewCore
         mContainerView.setWillNotDraw(false);
         mContainerView.setClickable(true);
 
-        mZoomManager = new ZoomManager(mContext, this);
-        mContentViewGestureHandler = new ContentViewGestureHandler(mContext, this, mZoomManager);
-        mZoomControlsDelegate = new ZoomControlsDelegate() {
-            @Override
-            public void invokeZoomPicker() {}
-            @Override
-            public void dismissZoomPicker() {}
-            @Override
-            public void updateZoomControls() {}
-        };
-
         mRenderCoordinates.reset();
         onRenderCoordinatesUpdated();