[Contextual Search] Remove opt-in code.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelStateHandler.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelStateHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelStateHandler.java
index 55d10ee4e2c3792ca74142eed01d69bf3bfcdece..58b6b68f192d8b03ad6fa8704283c33d9e0a946e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelStateHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelStateHandler.java
@@ -18,18 +18,7 @@ import java.util.Map;
  */
 abstract class ContextualSearchPanelStateHandler {
 
-    // Valid previous states for when the promo is active.
-    private static final Map<PanelState, PanelState> PREVIOUS_STATES_PROMO;
-    static {
-        Map<PanelState, PanelState> states = new HashMap<PanelState, PanelState>();
-        // Pairs are of the form <Current, Previous>.
-        states.put(PanelState.PEEKED, PanelState.CLOSED);
-        states.put(PanelState.PROMO, PanelState.PEEKED);
-        states.put(PanelState.EXPANDED, PanelState.PROMO);
-        PREVIOUS_STATES_PROMO = Collections.unmodifiableMap(states);
-    }
-
-    // Valid previous states for when the promo is not active (normal flow).
+    // Valid previous states for the Panel.
     private static final Map<PanelState, PanelState> PREVIOUS_STATES_NORMAL;
     static {
         Map<PanelState, PanelState> states = new HashMap<PanelState, PanelState>();
@@ -71,29 +60,11 @@ abstract class ContextualSearchPanelStateHandler {
      * @return The {@code PanelState} that is before the |state| in the order of states.
      */
     PanelState getPreviousPanelState(PanelState state) {
-        PanelState prevState = mIsPromoActive
-                ? PREVIOUS_STATES_PROMO.get(state)
-                : PREVIOUS_STATES_NORMAL.get(state);
+        PanelState prevState = PREVIOUS_STATES_NORMAL.get(state);
         return prevState != null ? prevState : PanelState.UNDEFINED;
     }
 
     /**
-     * Return the maximum state that the panel can be in, depending on whether the promo is
-     * active.
-     */
-    PanelState getMaximumState() {
-        return mIsPromoActive ? PanelState.PROMO : PanelState.MAXIMIZED;
-    }
-
-    /**
-     * Return the intermediary state that the panel can be in, depending on whether the promo is
-     * active.
-     */
-    PanelState getIntermediaryState() {
-        return mIsPromoActive ? PanelState.PROMO : PanelState.EXPANDED;
-    }
-
-    /**
      * Sets the panel's state.
      * @param toState The panel state to transition to.
      * @param reason The reason for a change in the panel's state.
@@ -198,14 +169,10 @@ abstract class ContextualSearchPanelStateHandler {
      * @return whether the state is valid.
      */
     boolean isValidState(PanelState state) {
-        ArrayList<PanelState> validStates;
-        if (mIsPromoActive) {
-            validStates = new ArrayList<PanelState>(PREVIOUS_STATES_PROMO.values());
-        } else {
-            validStates = new ArrayList<PanelState>(PREVIOUS_STATES_NORMAL.values());
-            // MAXIMIZED is not the previous state of anything, but it's a valid state.
-            validStates.add(PanelState.MAXIMIZED);
-        }
+        ArrayList<PanelState> validStates =

[Donn Denman, 2015/04/30 20:06:13]

I think we can make this a static final member now, since it's no longer
variable.

+                new ArrayList<PanelState>(PREVIOUS_STATES_NORMAL.values());
+        // MAXIMIZED is not the previous state of anything, but it's a valid state.
+        validStates.add(PanelState.MAXIMIZED);
 
         return validStates.contains(state);
     }
@@ -213,6 +180,7 @@ abstract class ContextualSearchPanelStateHandler {
     /**
      * Sets that the contextual search involved the promo.
      */
+    // TODO(pedrosimonetti): do we need this? DO NOT SUBMIT
     void setDidSearchInvolvePromo() {
         mDidSearchInvolvePromo = true;
     }