[TTS] Update Tap counters to compensate for Quick Answers.

chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPolicy.java

 // 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.contextualsearch;
 
 import android.content.Context;
 import android.text.TextUtils;
 
 import org.chromium.base.VisibleForTesting;
@@ skipping 241 matching lines @@
         }
     }
 
     /**
      * Updates all the counters to account for an open-action on the panel.
      */
     void updateCountersForOpen() {
         // Always completely reset the tap counter, since it just counts taps
         // since the last open.
         mPreferenceManager.setContextualSearchTapCount(0);
+        mPreferenceManager.setContextualSearchTapQuickAnswerCount(0);
 
         // Disable the "promo tap" counter, but only if we're using the Opt-out onboarding.
         // For Opt-in, we never disable the promo tap counter.
         if (isPromoAvailable()) {
             getPromoTapCounter().disable();
 
             // Bump the total-promo-opens counter.
             int count = mPreferenceManager.getContextualSearchPromoOpenCount();
             mPreferenceManager.setContextualSearchPromoOpenCount(++count);
             ContextualSearchUma.logPromoOpenCount(count);
         }
     }
 
     /**
+     * Updates Tap counters to account for a quick-answer caption shown on the panel.
+     * @param wasActivatedByTap Whether the triggering gesture was a Tap or not.
+     * @param doesAnswer Whether the caption is considered an answer rather than just
+     *                          informative.
+     */
+    void updateCountersForQuickAnswer(boolean wasActivatedByTap, boolean doesAnswer) {
+        if (wasActivatedByTap && doesAnswer) {
+            int tapsWithAnswerSinceOpen =
+                    mPreferenceManager.getContextualSearchTapQuickAnswerCount();
+            mPreferenceManager.setContextualSearchTapQuickAnswerCount(++tapsWithAnswerSinceOpen);
+        }
+    }
+
+    /**
      * @return Whether a verbatim request should be made for the given base page, assuming there
      *         is no exiting request.
      */
     boolean shouldCreateVerbatimRequest() {
         SelectionType selectionType = mSelectionController.getSelectionType();
         return (mSelectionController.getSelectedText() != null
                 && (selectionType == SelectionType.LONG_PRESS
                 || (selectionType == SelectionType.TAP && !shouldPreviousTapResolve())));
     }
 
@@ skipping 234 matching lines @@
      * @return Whether the given content view is for an HTTP page.
      */
     private boolean isBasePageHTTP(@Nullable URL url) {
         return url != null && "http".equals(url.getProtocol());
     }
 
     /**
      * @return Whether the tap resolve/prefetch limit has been exceeded.
      */
     private boolean isTapBeyondTheLimit() {
-        return getTapCount() > getTapLimit();
+        return getTapCount() - mPreferenceManager.getContextualSearchTapQuickAnswerCount()

[twellington, 2016/06/27 18:46:40]

Do we need to do something like this in the other CL for tap suppression?

[Donn Denman, 2016/06/27 20:43:00]

Yes, thanks for reminding me.  We can land this and then compensate in that CL
too.

[pedro (no code reviews), 2016/06/27 21:11:10]

Put an explanation here to clarify why we are subtracting the quick answer taps.

+                > getTapLimit();
     }
 
     /**
      * @return The limit of the number of taps to resolve or prefetch.
      */
     private int getTapLimit() {
         return isUserUndecided() ? getTapLimitForUndecided() : getTapLimitForDecided();
     }
 
     private int getTapLimitForDecided() {
@@ skipping 18 matching lines @@
 
     /**
      * Sets the {@link ContextualSearchNetworkCommunicator} to use for server requests.
      * @param networkCommunicator The communicator for all future requests.
      */
     @VisibleForTesting
     public void setNetworkCommunicator(ContextualSearchNetworkCommunicator networkCommunicator) {
         mNetworkCommunicator = networkCommunicator;
     }
 }