Revert of Refactor contact editor controller into its own class.

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.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;
 
 import android.widget.EditText;
 import android.widget.TextView;
 
 import org.chromium.base.ThreadUtils;
@@ skipping 122 matching lines @@
         helper.waitForCallback(callCount);
     }
 
     /** Clicks on an element in the editor UI. */
     protected void clickInEditorAndWait(final int resourceId, CallbackHelper helper)
             throws InterruptedException, TimeoutException {
         int callCount = helper.getCallCount();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                mUI.getEditorView().findViewById(resourceId).performClick();
+                mUI.getEditorViewForTest().findViewById(resourceId).performClick();
             }
         });
         helper.waitForCallback(callCount);
     }
 
     /** Clicks on a button in the card unmask UI. */
     protected void clickCardUnmaskButtonAndWait(final int dialogButtonId, CallbackHelper helper)
             throws InterruptedException, TimeoutException {
         int callCount = helper.getCallCount();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@@ skipping 15 matching lines @@
             }
         });
     }
 
     /** Directly sets the text in the editor UI. */
     protected void setTextInEditor(final int resourceId, final String input)
             throws InterruptedException, TimeoutException {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                ((EditText) mUI.getEditorView().findViewById(resourceId)).setText(input);
+                ((EditText) mUI.getEditorViewForTest().findViewById(resourceId)).setText(input);
             }
         });
     }
 
     /** Directly sets the text in the card unmask UI. */
     protected void setTextInCardUnmaskDialogAndWait(final int resourceId, final String input,
             CallbackHelper helper) throws InterruptedException, TimeoutException {
         int callCount = helper.getCallCount();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
@@ skipping 122 matching lines @@
          *
          * @param ui The UI that is ready for input.
          */
         public void notifyCalled(T target) {
             ThreadUtils.assertOnUiThread();
             mTarget = target;
             notifyCalled();
         }
     }
 }