[Contextual Search] Do not include tap suppression in aggregate heuristic logging

Also default 'false' for shouldAggregateLogForTapSuppression and isConditionSatisfiedForAggregateLogging

BUG=642897

Review-Url: https://codereview.chromium.org/2386413002
Cr-Commit-Position: refs/heads/master@{#422932}

chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelMetrics.java

@@ -225,6 +225,7 @@ public class ContextualSearchPanelMetrics {
             mWasContextualCardsDataShown = false;
             mWasSelectionAllCaps = false;
             mDidSelectionStartWithCapital = false;
+            mWasAnyHeuristicSatisfiedOnPanelShow = false;
             mPanelTriggerTimeNs = 0;
         }
     }

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

@@ -54,6 +54,11 @@ public class BarOverlapTapSuppression extends ContextualSearchHeuristic {
         }
     }
 
+    @Override
+    protected boolean shouldAggregateLogForTapSuppression() {
+        return true;
+    }
+
     @Override
     protected boolean isConditionSatisfiedForAggregateLogging() {
         return !mIsEnabled && mIsConditionSatisfied;

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

@@ -40,7 +40,7 @@ abstract class ContextualSearchHeuristic {
      *         suppression.
      */
     protected boolean shouldAggregateLogForTapSuppression() {
-        return true;
+        return false;
     }
 
     /**
@@ -48,5 +48,7 @@ abstract class ContextualSearchHeuristic {
      *         suppression, if it were enabled through VariationsAssociatedData. If the feature is
      *         enabled through VariationsAssociatedData then this method should return false.
      */
-    protected abstract boolean isConditionSatisfiedForAggregateLogging();
+    protected boolean isConditionSatisfiedForAggregateLogging() {
+        return false;
+    }
 }

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

@@ -58,11 +58,6 @@ public class CtrSuppression extends ContextualSearchHeuristic {
         return false;
     }
 
-    @Override
-    protected boolean isConditionSatisfiedForAggregateLogging() {
-        return false;
-    }
-
     @Override
     protected void logConditionState() {
         // Since the CTR for previous time periods never changes, we only need to write to the UMA

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

@@ -46,10 +46,6 @@ public class NearTopTapSuppression extends ContextualSearchHeuristic {
         }
     }
 
-    @Override
-    protected boolean isConditionSatisfiedForAggregateLogging() {
-        // TODO(twellington): Define a default value to use when determining if the condition is
-        // satisfied for logging.
-        return false;
-    }
+    // TODO(twellington): Define a default value to use when determining if the condition is
+    // satisfied for logging.
 }

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

@@ -55,14 +55,4 @@ class QuickAnswersHeuristic extends ContextualSearchHeuristic {
                     wasSearchContentViewSeen, mIsConditionSatisfied, mDidAnswer);
         }
     }
-
-    @Override
-    protected boolean shouldAggregateLogForTapSuppression() {
-        return false;
-    }
-
-    @Override
-    protected boolean isConditionSatisfiedForAggregateLogging() {
-        return false;
-    }
 }

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

@@ -66,6 +66,11 @@ public class RecentScrollTapSuppression extends ContextualSearchHeuristic {
         }
     }
 
+    @Override
+    protected boolean shouldAggregateLogForTapSuppression() {
+        return true;
+    }
+
     @Override
     protected boolean isConditionSatisfiedForAggregateLogging() {
         return !mIsEnabled && mIsConditionSatisfied;

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

@@ -35,16 +35,6 @@ class TapFarFromPreviousSuppression extends ContextualSearchHeuristic {
         return !mShouldHandleTap;
     }
 
-    @Override
-    protected boolean shouldAggregateLogForTapSuppression() {
-        return false;
-    }
-
-    @Override
-    protected boolean isConditionSatisfiedForAggregateLogging() {
-        return false;
-    }
-
     /**
      * @return whether a tap at the given coordinates should be handled or not.
      */

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

@@ -64,11 +64,6 @@ class TapSuppression extends ContextualSearchHeuristic {
         }
     }
 
-    @Override
-    protected boolean isConditionSatisfiedForAggregateLogging() {
-        return !mIsTapSuppressionEnabled && mIsConditionSatisfied;
-    }
-
     /**
      * @return Whether a first tap should be handled or not.
      */