[TTS] Move Ranker logging to inference time.

chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchSelectionController.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.text.TextUtils;
 
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.browser.ChromeActivity;
@@ skipping 333 matching lines @@
             mLastTapState = null;
             mHandler.handleInvalidTap();
         }
     }
 
     /**
      * Handles Tap suppression by making a callback to either the handler's #handleSuppressedTap()
      * or #handleNonSuppressedTap() after a possible delay.
      * This should be called when the context is fully built (by gathering surrounding text
      * if needed, etc) but before showing any UX.
+     * @param rankerLogger The {@link ContextualSearchRankerLogger} currently being used to measure
+     *        or suppress the UI by Ranker.
      */
-    void handleShouldSuppressTap() {
+    void handleShouldSuppressTap(ContextualSearchRankerLogger rankerLogger) {
         int x = (int) mX;
         int y = (int) mY;
 
         // TODO(donnd): add a policy method to get adjusted tap count.
         ChromePreferenceManager prefs = ChromePreferenceManager.getInstance();
         int adjustedTapsSinceOpen = prefs.getContextualSearchTapCount()
                 - prefs.getContextualSearchTapQuickAnswerCount();
         TapSuppressionHeuristics tapHeuristics =
                 new TapSuppressionHeuristics(this, mLastTapState, x, y, adjustedTapsSinceOpen);
         // TODO(donnd): Move to be called when the panel closes to work with states that change.
         tapHeuristics.logConditionState();

[Theresa, 2017/05/30 20:25:25]

nit: add a blank line after this line and before the comment on 367 to make it
more obvious which line(s) of code the comment applies to

[Donn Denman, 2017/05/30 23:13:25]

Done.

+        tapHeuristics.logRankerTapSuppression(rankerLogger);
         // Tell the manager what it needs in order to log metrics on whether the tap would have
         // been suppressed if each of the heuristics were satisfied.
         mHandler.handleMetricsForWouldSuppressTap(tapHeuristics);
 
-        boolean shouldSuppressTap = tapHeuristics.shouldSuppressTap();
+        boolean shouldSuppressTapBasedOnHeuristics = tapHeuristics.shouldSuppressTap();
         if (mTapTimeNanoseconds != 0) {
             // Remember the tap state for subsequent tap evaluation.
-            mLastTapState =
-                    new ContextualSearchTapState(x, y, mTapTimeNanoseconds, shouldSuppressTap);
+            mLastTapState = new ContextualSearchTapState(
+                    x, y, mTapTimeNanoseconds, shouldSuppressTapBasedOnHeuristics);
         } else {
             mLastTapState = null;
         }
 
-        if (shouldSuppressTap) {
+        boolean shouldSuppressTapBasedOnRanker = rankerLogger.inferUiSuppression();
+        if (shouldSuppressTapBasedOnHeuristics || shouldSuppressTapBasedOnRanker) {
             mHandler.handleSuppressedTap();
         } else {
-            mHandler.handleNonSuppressedTap();
+            mHandler.handleNonSuppressedTap(mTapTimeNanoseconds);
         }
     }
 
     /**
      * Gets the base page ContentViewCore.
      * Deprecated, use getBaseWebContents instead.
      * @return The Base Page's {@link ContentViewCore}, or {@code null} if there is no current tab.
      */
     @Deprecated
     ContentViewCore getBaseContentView() {
@@ skipping 158 matching lines @@
         // Starts are inclusive and ends are non-inclusive for both GSAContext & matcher.
         while (matcher.find()) {
             if (startOffset >= matcher.start() && endOffset <= matcher.end()) {
                 return true;
             }
         }
 
         return false;
     }
 }