Add billing address to masked server credit cards.

chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillEditorBase.java

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillEditorBase.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillEditorBase.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillEditorBase.java
index 8317e1530eed3a7c43ca1e9a3a26ec9fa47a6a26..1945bd956028378661dac17d51e7cabc5e5cca06 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillEditorBase.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillEditorBase.java
@@ -92,7 +92,12 @@ public abstract class AutofillEditorBase
         inflater.inflate(R.menu.payments_editor_menu, menu);
 
         MenuItem deleteItem = menu.findItem(R.id.delete_menu_id);
-        if (deleteItem != null) deleteItem.setVisible(!mIsNewEntry);
+        if (deleteItem != null) deleteItem.setVisible(!mIsNewEntry && getIsDeletable());
+    }
+
+    /** @return True if the item is deletable. Can be false for server credit cards, for example. */
+    protected boolean getIsDeletable() {
+        return true;
     }
 
     /** Initializes the buttons within the layout. */
@@ -126,7 +131,9 @@ public abstract class AutofillEditorBase
     protected abstract void saveEntry();
 
     /** Called when the entry being edited should be deleted. */
-    protected abstract void deleteEntry();
+    protected void deleteEntry() {
+        assert false;
+    }
 
     /** @return ID of the String to use as the title in the ActionBar. */
     protected abstract int getTitleResourceId(boolean isNewEntry);
@@ -135,6 +142,9 @@ public abstract class AutofillEditorBase
     public void onNothingSelected(AdapterView<?> parent) {}
 
     @Override
+    public void onTextChanged(CharSequence s, int start, int before, int count) {}
+
+    @Override
     public void afterTextChanged(Editable s) {}
 
     @Override