Revert of Refactor contact editor controller into its own class.

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.payments.ui;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
@@ skipping 564 matching lines @@
 
         if (section == mShippingAddressSection) {
             mClient.onSectionAddOption(TYPE_SHIPPING_ADDRESSES);
         } else if (section == mContactDetailsSection) {
             mClient.onSectionAddOption(TYPE_CONTACT_DETAILS);
         } else if (section == mPaymentMethodSection) {
             mClient.onSectionAddOption(TYPE_PAYMENT_METHODS);
         }
     }
 
-    /** @return The editor user interface. */
-    public EditorView getEditorView() {
-        return mEditorView;
+    /**
+     * Displays the editor user interface for the given model.
+     *
+     * @param editorModel The description of the editor user interface to display.
+     */
+    public void showEditor(final EditorModel editorModel) {
+        mEditorView.show(editorModel);
     }
 
     /**
      * Called when user clicks anything in the dialog.
      */
     @Override
     public void onClick(View v) {
         if (!isAcceptingCloseButton()) return;
 
         if (v == mCloseButton) {
@@ skipping 407 matching lines @@
     public static void setObserverForTest(PaymentRequestObserverForTest observerForTest) {
         sObserverForTest = observerForTest;
     }
 
     @VisibleForTesting
     public Dialog getDialogForTest() {
         return mDialog;
     }
 
     @VisibleForTesting
+    public Dialog getEditorViewForTest() {
+        return mEditorView;
+    }
+
+    @VisibleForTesting
     public ViewGroup getShippingAddressSectionForTest() {
         return mShippingAddressSection;
     }
 
     @VisibleForTesting
     public ViewGroup getContactDetailsSectionForTest() {
         return mContactDetailsSection;
     }
 
     private void notifyReadyForInput() {
         if (sObserverForTest != null && isAcceptingUserInput()) {
             sObserverForTest.onPaymentRequestReadyForInput(this);
         }
     }
 
     private void notifyReadyToPay() {
         if (sObserverForTest != null && isAcceptingUserInput() && mPayButton.isEnabled()) {
             sObserverForTest.onPaymentRequestReadyToPay(this);
         }
     }
 
     private void notifyReadyToClose() {
         if (sObserverForTest != null && isAcceptingCloseButton()) {
             sObserverForTest.onPaymentRequestReadyToClose(this);
         }
     }
 }