Update touch selection notification names, add ESTABLISHED.

chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.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 static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_END_DEVICE;
 import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_PHONE;
 import static org.chromium.content.browser.test.util.CriteriaHelper.DEFAULT_POLLING_INTERVAL;
 
@@ skipping 373 matching lines @@
         assertTrue("Bar never showed desired text.",
                 CriteriaHelper.pollForCriteria(new Criteria() {
                     @Override
                     public boolean isSatisfied() {
                         return TextUtils.equals(text, getSelectedText());
                     }
                 }, TEST_TIMEOUT, DEFAULT_POLLING_INTERVAL));
     }
 
     /**
+     * Waits for the selection to be dissolved.
+     * This is needed because the renderer's notification of a selection going away is async,
+     * and a subsequent tap may think there's a current selection until it has been dissolved.
+     */
+    private void waitForSelectionDissolved() throws InterruptedException {
+        assertTrue("Selection never dissolved.", CriteriaHelper.pollForCriteria(new Criteria() {
+            @Override
+            public boolean isSatisfied() {
+                return mSelectionController.isSelectionDissolved();
+            }
+        }, TEST_TIMEOUT, DEFAULT_POLLING_INTERVAL));
+    }
+
+    /**
      * A ContentViewCore that has some methods stubbed out for testing.
      */
     private static final class StubbedContentViewCore extends ContentViewCore {
         private boolean mIsFocusedNodeEditable;
 
         public StubbedContentViewCore(Context context) {
             super(context);
         }
 
         public void setIsFocusedNodeEditableForTest(boolean isFocusedNodeEditable) {
@@ skipping 1349 matching lines @@
         final ContentViewCore contentViewCore = getActivity().getActivityTab().getContentViewCore();
         assertWaitForSelectActionBarVisible(true);
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 contentViewCore.hideSelectActionMode();
             }
         });
         assertWaitForSelectActionBarVisible(false);
 
         waitForPanelToCloseAndAssert();

[jdduke (slow), 2015/07/16 23:15:50]

I guess in the follow-up you could change "waitForPanelToCloseAndAssert()" to
wait for both the panel closing and the selection clearing? I guess maybe the
selection isn't always cleared when you close the panel though, so it might take
another method.

[Donn Denman, 2015/07/16 23:24:52]

That's all spot-on -- will do in the next CL.

         assertEquals(1, observer.hideCount);
     }
 
     /**
      * Tests that the Contextual Search panel does not reappear when a long-press selection is
      * modified after the user has taken an action to explicitly dismiss the panel. Also tests
      * that the panel reappears when a new selection is made.
      */
     @SmallTest
     @Feature({"ContextualSearch"})
     @Restriction({RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
     public void testPreventHandlingCurrentSelectionModification()
             throws InterruptedException, TimeoutException {
         longPressNode("intelligence");
         waitForPanelToPeekAndAssert();
 
         // Dismiss the Contextual Search panel.
         scrollBasePage();
         assertPanelClosedOrUndefined();
         assertEquals("Intelligence", getSelectedText());
 
         // Simulate a selection change event and assert that the panel has not reappeared.
-        mManager.onSelectionEvent(SelectionEventType.SELECTION_DRAG_STARTED, 333, 450);
-        mManager.onSelectionEvent(SelectionEventType.SELECTION_DRAG_STOPPED, 303, 450);
+        mManager.onSelectionEvent(SelectionEventType.SELECTION_HANDLE_DRAG_STARTED, 333, 450);
+        mManager.onSelectionEvent(SelectionEventType.SELECTION_HANDLE_DRAG_STOPPED, 303, 450);
         assertPanelClosedOrUndefined();
 
         // Select a different word and assert that the panel has appeared.
         longPressNode("states-far");
         waitForPanelToPeekAndAssert();
     }
+
+    /**
+     * Tests a bunch of taps in a row.
+     * We've had reliability problems with simple taps due to async clearing
+     * of selection bounds, so this helps prevent a regression with that.
+     */
+    @Restriction({RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
+    @CommandLineFlags.Add({ContextualSearchFieldTrial.TAP_RESOLVE_LIMIT_FOR_DECIDED + "=200",
+            ContextualSearchFieldTrial.TAP_RESOLVE_LIMIT_FOR_UNDECIDED + "=200",
+            ContextualSearchFieldTrial.TAP_PREFETCH_LIMIT_FOR_DECIDED + "=200",
+            ContextualSearchFieldTrial.TAP_PREFETCH_LIMIT_FOR_UNDECIDED + "=200"})
+    public void testTapALot() throws InterruptedException, TimeoutException {
+        for (int i = 0; i < 50; i++) {
+            clickToTriggerSearchTermResolution();
+            waitForSelectionDissolved();
+            assertSearchTermRequested();
+        }
+    }
 }