[Payments] Cancel edit after clicking back button

chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorView.java

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorView.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorView.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorView.java
index 67a32904b4294c34627a24622955f290c32f0295..5bafea6b98122b9f14353a0e4cf6c5b4a6056c1e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorView.java
@@ -59,8 +59,9 @@ import javax.annotation.Nullable;
  * The PaymentRequest editor dialog. Can be used for editing contact information, shipping address,
  * billing address, and credit cards.
  */
-public class EditorView
-        extends AlwaysDismissedDialog implements OnClickListener, DialogInterface.OnShowListener {
+public class EditorView extends AlwaysDismissedDialog implements OnClickListener,
+                                                                 DialogInterface.OnShowListener,
+                                                                 DialogInterface.OnDismissListener {
     /** The indicator for input fields that are required. */
     public static final String REQUIRED_FIELD_INDICATOR = "*";
 
@@ -198,7 +199,7 @@ public class EditorView
         toolbar.setNavigationOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                cancelEdit();
+                dismissDialog();
             }
         });
 
@@ -262,26 +263,20 @@ public class EditorView
         if (view.getId() == R.id.payments_edit_done_button) {
             if (validateForm()) {
                 mEditorModel.done();
+                mEditorModel = null;
                 dismissDialog();
                 return;
             }
 
             if (mObserverForTest != null) mObserverForTest.onPaymentRequestEditorValidationError();
         } else if (view.getId() == R.id.payments_edit_cancel_button) {
-            cancelEdit();
+            dismissDialog();
         }
     }
 
-    private void cancelEdit() {
-        mEditorModel.cancel();
-        dismissDialog();
-    }
-
     private void dismissDialog() {
         if (mDialogInOutAnimator != null || !isShowing()) return;
 
-        removeTextChangedListenersAndInputFilters();
-
         Animator dropDown =
                 ObjectAnimator.ofFloat(mLayout, View.TRANSLATION_Y, 0f, mLayout.getHeight());
         Animator fadeOut = ObjectAnimator.ofFloat(mLayout, View.ALPHA, mLayout.getAlpha(), 0f);
@@ -302,6 +297,12 @@ public class EditorView
         mDialogInOutAnimator.start();
     }
 
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        if (mEditorModel != null) mEditorModel.cancel();
+        removeTextChangedListenersAndInputFilters();
+    }
+
     private void prepareButtons() {
         mDoneButton = (Button) mLayout.findViewById(R.id.button_primary);
         mDoneButton.setId(R.id.payments_edit_done_button);
@@ -446,6 +447,7 @@ public class EditorView
      */
     public void show(final EditorModel editorModel) {
         setOnShowListener(this);
+        setOnDismissListener(this);
         mEditorModel = editorModel;
 
         mLayout = LayoutInflater.from(mContext).inflate(R.layout.payment_request_editor, null);