[Payments] Code Refactoring for the Subkey Request

chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillTestHelper.java

 // Copyright 2013 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.autofill;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.PersonalDataManagerObserver;
 
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 
 /**
  * Helper class for testing AutofillProfiles.
  */
 public class AutofillTestHelper {
 
     private final CallbackHelper mOnPersonalDataChangedHelper = new CallbackHelper();
 
     public AutofillTestHelper() {
         registerDataObserver();
-        setNormalizationTimeoutForTesting();
+        setRequestTimeoutForTesting();
     }
 
-    void setNormalizationTimeoutForTesting() {
+    void setRequestTimeoutForTesting() {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                PersonalDataManager.getInstance().setNormalizationTimeoutForTesting(0);
+                PersonalDataManager.getInstance().setRequestTimeoutForTesting(0);
             }
         });
     }
 
     AutofillProfile getProfile(final String guid) throws ExecutionException {
         return ThreadUtils.runOnUiThreadBlocking(new Callable<AutofillProfile>() {
             @Override
             public AutofillProfile call() {
                 return PersonalDataManager.getInstance().getProfile(guid);
             }
@@ skipping 305 matching lines @@
                             });
                 }
             });
             if (isDataLoaded) return;
             mOnPersonalDataChangedHelper.waitForCallback(callCount);
         } catch (TimeoutException | InterruptedException | ExecutionException e) {
             throw new AssertionError(e);
         }
     }
 }