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

chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/TapFarFromPreviousSuppression.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.contextualsearch;
 
 /**
  * Implements the policy that a Tap relatively far away from an existing Contextual Search
  * selection should just dismiss our UX.  When a Tap is close by, we assume the user must have
  * missed the original intended target so we reselect based on the new Tap location.
@@ skipping 13 matching lines @@
      * @param y The y coordinate of the tap gesture.
      */
     TapFarFromPreviousSuppression(ContextualSearchSelectionController controller,
             ContextualSearchTapState previousTapState, int x, int y) {
         mPxToDp = controller.getPxToDp();
         mPreviousTapState = previousTapState;
         mShouldHandleTap = shouldHandleTap(x, y);
     }
 
     @Override
-    protected boolean isConditionSatisfied() {
+    protected boolean isConditionSatisfiedAndEnabled() {
         return !mShouldHandleTap;
     }
 
     @Override
     protected boolean shouldAggregateLogForTapSuppression() {
         return false;
     }
 
     @Override
     protected boolean isConditionSatisfiedForAggregateLogging() {
@@ skipping 13 matching lines @@
      * Determines whether a tap at the given coordinates is considered "close" to the previous
      * tap.
      */
     private boolean wasTapCloseToPreviousTap(int x, int y) {
         float deltaXDp = (mPreviousTapState.getX() - x) * mPxToDp;
         float deltaYDp = (mPreviousTapState.getY() - y) * mPxToDp;
         float distanceSquaredDp = deltaXDp * deltaXDp + deltaYDp * deltaYDp;
         return distanceSquaredDp <= RETAP_DISTANCE_SQUARED_DP;
     }
 }