[Contextual Search] Exclude suppressed taps from aggregate suppression heuristics logging

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

Index: chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/TapSuppression.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/TapSuppression.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/TapSuppression.java
index 14cf222f5bd8c2ecff753478af91843fe8ccaec6..bbfe28b2367a59514012fe8b490bd894a3ff57e6 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/TapSuppression.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/TapSuppression.java
@@ -39,24 +39,20 @@ class TapSuppression extends ContextualSearchHeuristic {
         mIsSecondTap = previousTapState != null && previousTapState.wasSuppressed()
                 && !shouldHandleFirstTap();
 
-        boolean doSuppressTap = false;
-        if (mIsTapSuppressionEnabled) {
-            if (mIsSecondTap) {
-                boolean shouldHandle = shouldHandleSecondTap(previousTapState, x, y);
-                doSuppressTap = !shouldHandle;
-            } else {
-                doSuppressTap = !shouldHandleFirstTap();
-                if (doSuppressTap) {
-                    RecordUserAction.record("ContextualSearch.TapSuppressed.TapThresholdExceeded");
-                }
+        if (mIsSecondTap) {
+            boolean shouldHandle = shouldHandleSecondTap(previousTapState, x, y);
+            mIsConditionSatisfied = !shouldHandle;
+        } else {
+            mIsConditionSatisfied = !shouldHandleFirstTap();
+            if (mIsConditionSatisfied && mIsTapSuppressionEnabled) {
+                RecordUserAction.record("ContextualSearch.TapSuppressed.TapThresholdExceeded");
             }
         }
-        mIsConditionSatisfied = doSuppressTap;
     }
 
     @Override
     protected boolean isConditionSatisfied() {
-        return mIsConditionSatisfied;
+        return mIsTapSuppressionEnabled && mIsConditionSatisfied;
     }
 
     @Override
@@ -70,7 +66,7 @@ class TapSuppression extends ContextualSearchHeuristic {
 
     @Override
     protected boolean isConditionSatisfiedForAggregateLogging() {
-        return !mIsSecondTap && !shouldHandleFirstTap();
+        return !mIsTapSuppressionEnabled && mIsConditionSatisfied;
     }
 
     /**