Clear the selection and insertion flags only upon getting the selection event

content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java

 // Copyright 2013 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.content.browser.input;
 
 import android.app.Activity;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
@@ skipping 901 matching lines @@
         finishComposingText();
 
         // H
         expectUpdateStateCall();
         setComposingText("h", 1);
         assertEquals(COMPOSITION_KEY_CODE, mImeAdapter.mLastSyntheticKeyCode);
     }
 
     @SmallTest
     @Feature({"TextInput"})
-    public void testPastePopupShowOnLongPress() throws Throwable {
+    public void testPastePopupShowAndHide() throws Throwable {
         commitText("hello", 1);
         waitAndVerifyStatesAndCalls(1, "hello", 5, 5, -1, -1);
 
         selectAll();
         waitAndVerifyStatesAndCalls(2, "hello", 0, 5, -1, -1);
 
         cut();
         waitAndVerifyStatesAndCalls(0, "", 0, 0, -1, -1);
 
         DOMUtils.longPressNode(this, mContentViewCore, "input_text");
         final PastePopupMenu pastePopup = mContentViewCore.getPastePopupForTest();
         assertTrue(CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
             @Override
             public boolean isSatisfied() {
                 return pastePopup.isShowing();
             }
         }));
+
+        DOMUtils.clickNode(this, mContentViewCore, "input_text");
+        assertWaitForKeyboardStatus(true);
+        DOMUtils.longPressNode(this, mContentViewCore, "input_text");
+        setComposingText("h", 1);
+        assertTrue(CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
+            @Override
+            public boolean isSatisfied() {
+                return !pastePopup.isShowing();
+            }
+        }));
+        assertFalse(mContentViewCore.hasInsertion());
     }
 
     @SmallTest
+    @Feature({"TextInput"})
+    public void testSelectionClearedOnKeyEvent() throws Throwable {
+        commitText("hello", 1);
+        waitAndVerifyStatesAndCalls(1, "hello", 5, 5, -1, -1);
+
+        DOMUtils.clickNode(this, mContentViewCore, "input_text");
+        assertWaitForKeyboardStatus(true);
+
+        DOMUtils.longPressNode(this, mContentViewCore, "input_text");
+        assertWaitForSelectActionBarStatus(true);
+
+        setComposingText("h", 1);
+        assertWaitForSelectActionBarStatus(false);
+        assertFalse(mContentViewCore.hasSelection());
+    }
+
+    @SmallTest
     @Feature({"TextInput"})
     public void testTextHandlesPreservedWithDpadNavigation() throws Throwable {
         DOMUtils.longPressNode(this, mContentViewCore, "plain_text");
         assertWaitForSelectActionBarStatus(true);
         assertTrue(mContentViewCore.hasSelection());
 
         dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_DOWN));
         assertWaitForSelectActionBarStatus(true);
         assertTrue(mContentViewCore.hasSelection());
     }
@@ skipping 289 matching lines @@
         public void assertEqualState(String text, int selectionStart, int selectionEnd,
                 int compositionStart, int compositionEnd) {
             assertEquals("Text did not match", text, mText);
             assertEquals("Selection start did not match", selectionStart, mSelectionStart);
             assertEquals("Selection end did not match", selectionEnd, mSelectionEnd);
             assertEquals("Composition start did not match", compositionStart, mCompositionStart);
             assertEquals("Composition end did not match", compositionEnd, mCompositionEnd);
         }
     }
 }