[Contextual Search] Remove opt-in code.

chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchUma.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.util.Pair;
 
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanel.PanelState;
@@ skipping 394 matching lines @@
                 PROMO_DISABLED_FROM_LONG_PRESS);
         codes.put(new Pair<Integer, Boolean>(PREFERENCE_UNINITIALIZED, LONG_PRESS),
                 PROMO_UNDECIDED_FROM_LONG_PRESS);
         PROMO_BY_GESTURE_CODES = Collections.unmodifiableMap(codes);
     }
 
     /**
      * Logs the state of the Contextual Search preference. This function should be called if the
      * Contextual Search feature is enabled, and will track the different preference settings
      * (disabled, enabled or uninitialized). Calling more than once is fine.
-     * This is deprecated; pass the number of taps remaining to logPreferenceState.
-     */
-    @Deprecated
-    public static void logPreferenceState() {
-        logPreferenceState(PROMO_TAPS_REMAINING_INVALID);
-    }
-
-    /**
-     * Logs the state of the Contextual Search preference. This function should be called if the
-     * Contextual Search feature is enabled, and will track the different preference settings
-     * (disabled, enabled or uninitialized). Calling more than once is fine.
      * @param promoTapsRemaining The number of taps remaining, or -1 if not applicable.
      */
     public static void logPreferenceState(int promoTapsRemaining) {
         RecordHistogram.recordEnumeratedHistogram("Search.ContextualSearchPreferenceState",
                 getPreferenceValue(), PREFERENCE_HISTOGRAM_BOUNDARY);
         if (promoTapsRemaining != PROMO_TAPS_REMAINING_INVALID) {
             RecordHistogram.recordCountHistogram("Search.ContextualSearchPromoTapsRemaining",
                     promoTapsRemaining);
         }
     }
 
     /**
      * Logs changes to the Contextual Search preference, aside from those resulting from the first
      * run flow.
      * @param enabled Whether the preference is being enabled or disabled.
      */
     public static void logPreferenceChange(boolean enabled) {
         RecordHistogram.recordEnumeratedHistogram("Search.ContextualSearchPreferenceStateChange",
                 enabled ? PREFERENCE_ENABLED : PREFERENCE_DISABLED, PREFERENCE_HISTOGRAM_BOUNDARY);
     }
 
     /**
-     * Logs the outcome of a first run flow.
-     * This is deprecated; call logPromoOutcome instead.
-     */
-    @Deprecated
-    public static void logFirstRunFlowOutcome() {
-        RecordHistogram.recordEnumeratedHistogram("Search.ContextualSearchFirstRunFlowOutcome",
-                getPreferenceValue(), PREFERENCE_HISTOGRAM_BOUNDARY);
-    }
-
-    /**
      * Logs the outcome of the promo (first run flow).
      * Logs multiple histograms; with and without the originating gesture.
      * @param wasTap Whether the gesture that originally caused the panel to show was a Tap.
      */
     public static void logPromoOutcome(boolean wasTap) {
         int preferenceCode = getPreferenceValue();
         RecordHistogram.recordEnumeratedHistogram("Search.ContextualSearchFirstRunFlowOutcome",
                 preferenceCode, PREFERENCE_HISTOGRAM_BOUNDARY);
         int preferenceByGestureCode = getPromoByGestureStateCode(preferenceCode, wasTap);
         RecordHistogram.recordEnumeratedHistogram("Search.ContextualSearchPromoOutcomeByGesture",
@@ skipping 247 matching lines @@
      * @param wasTap Whether the gesture that originally caused the panel to show was a Tap.
      * @param histogramName The full name of the histogram to log to.
      */
     private static void logHistogramByGesture(boolean wasPanelSeen, boolean wasTap,
             String histogramName) {
         RecordHistogram.recordEnumeratedHistogram(histogramName,
                 getPanelSeenByGestureStateCode(wasPanelSeen, wasTap),
                 RESULTS_BY_GESTURE_BOUNDARY);
     }
 }