Ensure omnibox suggestions are regenerated when deleting the inline autocomplete.

chrome/android/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java

Index: chrome/android/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
index 920d241b5712d89a7b507696985821816ff194b8..41644707c9310751c7543fc8f2748b52924b8eab 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
@@ -117,7 +117,8 @@ public class UrlBar extends VerticallyFixedEditText {
     private long mFirstFocusTimeMs;
 
     private boolean mInBatchEditMode;
-    private String mBeforeBatchEditAutocompleteText;
+    private int mBeforeBatchEditAutocompleteIndex = -1;
+    private String mBeforeBatchEditFullText;
     private boolean mSelectionChangedInBatchMode;
     private boolean mTextDeletedInBatchMode;
 
@@ -360,7 +361,8 @@ public class UrlBar extends VerticallyFixedEditText {
 
     @Override
     public void onBeginBatchEdit() {
-        mBeforeBatchEditAutocompleteText = getTextWithoutAutocomplete();
+        mBeforeBatchEditAutocompleteIndex = getText().getSpanStart(mAutocompleteSpan);
+        mBeforeBatchEditFullText = getText().toString();
 
         super.onBeginBatchEdit();
         mInBatchEditMode = true;
@@ -377,12 +379,14 @@ public class UrlBar extends VerticallyFixedEditText {
             mSelectionChangedInBatchMode = false;
         }
 
-        if (!TextUtils.equals(mBeforeBatchEditAutocompleteText, getTextWithoutAutocomplete())) {
+        if (!TextUtils.equals(mBeforeBatchEditFullText, getText().toString())
+                || getText().getSpanStart(mAutocompleteSpan) != mBeforeBatchEditAutocompleteIndex) {
             notifyAutocompleteTextStateChanged(mTextDeletedInBatchMode);
         }
 
         mTextDeletedInBatchMode = false;
-        mBeforeBatchEditAutocompleteText = null;
+        mBeforeBatchEditAutocompleteIndex = -1;
+        mBeforeBatchEditFullText = null;
     }
 
     @Override