Revert of Credit card editor for PaymentRequest UI.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
index c62f05a81e0a703798e6aa2401e4f51fbbf8b643..6d5606ac11dcdbc8e46c2c32676b42c08707cfe4 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
@@ -222,7 +222,6 @@
 
     private final Dialog mDialog;
     private final EditorView mEditorView;
-    private final EditorView mCardEditorView;
     private final ViewGroup mFullContainer;
     private final ViewGroup mRequestView;
     private final PaymentRequestUiErrorView mErrorView;
@@ -332,7 +331,6 @@
         mFullContainer.addView(mRequestView, bottomSheetParams);
 
         mEditorView = new EditorView(activity, sObserverForTest);
-        mCardEditorView = new EditorView(activity, sObserverForTest);
 
         // Set up the dialog.
         mDialog = new AlwaysDismissedDialog(activity, R.style.DialogWhenLarge);
@@ -448,8 +446,7 @@
                 activity.getString(R.string.payments_contact_details_label),
                 activity.getString(R.string.payments_select_contact_details_prompt), this);
         mPaymentMethodSection = new OptionSection(activity,
-                activity.getString(R.string.payments_method_of_payment_label),
-                activity.getString(R.string.payments_select_method_of_payment_prompt), this);
+                activity.getString(R.string.payments_method_of_payment_label), null, this);
 
         // Add the necessary sections to the layout.
         mPaymentContainerLayout.addView(mOrderSummarySection, new LinearLayout.LayoutParams(
@@ -620,15 +617,9 @@
         updatePayButtonEnabled();
     }
 
-    /** @return The common editor user interface. */
+    /** @return The editor user interface. */
     public EditorView getEditorView() {
         return mEditorView;
-    }
-
-    /** @return The card editor user interface. Distinct from the common editor user interface,
-     * because the credit card editor can launch the address editor. */
-    public EditorView getCardEditorView() {
-        return mCardEditorView;
     }
 
     /**
@@ -807,7 +798,7 @@
             mPaymentContainerLayout.requestLayout();
 
             // Switch the 'edit' button to a 'cancel' button.
-            mEditButton.setText(mContext.getString(R.string.cancel));
+            mEditButton.setText(mContext.getString(R.string.payments_cancel_button));
 
             // Make the dialog take the whole screen.
             mDialog.getWindow().setLayout(
@@ -1109,11 +1100,6 @@
     }
 
     @VisibleForTesting
-    public ViewGroup getPaymentMethodSectionForTest() {
-        return mPaymentMethodSection;
-    }
-
-    @VisibleForTesting
     public ViewGroup getContactDetailsSectionForTest() {
         return mContactDetailsSection;
     }