Backed out changeset 3357e9e81614 (bug 1086983)

mobile/android/base/toolbar/ToolbarEditLayout.java

@@ -130,7 +130,7 @@ public class ToolbarEditLayout extends ThemedLinearLayout {
     }
 
     protected void saveTabEditingState(final TabEditingState editingState) {
-        editingState.lastEditingText = mEditText.getNonAutocompleteText();
+        editingState.lastEditingText = getText();
         editingState.selectionStart = mEditText.getSelectionStart();
         editingState.selectionEnd = mEditText.getSelectionEnd();
    }

mobile/android/base/toolbar/ToolbarEditText.java

@@ -160,10 +160,6 @@ public class ToolbarEditText extends CustomEditText
         setCursorVisible(true);
     }
 
-    protected String getNonAutocompleteText() {
-        return getNonAutocompleteText(getText());
-    }
-
     /**
      * Get the portion of text that is not marked as autocomplete text.
      *