Pass user gesture bit when chrome handles an intent fired by itself

chrome/android/java/src/org/chromium/chrome/browser/externalnav/IntentWithGesturesHandler.java

Index: chrome/android/java/src/org/chromium/chrome/browser/externalnav/IntentWithGesturesHandler.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/IntentWithGesturesHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/IntentWithGesturesHandler.java
new file mode 100644
index 0000000000000000000000000000000000000000..aff04ad81f4e35388146b2e004d1e0e635c312ca
--- /dev/null
+++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/IntentWithGesturesHandler.java
@@ -0,0 +1,85 @@
+// Copyright 2015 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.externalnav;
+
+import android.content.Intent;
+import android.net.Uri;
+
+import java.security.SecureRandom;
+import java.util.Arrays;
+
+/**
+ * This class hold a token for the most recent launched external intent that has
+ * user gesture. If the external intent resolves to chrome itself, the user
+ * gesture will be applied to the new url request. Since there could be at most
+ * one intent chooser at a time, this class only stores the most recent intent
+ * that has user gesture. A previously launched inten with user gesture will be

[Maria, 2015/08/05 01:41:44]

inten->intent and remove "be"

[qinmin, 2015/08/05 20:22:26]

Done.

+ * have its token invalidated if a new one comes.
+ */
+public class IntentWithGesturesHandler {
+    /**
+     * Extra to record whether the intent is launched by user gesture.
+     */
+    public static final String EXTRA_USER_GESTURE_TOKEN =
+            "org.chromium.chrome.browser.user_gesture_token";
+
+    private static final Object INSTANCE_LOCK = new Object();
+    private static IntentWithGesturesHandler sIntentWithGesturesHandler;
+    private SecureRandom mSecureRandom;
+    private byte[] mIntentToken;
+    private Uri mUri;
+
+    /**
+     * Get the singleton instance of this object.
+     */
+    public static IntentWithGesturesHandler getInstance() {
+        synchronized (INSTANCE_LOCK) {
+            if (sIntentWithGesturesHandler == null) {
+                sIntentWithGesturesHandler = new IntentWithGesturesHandler();
+            }
+        }
+        return sIntentWithGesturesHandler;
+    }
+
+    private IntentWithGesturesHandler() {
+        mSecureRandom = new SecureRandom();
+    }
+
+    /**
+     * Generate a new token for the intent that has user gesture. This will
+     * invalidate the token on the previously launched intent with user gesture.
+     *
+     * @param intent Intent with user gesture.
+     */
+    public void onNewIntentWithGesture(Intent intent) {
+        mIntentToken = new byte[32];
+        mSecureRandom.nextBytes(mIntentToken);
+        intent.putExtra(EXTRA_USER_GESTURE_TOKEN, mIntentToken);
+        mUri = intent.getData();

[Maria, 2015/08/05 01:41:44]

I would use IntentHandler.getUrlFromIntent() here and in the check below for
consistency with our other code.

[qinmin, 2015/08/05 20:22:26]

Done.

+    }
+
+    /**
+     * Get the user gesture from the intent and clear the stored token.
+     *
+     * @param intent Intent that is used to launch chrome.
+     * @return true if the intent has user gesture, or false otherwise.
+     */
+    public boolean getUserGestureAndClear(Intent intent) {
+        if (mIntentToken == null || mUri == null) return false;
+        byte[] bytes = intent.getByteArrayExtra(EXTRA_USER_GESTURE_TOKEN);

[Maria, 2015/08/05 01:41:44]

Add an accessor to IntentUtils.safeGet... collection. This protects Chrome from
external applications sending us bad intents

[qinmin, 2015/08/05 20:22:26]

Done.

+        boolean ret = (bytes != null) && Arrays.equals(bytes, mIntentToken)
+                && mUri.equals(intent.getData());
+        clear();
+        return ret;
+    }
+
+    /**
+     * Clear the gesture token.
+     */
+    public void clear() {
+        mIntentToken = null;
+        mUri = null;
+    }
+}