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

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

Index: content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java b/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java
index bb9606456bbf0edb28f5df85f4dd7ebbd1966164..71e83f7af8196b45a3b8ced363d3f0c47ad8c3a6 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java
@@ -919,7 +919,7 @@ public class ImeTest extends ContentShellTestBase {
 
     @SmallTest
     @Feature({"TextInput"})
-    public void testPastePopupShowOnLongPress() throws Throwable {
+    public void testPastePopupShowAndHide() throws Throwable {
         commitText("hello", 1);
         waitAndVerifyStatesAndCalls(1, "hello", 5, 5, -1, -1);
 
@@ -937,6 +937,35 @@ public class ImeTest extends ContentShellTestBase {
                 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