[TTS] Write initial Tap-features to Ranker.

chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelMetrics.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.compositor.bottombar.contextualsearch;
 
 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel.PanelState;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel.StateChangeReason;
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchHeuristics;
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchRankerLogger;
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchRankerLoggerImpl;
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchUma;
 import org.chromium.chrome.browser.contextualsearch.QuickActionCategory;
 
+import java.net.URL;
+
 /**
  * This class is responsible for all the logging related to Contextual Search.
  */
 public class ContextualSearchPanelMetrics {
     private static final int MILLISECONDS_TO_NANOSECONDS = 1000000;
 
     // The Ranker logger to use to write Tap Suppression Ranker logs to UMA.
     private final ContextualSearchRankerLogger mTapSuppressionRankerLogger;
 
     // Flags for logging.
@@ skipping 89 matching lines @@
             }
 
             if (mWasContextualCardsDataShown) {
                 ContextualSearchUma.logContextualCardsResultsSeen(mWasSearchContentViewSeen);
             }
             if (mWasQuickActionShown) {
                 ContextualSearchUma.logQuickActionResultsSeen(mWasSearchContentViewSeen,
                         mQuickActionCategory);
                 ContextualSearchUma.logQuickActionClicked(mWasQuickActionClicked,
                         mQuickActionCategory);
-                mTapSuppressionRankerLogger.log(
+                mTapSuppressionRankerLogger.logOutcome(
                         ContextualSearchRankerLogger.Feature.OUTCOME_WAS_QUICK_ACTION_CLICKED,
                         mWasQuickActionClicked);
             }
 
             if (mResultsSeenExperiments != null) {
                 mResultsSeenExperiments.logResultsSeen(
                         mWasSearchContentViewSeen, mWasActivatedByTap);
                 mResultsSeenExperiments = null;
             }
 
             if (mWasActivatedByTap) {
                 boolean wasAnySuppressionHeuristicSatisfied = mWasAnyHeuristicSatisfiedOnPanelShow;
                 ContextualSearchUma.logAnyTapSuppressionHeuristicSatisfied(
                         mWasSearchContentViewSeen, wasAnySuppressionHeuristicSatisfied);
                 // Log all the experiments to the Ranker logger.
                 if (mRankerLogExperiments != null) {
-                    mTapSuppressionRankerLogger.logOutcome(mWasSearchContentViewSeen);
+                    mTapSuppressionRankerLogger.logOutcome(
+                            ContextualSearchRankerLogger.Feature.OUTCOME_WAS_PANEL_OPENED,
+                            mWasSearchContentViewSeen);
                     mRankerLogExperiments.logRankerTapSuppression(mTapSuppressionRankerLogger);
-                    mTapSuppressionRankerLogger.writeLogAndReset();
                     mRankerLogExperiments = null;
                 }
+                // Reset writing to Ranker so whatever interactions occurred are recorded as a
+                // complete record.
+                mTapSuppressionRankerLogger.writeLogAndReset();
 
                 ContextualSearchUma.logSelectionLengthResultsSeen(
                         mWasSearchContentViewSeen, mSelectionLength);
             }
         }
 
         if (isExitingPanelOpenedBeyondPeeked) {
             assert mPanelOpenedBeyondPeekTimeNs != 0;
             long durationPanelOpen = (System.nanoTime() - mPanelOpenedBeyondPeekTimeNs)
                     / MILLISECONDS_TO_NANOSECONDS;
@@ skipping 161 matching lines @@
     /**
      * Sets the experiments to log with results seen.
      * @param resultsSeenExperiments The experiments to log when the panel results are known.
      */
     public void setResultsSeenExperiments(ContextualSearchHeuristics resultsSeenExperiments) {
         mResultsSeenExperiments = resultsSeenExperiments;
     }
 
     /**
      * Sets the experiments to log through Ranker with results seen.
-     * @param rankerLogExperiments The experiments to log through ranker when the panel results
+     * @param rankerLogExperiments The experiments to log through Ranker when the panel results
      *        are known.
+     * @param basePageUrl The URL of the base page to log along with Ranker data.
      */
-    public void setRankerLogExperiments(ContextualSearchHeuristics rankerLogExperiments) {
+    public void setRankerLogExperiments(
+            ContextualSearchHeuristics rankerLogExperiments, URL basePageUrl) {
         mRankerLogExperiments = rankerLogExperiments;
+        mTapSuppressionRankerLogger.setupLoggingForPage(basePageUrl);
     }
 
     /**
      * Determine whether a new contextual search is starting.
      * @param toState The contextual search state that will be transitioned to.
      * @param reason The reason for the search state transition.
      * @return Whether a new contextual search is starting.
      */
     private boolean isStartingNewContextualSearch(PanelState toState, StateChangeReason reason) {
         return toState == PanelState.PEEKED
@@ skipping 16 matching lines @@
 
     /**
      * @param fromState The state the panel is transitioning from.
      * @return Whether there is an ongoing contextual search.
      */
     private boolean isOngoingContextualSearch(PanelState fromState) {
         return fromState != PanelState.UNDEFINED && fromState != PanelState.CLOSED;
     }
 }